Changeset 12526 for main

Timestamp:

30 Jan 2015, 14:02:53 (10 years ago)

Author:

Henrik Bettermann

Message:

Extend customer registration workflow.

Location:

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

Files:

• customers/browser.py (modified) (4 diffs)
• customers/tests/test_browser.py (modified) (1 diff)
• customers/utils.py (modified) (3 diffs)
• customers/workflow.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)

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

@@ -38 +38 @@
     IContactForm, IObjectHistory, IIkobaObject, IIkobaUtils,
     IPasswordValidator, IUserAccount,
-    VERIFIED, REJECTED, EXPIRED, CREATED, REQUESTED, APPROVED)
+    VERIFIED, REJECTED, EXPIRED, CREATED, REQUESTED, APPROVED, PROVISIONALLY)
 from waeup.ikoba.browser.layout import (
     IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
@@ -322 +322 @@
     @property
     def is_requestable(self):
-        if self.context.state in (REQUESTED, APPROVED):
+        if self.context.state in (REQUESTED, PROVISIONALLY, APPROVED):
             return False
         return True
@@ -717 +717 @@
     @property
     def form_fields(self):
-        if self.context.state in (REQUESTED, APPROVED):
+        if self.context.state in (REQUESTED, PROVISIONALLY, APPROVED):
             return grok.AutoFields(ICustomer).select('email', 'phone')
         return grok.AutoFields(ICustomer).omit(
@@ -728 +728 @@
 
     def is_requestable(self, action=None):
-        if self.context.state in (REQUESTED, APPROVED):
+        if self.context.state in (REQUESTED, PROVISIONALLY, APPROVED):
             return False
         return True

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

@@ -407 +407 @@
         self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
-        self.browser.getControl(name="transition").value = ['approve']
+        self.browser.getControl(name="transition").value = ['approve_provisionally']
+        self.browser.getControl("Apply").click()
+        self.browser.open(self.trigtrans_path)
+        self.browser.getControl(name="transition").value = ['approve_finally']
         self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)

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

@@ -38 +38 @@
 from waeup.ikoba.interfaces import (
     STARTED, CREATED, REQUESTED, APPROVED, SUBMITTED, VERIFIED, REJECTED,
-    EXPIRED,
+    EXPIRED, PROVISIONALLY,
     IIkobaUtils, IExtFileStore)
 from waeup.ikoba.customers.interfaces import ICustomersUtils
@@ -290 +290 @@
     CUSTMANAGE_CUSTOMER_STATES = (STARTED,)
 
-    DOCMANAGE_CUSTOMER_STATES = (REQUESTED, APPROVED,)
+    DOCMANAGE_CUSTOMER_STATES = (REQUESTED, APPROVED, PROVISIONALLY)
 
     DOCMANAGE_DOCUMENT_STATES = (CREATED,)
@@ -303 +303 @@
         REQUESTED: _('requested'),
         APPROVED: _('approved'),
+        PROVISIONALLY: _('provisionally approved'),
         }
 

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

@@ -26 +26 @@
 from waeup.ikoba.interfaces import (
     IObjectHistory, IIkobaWorkflowInfo, IIkobaUtils,
-    STARTED, CREATED, REQUESTED, APPROVED,
+    STARTED, CREATED, REQUESTED, PROVISIONALLY, APPROVED,
     SUBMITTED, VERIFIED, REJECTED, EXPIRED)
 from waeup.ikoba.interfaces import MessageFactory as _
@@ -65 +65 @@
 
     Transition(
+        transition_id = 'approve_provisionally',
+        title = _('Approve customer provisionally'),
+        msg = _('Customer registration provisionally approved'),
+        source = REQUESTED,
+        destination = PROVISIONALLY),
+
+    Transition(
+        transition_id = 'approve_finally',
+        title = _('Approve finally'),
+        msg = _('Customer registration finally approved'),
+        source = PROVISIONALLY,
+        destination = APPROVED),
+
+    Transition(
         transition_id = 'approve',
         title = _('Approve customer'),
@@ -98 +112 @@
         source = REQUESTED,
         destination = STARTED),
+
+    Transition(
+        transition_id = 'reset4',
+        title = _('Reset customer'),
+        msg = _('Reset to initial customer state'),
+        source = PROVISIONALLY,
+        destination = STARTED),
+
+    Transition(
+        transition_id = 'reset5',
+        title = _('Reset to requested'),
+        msg = _("Reset to 'requested'"),
+        source = PROVISIONALLY,
+        destination = REQUESTED),
 
     )

main/waeup.ikoba/trunk/src/waeup/ikoba/interfaces.py

@@ -51 +51 @@
 STARTED = 'started'
 REQUESTED = 'requested'
+PROVISIONALLY = 'provisionally'
 APPROVED = 'approved'