Changeset 12604 for main

Timestamp:

12 Feb 2015, 09:56:13 (10 years ago)

Author:

Henrik Bettermann

Message:

Add Renewal of Patent and Proprietary Medicines Vendors License.

Location:

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

Files:

• customers/batching.py (modified) (2 diffs)
• customers/contracts.py (modified) (2 diffs)
• customers/export.py (modified) (2 diffs)
• customers/interfaces.py (modified) (5 diffs)
• customers/tests/test_contract.py (modified) (3 diffs)
• customers/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

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

@@ -30 +30 @@
     IRPRContract,
     IRPCContract,
-    IIPPMVLContract)
+    IIPPMVLContract,
+    IRPPMVLContract)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -105 +106 @@
     iface = IIPPMVLContract
     factory_name = 'waeup.IPPMVLContract'
+
+class RPPMVLContractProcessor(ContractProcessorBase):
+    """A batch processor for IRPPMVLContract objects.
+    """
+    util_name = 'rppmvlcontractprocessor'
+    grok.name(util_name)
+    name = _('Renewal of Patent and Proprietary Medicines Vendors License (Contract) Processor')
+    iface = IRPPMVLContract
+    factory_name = 'waeup.RPPMVLContract'

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

@@ -48 +48 @@
     IIPPMVLContractProcess,
     IIPPMVLContractOfficialUse,
+    IRPPMVLContract,
+    IRPPMVLContractEdit,
+    IRPPMVLContractProcess,
+    IRPPMVLContractOfficialUse,
     )
 
@@ -240 +244 @@
         return implementedBy(IPPMVLContract)
 
+class RPPMVLContract(ContractBase):
+    """Renewal of Patent and Proprietary Medicines Vendors License contract.
+    """
+
+    grok.implements(
+        IRPPMVLContractProcess,
+        IRPPMVLContract,
+        IRPPMVLContractEdit,
+        ICustomerNavigation)
+
+    contract_category = 'rppmvl'
+
+    form_fields_interface = IRPPMVLContract
+
+    edit_form_fields_interface = IRPPMVLContractEdit
+
+    ou_form_fields_interface = IRPPMVLContractOfficialUse
+
+    check_docs_interface = IRPPMVLContract
+
+RPPMVLContract = attrs_to_fields(RPPMVLContract)
+
+
+class RPPMVLContractFactory(grok.GlobalUtility):
+    """A factory for contracts.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.RPPMVLContract')
+    title = u"Create a new license contract.",
+    description = u"This factory instantiates new contract instances."
+
+    def __call__(self, *args, **kw):
+        return RPPMVLContract(*args, **kw)
+
+    def getInterfaces(self):
+        return implementedBy(RPPMVLContract)
+

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

@@ -28 +28 @@
     IRPRContractProcess,
     IRPCContractProcess,
-    IIPPMVLContractProcess)
+    IIPPMVLContractProcess,
+    IRPPMVLContractProcess)
 from ikobacustom.pcn.interfaces import MessageFactory as _
 
@@ -95 +96 @@
     title = _(u'Issuance of Patent and Proprietary Medicines Vendors Licenses')
     class_name = 'IPPMVLContract'
+
+class RPPMVLContractExporter(ContractExporterBase):
+    """Exporter for Contract instances.
+    """
+    grok.name('rppmvlcontracts')
+    iface = IRPPMVLContractProcess
+    title = _(u'Renewal of Patent and Proprietary Medicines Vendors Licenses')
+    class_name = 'RPPMVLContract'

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

@@ -91 +91 @@
         source = LGASource(),
         title = _(u'State / LGA'),
-        required = True,
+        required = False,
         )
 
@@ -597 +597 @@
         source = LGASource(),
         title = _(u'State / LGA'),
-        required = True,
+        required = False,
         )
 
@@ -643 +643 @@
         )
 
-    referee1_occupation = schema.Text(
+    referee1_occupation = schema.TextLine(
         title = _(u'First Referee Occupation'),
         required = False,
@@ -667 +667 @@
         )
 
-    referee2_occupation = schema.Text(
+    referee2_occupation = schema.TextLine(
         title = _(u'Second Referee Occupation'),
         required = False,
@@ -711 +711 @@
         )
 
+    incometax_object = schema.Choice(
+        title = _(u'Income Tax Clearance'),
+        description = u'Select the pdf document which contains scanned copies '
+                      u'of your income tax clearance for the past three years. '
+                      u'You must create such a document first.',
+        source = CustomerDocumentSource(),
+        required = True,
+        )
+
 IIPPMVLContractEdit['certificates_object'].order = IIPPMVLContract[
     'certificates_object'].order
+
+IIPPMVLContractEdit['incometax_object'].order = IIPPMVLContract[
+    'incometax_object'].order
+
+class IRPPMVLContract(IContract):
+    """A Renewal of Patent and Proprietary Medicines Vendors License.
+
+    """
+
+    res_address = schema.Text(
+        title = _(u'Residential Address'),
+        required = False,
+        )
+
+    shop_address = schema.Text(
+        title = _(u'Patent Vendor\'s Shop'),
+        description = u'Enter name and address of patent vendor\'s shop.',
+        required = False,
+        )
+
+    shop_lga = schema.Choice(
+        source = LGASource(),
+        title = _(u'State / LGA'),
+        required = False,
+        )
+
+    shop_email = schema.ASCIILine(
+        title = _(u'Shop Email Address'),
+        required = False,
+        constraint=validate_email,
+        )
+
+    shop_phone = PhoneNumber(
+        title = _(u'Shop Phone'),
+        description = u'',
+        required = False,
+        )
+
+    PPMVL_number = schema.TextLine(
+        title = _(u'PPMVL Data'),
+        description = u'State PPMVL number and date of issue of last license.',
+        required = False,
+        readonly = False,
+        )
+
+    referee1_name = schema.TextLine(
+        title = _(u'First Referee Name'),
+        required = False,
+        readonly = False,
+        )
+
+    referee1_address = schema.Text(
+        title = _(u'First Referee Address'),
+        required = False,
+        readonly = False,
+        )
+
+    referee1_license = schema.TextLine(
+        title = _(u'First Referee License Number'),
+        required = False,
+        readonly = False,
+        )
+
+    referee1_occupation = schema.TextLine(
+        title = _(u'First Referee Occupation'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_name = schema.TextLine(
+        title = _(u'Second Referee Name'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_address = schema.Text(
+        title = _(u'Second Referee Address'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_license = schema.TextLine(
+        title = _(u'Second Referee License Number'),
+        required = False,
+        readonly = False,
+        )
+
+    referee2_occupation = schema.TextLine(
+        title = _(u'Second Referee Occupation'),
+        required = False,
+        readonly = False,
+        )
+
+
+class IRPPMVLContractOfficialUse(IIkobaObject):
+    """Interface for editing RPPMVL official use data.
+
+    """
+
+    comment = schema.Text(
+        title= _('Reason for rejection'),
+        required = False,
+        )
+
+
+class IRPPMVLContractProcess(IRPPMVLContract, IRPPMVLContractOfficialUse):
+    """Interface for processing RPPMVL data.
+    """
+
+    product_options = schema.List(
+        title = _(u'Options/Fees'),
+        value_type = ProductOptionField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+
+class IRPPMVLContractEdit(IRPPMVLContract):
+    """Interface for editing RPPMVL data by customers.
+
+    """

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

@@ -35 +35 @@
     RPCContract,
     IPPMVLContract,
+    RPPMVLContract,
     )
 from ikobacustom.pcn.customers.interfaces import (
@@ -42 +43 @@
     IRPCContract,
     IIPPMVLContract,
+    IRPPMVLContract,
     )
 
@@ -96 +98 @@
         self.assertEqual(container[id5], contract5)
         self.assertEqual(contract5.class_name, 'IPPMVLContract')
+
+        contract6 = createObject(u'waeup.RPPMVLContract')
+        id6 = contract6.contract_id
+        container.addContract(contract6)
+        self.assertEqual(container[id6], contract6)
+        self.assertEqual(contract6.class_name, 'RPPMVLContract')
         return

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

@@ -60 +60 @@
         'IPPMVLContract': _(
             'Issuance of Patent and Proprietary Medicines Vendors License'),
+        'RPPMVLContract': _(
+            'Renewal of Patent and Proprietary Medicines Vendors License'),
         }
 
@@ -74 +76 @@
         'rprcontracts',
         'rpccontracts',
-        'ippmvlcontracts')
+        'ippmvlcontracts',
+        'rppmvlcontracts')

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/utils/utils.py

@@ -51 +51 @@
         'rpc': 'Registration as Pharmaceutical Chemist',
         'ippmvl': 'Issuance of Patent and Proprietary Medicines Vendors License',
+        'rppmvl': 'Renewal of Patent and Proprietary Medicines Vendors License',
         'no': 'no license',
         }
@@ -76 +77 @@
         'rprcontracts',
         'rpccontracts',
-        'ippmvlcontracts')
+        'ippmvlcontracts',
+        'rppmvlcontracts')
 
     BATCH_PROCESSOR_NAMES = (
@@ -87 +89 @@
         'rpccontractprocessor',
         'ippmvlcontractprocessor',
+        'rppmvlcontractprocessor',
         'pcnproductprocessor',
         'pdfdocumentprocessor',