Changeset 12585 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

10 Feb 2015, 15:39:09 (10 years ago)

Author:

Henrik Bettermann

Message:

Only valid (active) products are selectable in UI.

Location:

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

Files:

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

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

@@ -32 +32 @@
     contextual_reg_num_source, contextual_email_source,
     GenderSource, nats_vocab,
-    ConCatProductSource, CustomerDocumentSource,
+    ConCatProductSource, ConCatActiveProductSource,
+    CustomerDocumentSource,
     ProductOptionSourceFactory)
 
@@ -332 +333 @@
     product_object = schema.Choice(
         title = _(u'Product'),
-        source = ConCatProductSource(),
+        source = ConCatActiveProductSource(),
         required = True,
         )

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

@@ -113 +113 @@
         self.product.title = u'Our Sample Product'
         self.product.contract_category = self._contract_category
-        self.product.valid_from = date(2015, 12, 4)
+        self.product.valid_from = date(2014, 12, 4)
         self.product.tc_dict = {'en': u'Hello world'}
         prodoption = ProductOption()
@@ -1265 +1265 @@
         self.assertEqual(
             self.browser.url, self.contracts_path + '/%s/selectproduct' % conid)
-        # SAM is in the correct contract_category ...
+        # SAM is in the correct contract_category
         self.assertTrue('<option value="SAM">' in self.browser.contents)
-        # ... but NOTSAM not.
-        self.assertFalse('<option value="LIC">' in self.browser.contents)
         # So far last_product_id is None.
         self.assertTrue(self.customer['contracts'][conid].last_product_id is None)
@@ -1331 +1329 @@
         product.title = u'Our License Product'
         product.contract_category = u'license'
+        product.valid_from = date(2014, 12, 4)
         self.app['products'].addProduct(product)
         # Customers can manage contracts under certain conditions
@@ -1357 +1356 @@
         # SAM is in the correct contract_category ...
         self.assertTrue('<option value="SAM">' in self.browser.contents)
-        # ... but NOTSAM not.
+        # ... but LIC not.
         self.assertFalse('<option value="LIC">' in self.browser.contents)
         # So far last_product_id is None.

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

@@ -23 +23 @@
 import tempfile
 import shutil
+from datetime import date
 from zope.component.hooks import setSite
 from zope.component import queryUtility, createObject
@@ -29 +30 @@
 from waeup.ikoba.interfaces import SUBMITTED
 from waeup.ikoba.customers.vocabularies import (
-    ConCatProductSource, CustomerDocumentSource)
+    ConCatProductSource, ConCatActiveProductSource, CustomerDocumentSource)
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
 
@@ -96 +97 @@
         self.assertEqual(result, u'SAM - Our Sample Product')
 
+    def test_getValues_ConCatActiveProductSource(self):
+        source = ConCatActiveProductSource()
+        self.product.valid_from = date(2030, 12, 4)
+        self.product.valid_to = None
+        self.product.contract_category = u'sample'
+        result = source.factory.getValues(self.contract)
+        self.assertFalse(self.product in result)
+        self.product.valid_from = None
+        self.product.valid_to = date(2030, 12, 4)
+        self.product.contract_category = u'sample'
+        result = source.factory.getValues(self.contract)
+        self.assertTrue(self.product in result)
+        self.product.valid_from = None
+        self.product.valid_to = date(2010, 12, 4)
+        self.product.contract_category = u'sample'
+        result = source.factory.getValues(self.contract)
+        self.assertFalse(self.product in result)
+        self.product.valid_from = date(2010, 12, 4)
+        self.product.valid_to = None
+        self.product.contract_category = u'sample'
+        result = source.factory.getValues(self.contract)
+        self.assertTrue(self.product in result)
+
     def test_getValues_CustomerDocumentSource(self):
         source = CustomerDocumentSource()

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

@@ -19 +19 @@
 """
 import grok
+from datetime import date
 from zope.component import getUtility, queryUtility
 from zope.catalog.interfaces import ICatalog
@@ -157 +158 @@
 
 
+class ConCatActiveProductSource(ConCatProductSource):
+    """A contract category product source delivers all products
+    which belong to a certain contract_category.
+    """
+
+    def getValues(self, context):
+        concat = getattr(context, 'contract_category', None)
+        products = grok.getSite()['products'].values()
+        if not concat:
+            return products
+        now = date.today()
+        resultlist = [
+            value for value in products
+            if value.contract_category == concat
+                and (not value.valid_from or value.valid_from <= now)
+                and (not value.valid_to or value.valid_to >= now)
+            ]
+        return resultlist
+
+
 class CustomerDocumentSource(BasicContextualSourceFactory):
     """A customer document source delivers all submitted and verified documents