Changeset 12539

Timestamp:

1 Feb 2015, 07:44:27 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust to base package.

Location:

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/customers

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (3 diffs)

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/customers/browser.py

@@ -18 +18 @@
 
 from zope.component import getUtility
-from waeup.ikoba.interfaces import IIkobaUtils
+from waeup.ikoba.interfaces import IIkobaUtils, IExtFileStore
 from waeup.ikoba.customers.browser import (
     PDFContractSlipPage, CustomerBaseEditFormPage)
@@ -38 +38 @@
 
     def dataNotComplete(self):
-        """To be implemented in the customization package.
-        """
-        return False
+        store = getUtility(IExtFileStore)
+        error = ''
+        if not store.getFileByContext(self.context, attr=u'passport.jpg'):
+            error += _('Passport picture is missing.')
+        if error:
+            return error
+        return

main/ikobacustom.skeleton/trunk/src/ikobacustom/skeleton/customers/tests/test_browser.py

@@ -58 +58 @@
         customer.reg_number = u'123'
         customer.sex = u'f'
+        customer.email = u'aa@aa.aa'
         IWorkflowState(customer).setState('started')
         self.app['customers'].addCustomer(customer)
@@ -82 +83 @@
             'customer_id,email,firstname,lastname,middlename,phone,'
             'reg_number,sex,suspended,suspended_comment,password,state,history\r\n'
-            'K1000000,,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
+            'K1000000,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
         # We can reimport the file ...
         processor = SkeletonCustomerProcessor()
@@ -101 +102 @@
         num_succ, num_fail, finished_path, failed_path = result
         self.assertEqual(num_fail,0)
-        # We can import the same file in update mode if we ignore the reg_number.
-        result = processor.doImport(
-            self.outfile,
-            ['customer_id','email','firstname','lastname','middlename','phone',
+        # We can import the same file in update mode if we ignore
+        # the reg_number and email address
+        result = processor.doImport(
+            self.outfile,
+            ['customer_id','xx_email','firstname','lastname','middlename','phone',
             'xx_reg_number','sex','suspended','suspended_comment','password','state'],
             mode='update')