Changeset 12747 for main/waeup.ikoba/trunk

Timestamp:

12 Mar 2015, 08:36:30 (10 years ago)

Author:

Henrik Bettermann

Message:

Rename contract workflow transition and change messages.

Location:

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

Files:

• contracts.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• workflow.py (modified) (7 diffs)

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

@@ -270 +270 @@
         IWorkflowInfo(maybe_contract).fireTransition('confirm')
     else:
-        IWorkflowInfo(maybe_contract).fireTransition('discard')
+        IWorkflowInfo(maybe_contract).fireTransition('abort')
 
 

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

@@ -1379 +1379 @@
             % contract.contract_id in logcontent)
         self.assertTrue(
-            'INFO - zope.mgr - K1000000 - %s - Submitted for approval' % conid
+            'INFO - zope.mgr - K1000000 - %s - Contract submitted' % conid
             in logcontent)
         self.assertTrue(
-            'INFO - zope.mgr - K1000000 - %s - Approved' % conid
+            'INFO - zope.mgr - K1000000 - %s - Contract approved' % conid
             in logcontent)
         self.assertTrue(

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

@@ -199 +199 @@
 
     Transition(
-        transition_id = 'discard',
-        title = _('Discard payment'),
+        transition_id = 'abort',
+        title = _('Abort payment'),
         source = AWAITING,
         condition = NullCondition,
-        msg = _('Payment discarded'),
+        msg = _('Payment aborted'),
         destination = CREATED),
 
@@ -209 +209 @@
         transition_id = 'submit',
         title = _('Submit for approval'),
-        msg = _('Submitted for approval'),
+        msg = _('Contract submitted'),
         source = CREATED,
         destination = SUBMITTED),
@@ -216 +216 @@
         transition_id = 'confirm',
         title = _('Confirm payment'),
-        msg = _('Payment and submission confirmed'),
+        msg = _('Payment made and contract submitted'),
         source = AWAITING,
         destination = SUBMITTED),
@@ -222 +222 @@
     Transition(
         transition_id = 'approve',
-        title = _('Approve'),
-        msg = _('Approved'),
+        title = _('Approve contract'),
+        msg = _('Contract approved'),
         source = SUBMITTED,
         destination = APPROVED),
@@ -229 +229 @@
     Transition(
         transition_id = 'reject',
-        title = _('Reject'),
-        msg = _('REJECTED'),
+        title = _('Reject contract'),
+        msg = _('Contract rejected'),
         source = SUBMITTED,
         destination = REJECTED),
@@ -236 +236 @@
     Transition(
         transition_id = 'reset1',
-        title = _('Reset to initial state'),
+        title = _('Reset contract to initial state'),
         msg = _('Reset to initial state'),
         source = REJECTED,
@@ -271 +271 @@
     )
 
-PAYMENT_TRANSITIONS = ['await', 'discard', 'confirm']
+PAYMENT_TRANSITIONS = ['await', 'abort', 'confirm']
 
 contract_workflow = IkobaWorkflow(CONTRACT_TRANSITIONS)