Changeset 12352

Timestamp:

31 Dec 2014, 13:38:50 (10 years ago)

Author:

Henrik Bettermann

Message:

Customers must have been approved before verifying documents or approving contracts.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• contracts.py (modified) (1 diff)
• documents.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/contracts.py

@@ -149 +149 @@
     @property
     def is_approvable(self):
+        if self.customer and not self.customer.state in getUtility(
+                ICustomersUtils).CONMANAGE_CUSTOMER_STATES:
+            return False, _("Customer has not yet been approved.")
         for key, field in getFields(self.check_docs_interface).items():
             if key.endswith('_object'):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/documents.py

@@ -166 +166 @@
     @property
     def is_verifiable(self):
+        if self.customer and not self.customer.state in getUtility(
+                ICustomersUtils).CONMANAGE_CUSTOMER_STATES:
+            return False, _("Customer has not yet been approved.")
         files = self.connected_files
         if files is not None and len(files) != len(self.filenames):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -837 +837 @@
         # Managers can access the pages of customer documentsconter
         # and can perform actions
+        IWorkflowState(self.customer).setState('approved')
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.customer_path)
@@ -1041 +1042 @@
 
     def test_verify_document(self):
+        IWorkflowState(self.customer).setState('approved')
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.customer_path + '/documents/DOC1/manage')
@@ -1347 +1349 @@
 
     def test_contract_approval(self):
-        # This is not a UI test. It just a functional test.
+        # This is not a UI test. It's just a functional test.
         self.assertRaises(ConstraintNotSatisfied,
             self.contract.document_object, self.document)
@@ -1356 +1358 @@
         self.assertRaises(InvalidTransitionError,
             IWorkflowInfo(self.contract).fireTransition, 'approve')
-        # Document must be verified for the approval of contracts
+        # Customer must be approved and
+        # document must be verified for the approval of contracts
         IWorkflowState(self.document).setState('verified')
+        IWorkflowState(self.customer).setState('approved')
         IWorkflowInfo(self.contract).fireTransition('approve')
         self.assertEqual(IWorkflowState(self.contract).getState(), 'approved')
 
     def test_contract_approval_in_UI(self):
-        # Now let's see what the UI says why trying to approve a contract
+        # Now let's see what the UI says when trying to approve a contract
         # with unverified documents.
+        IWorkflowState(self.customer).setState('approved')
         IWorkflowState(self.document).setState('submitted')
         self.contract.document_object = self.document