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

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/customers

Files:

• browser.py (modified) (2 diffs)
• contracts.py (modified) (9 diffs)
• export.py (modified) (9 diffs)
• interfaces.py (modified) (12 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -20 +20 @@
 from zope.component import getUtility
 from waeup.ikoba.interfaces import IIkobaUtils, IExtFileStore
+from waeup.ikoba.browser.layout import action
 from waeup.ikoba.customers.browser import (
-    PDFContractSlipPage, CustomerBaseEditFormPage)
+    PDFContractSlipPage, CustomerBaseEditFormPage, ContractSelectProductPage, msave)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 from ikobacustom.pcn.customers.interfaces import (
@@ -88 +89 @@
             return error
         return
+
+
+class ContractSelectProductPage(ContractSelectProductPage):
+    """ Page to select a contract product
+
+    This page is for both customers and officers.
+    """
+
+    @action(_('Save and proceed'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        self.context.contract_year = self.context.product_object.contract_year
+        self.context.title = self.context.product_object.contract_autotitle
+        self.context.tc_dict = self.context.product_object.tc_dict
+        self.context.valid_from = self.context.product_object.valid_from
+        self.context.valid_to = self.context.product_object.valid_to
+        isCustomer = getattr(
+            self.request.principal, 'user_type', None) == 'customer'
+        if isCustomer:
+            self.redirect(self.url(self.context, 'edit'))
+        else:
+            self.redirect(self.url(self.context, 'manage'))
+        return

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/contracts.py

@@ -67 +67 @@
 
 
-class RONContract(ContractBase):
+class PCNContract(ContractBase):
+    """This is a sample contract.
+    """
+
+    def __init__(self):
+        super(PCNContract, self).__init__()
+        # The site doesn't exist in unit tests
+        self.contract_year = None
+        return
+
+
+class RONContract(PCNContract):
     """This is a sample contract.
     """
@@ -105 +116 @@
 
 
-class ROPContract(ContractBase):
+class ROPContract(PCNContract):
     """This is a sample contract.
     """
@@ -143 +154 @@
 
 
-class RPRContract(ContractBase):
+class RPRContract(PCNContract):
     """Registration in the Provisional Register contract.
     """
@@ -181 +192 @@
 
 
-class RPCContract(ContractBase):
+class RPCContract(PCNContract):
     """Registration as Pharmaceutical Chemist contract.
     """
@@ -219 +230 @@
 
 
-class IPPMVLContract(ContractBase):
+class IPPMVLContract(PCNContract):
     """Issuance of Patent and Proprietary Medicines Vendors License contract.
     """
@@ -257 +268 @@
 
 
-class RPPMVLContract(ContractBase):
+class RPPMVLContract(PCNContract):
     """Renewal of Patent and Proprietary Medicines Vendors License contract.
     """
@@ -295 +306 @@
 
 
-class APPITContract(ContractBase):
+class APPITContract(PCNContract):
     """Accepting Pupil Pharmacist for Internship Training contract.
     """
@@ -333 +344 @@
 
 
-class RPTContract(ContractBase):
+class RPTContract(PCNContract):
     """Registration as a Pharmacy Technician contract.
     """
@@ -371 +382 @@
 
 
-class APPTContract(ContractBase):
+class APPTContract(PCNContract):
     """Annual Permit for Pharmacy Technician contract.
     """

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/export.py

@@ -35 +35 @@
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
+
 class PCNCustomerExporter(CustomerExporter):
     """Exporter for Customers.
@@ -49 +50 @@
     title = _(u'PCN Customer JPG Documents')
     class_name = 'PCNCustomerJPGDocument'
+
 
 class PCNCustomerPDFDocumentExporter(CustomerDocumentExporterBase):
@@ -76 +78 @@
     class_name = 'ROPContract'
 
+
 class RPRContractExporter(ContractExporterBase):
     """Exporter for Contract instances.
@@ -83 +86 @@
     title = _(u'Licenses: Registration in the Provisional Register')
     class_name = 'RPRContract'
+
 
 class RPCContractExporter(ContractExporterBase):
@@ -92 +96 @@
     class_name = 'RPCContract'
 
+
 class IPPMVLContractExporter(ContractExporterBase):
     """Exporter for Contract instances.
@@ -99 +104 @@
     title = _(u'Licenses: Issuance of Patent and Proprietary Medicines Vendors')
     class_name = 'IPPMVLContract'
+
 
 class RPPMVLContractExporter(ContractExporterBase):
@@ -108 +114 @@
     class_name = 'RPPMVLContract'
 
+
 class APPITContractExporter(ContractExporterBase):
     """Exporter for Contract instances.
@@ -115 +122 @@
     title = _(u'Licenses: Accepting Pupil Pharmacist for Internship Training')
     class_name = 'APPITContract'
+
 
 class RPTContractExporter(ContractExporterBase):
@@ -124 +132 @@
     class_name = 'RPTContract'
 
+
 class APPTContractExporter(ContractExporterBase):
     """Exporter for Contract instances.

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

@@ -19 +19 @@
 from zope import schema
 from datetime import datetime
+from zope.interface import Attribute, Interface
 from zc.sourcefactory.basic import BasicSourceFactory
 from waeup.ikoba.interfaces import IIkobaObject
@@ -38 +39 @@
 def year_range():
     curr_year = datetime.now().year
-    return range(curr_year - 2, curr_year + 5)
+    return range(curr_year - 20, curr_year + 2)
 
 class PracticeSource(BasicSourceFactory):
@@ -86 +87 @@
     """
 
+class IPCNContract(IContract):
+    """A Retention of Name contract.
+
+    """
+    contract_year = Attribute('Year of License')
+
+
 # Customer contract interfaces
 
-class IRONContract(IContract):
+class IRONContract(IPCNContract):
     """A Retention of Name contract.
 
@@ -105 +113 @@
         )
 
-    year_qualification = schema.Choice(
+    qualification_year = schema.Choice(
         title = _(u'Year of Qualification'),
         required = True,
@@ -182 +190 @@
 
 
-class IROPContract(IContract):
+class IROPContract(IPCNContract):
     """A Registration of Premises contract.
 
@@ -291 +299 @@
     #    )
 
-class IRPRContract(IContract):
+class IRPRContract(IPCNContract):
     """A Registration in the Provisional Register contract.
 
@@ -425 +433 @@
 
 
-class IRPCContract(IContract):
+class IRPCContract(IPCNContract):
     """A Registration as Pharmaceutical Chemist contract.
 
@@ -570 +578 @@
     'certificates_object'].order
 
-class IIPPMVLContract(IContract):
+class IIPPMVLContract(IPCNContract):
     """A Issuance of Patent and Proprietary Medicines Vendors License.
 
@@ -744 +752 @@
     'incometax_object'].order
 
-class IRPPMVLContract(IContract):
+class IRPPMVLContract(IPCNContract):
     """A Renewal of Patent and Proprietary Medicines Vendors License.
 
@@ -876 +884 @@
     """
 
-class IAPPITContract(IContract):
+class IAPPITContract(IPCNContract):
     """A Accepting Pupil Pharmacist for Internship Training contract.
 
@@ -1020 +1028 @@
     """
 
-class IRPTContract(IContract):
+class IRPTContract(IPCNContract):
     """A Registration as a Pharmacy Technician contract.
 
@@ -1130 +1138 @@
     """
 
-class IAPPTContract(IContract):
+class IAPPTContract(IPCNContract):
     """An Annual Permit for Pharmacy Technician contract.
 

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

@@ -224 +224 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
-            'categories_practice,class_name,comment,contract_category,contract_id,'
-            'fee_based,history,last_product_id,lga,nationality,product_object,'
-            'product_options,state,superintendent,'
-            'tc_dict,title,user_id,valid_from,valid_to,work_address,work_email,work_phone,'
-            'year_qualification\r\n'
-            '[],RONContract,,ron,%s,0,'
-            '[u\'2015-01-18 16:40:01 WAT - License created by system\'],,,,,'
-            '[],created,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
+            'categories_practice,class_name,comment,contract_category,'
+            'contract_id,contract_year,fee_based,history,last_product_id,'
+            'lga,nationality,product_object,product_options,'
+            'qualification_year,state,superintendent,tc_dict,'
+            'title,user_id,valid_from,valid_to,work_address,'
+            'work_email,work_phone\r\n'
+            '[],RONContract,,ron,%s,,0,'
+            '[u\'2015-03-20 19:13:53 WAT - License created by system\']'
+            ',,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,,,\r\n'
             % self.contract1.contract_id)
         # We can reimport the file if we change the header
@@ -283 +284 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(result,
-            'categories_practice,class_name,contract_category,contract_id,'
-            'date_of_qualification,fee_based,history,inspected,last_license_number,'
+            'categories_practice,class_name,contract_category,'
+            'contract_id,contract_year,date_of_qualification,'
+            'fee_based,history,inspected,last_license_number,'
             'last_product_id,official_in_state,other_directors,'
             'pharmacists_directors,premises_address,premises_certificate,'
-            'product_object,product_options,recommended,'
-            'state,superintendent,tc_dict,title,user_id,valid_from,valid_to,'
-            'work_address\r\n'
-
-            '[],ROPContract,rop,%s,,0,'
-            '[u\'2015-01-20 18:51:03 WAT - License created by system\']'
+            'product_object,product_options,recommended,state,'
+            'superintendent,tc_dict,title,user_id,valid_from,'
+            'valid_to,work_address\r\n'
+
+            '[],ROPContract,rop,%s,,,0,'
+            '[u\'2015-03-20 19:18:30 WAT - License created by system\']'
             ',,,,,,,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
             % self.contract2.contract_id)