Changeset 12803 for main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/products

Timestamp:

20 Mar 2015, 18:51:29 (10 years ago)

Author:

Henrik Bettermann

Message:

Prepare products and contracts for annual payments.

Location:

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/products

Files:

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

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/products/interfaces.py

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
+from zope import schema
 from waeup.ikoba.products.interfaces import IProduct
 from ikobacustom.pcn.interfaces import MessageFactory as _
@@ -24 +25 @@
 
     """
+
+    contract_year = schema.Int(
+        title=u'Year of License',
+        description=_(u'Enter 4-digit license year.'),
+        required=False,
+        min=1990,
+        max=2050,
+        )
+
+IPCNProduct['contract_year'].order = IPCNProduct['valid_from'].order

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/products/tests/test_browser.py

@@ -54 +54 @@
         result = open(self.outfile, 'rb').read()
         self.assertEqual(result,
-            'contract_category,contract_title,description,options,'
+            'contract_category,contract_title,contract_year,description,options,'
             'product_id,terms_and_conditions,title,valid_from,valid_to,'
             'users_with_local_roles\r\n'
-            'ron,,,[],RON,,Unnamed,2015-12-04#,,[]\r\n')
+            'ron,,,,[],RON,,Unnamed,2015-12-04#,,[]\r\n')
         # We can import the same file.
         processor = PCNProductProcessor()
@@ -74 +74 @@
         result = processor.doImport(
             self.outfile,
-            ['contract_category','contract_title', 'description', 'options',
-            'product_id', 'terms_and_conditions','title','valid_from','valid_to',
+            ['contract_category','contract_title','contract_year',
+            'description', 'options',
+            'product_id', 'terms_and_conditions',
+            'title','valid_from','valid_to',
             'users_with_local_roles'],
             mode='create')
@@ -84 +86 @@
         result = processor.doImport(
             self.outfile,
-            ['contract_category','contract_title', 'description', 'options',
-            'product_id', 'terms_and_conditions','title','valid_from','valid_to',
+            ['contract_category','contract_title', 'contract_year',
+            'description', 'options',
+            'product_id', 'terms_and_conditions',
+            'title','valid_from','valid_to',
             'users_with_local_roles'],
             mode='update')