Changeset 15950 for main

Timestamp:

24 Jan 2020, 08:36:46 (5 years ago)

Author:

Henrik Bettermann

Message:

Add Fedex payment application.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

• applicant.py (modified) (2 diffs)
• browser.py (modified) (4 diffs)
• interfaces.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/applicant.py

@@ -26 +26 @@
 from waeup.aaue.applicants.interfaces import(
     ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit,
-    IPUTMEApplicantEdit, ITranscriptApplicant, ICertificateRequest)
+    IPUTMEApplicantEdit, ITranscriptApplicant, ICertificateRequest,
+    IFedexRequest)
 
 @grok.subscribe(ICustomApplicant, grok.IObjectRemovedEvent)
@@ -41 +42 @@
     grok.implements(ICustomApplicant, ICustomUGApplicantEdit,
         ICustomPGApplicantEdit, IPUTMEApplicantEdit,
-        ITranscriptApplicant, ICertificateRequest)
+        ITranscriptApplicant, ICertificateRequest,
+        IFedexRequest)
     grok.provides(ICustomApplicant)
 

main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

@@ -54 +54 @@
     ICustomApplicant,
     IVerificationRequest,
-    ISendByEmailRequest
+    ISendByEmailRequest,
+    IFedexRequest
     )
 
@@ -246 +247 @@
             form_fields['body_address'].custom_widget = BytesDisplayWidget
             return form_fields
+        if self.target is not None and self.target == 'fedex':
+            form_fields = grok.AutoFields(IFedexRequest).omit(
+                'locked', 'suspended')
+            form_fields['dispatch_address'].custom_widget = BytesDisplayWidget
+            return form_fields
         if self.target is not None and self.target == 'send':
             form_fields = grok.AutoFields(ISendByEmailRequest).omit(
@@ -415 +421 @@
             form_fields['applicant_id'].for_display = True
             return form_fields
+        if self.target is not None and self.target == 'fedex':
+            form_fields = grok.AutoFields(IFedexRequest)
+            form_fields['applicant_id'].for_display = True
+            return form_fields
         # AAUE is using the same interface for all regular applications.
         form_fields = grok.AutoFields(ICustomUGApplicant)
@@ -532 +542 @@
         if self.target is not None and self.target == 'send':
             form_fields = grok.AutoFields(ISendByEmailRequest).omit(
+                'locked', 'suspended')
+            form_fields['applicant_id'].for_display = True
+            return form_fields
+        if self.target is not None and self.target == 'fedex':
+            form_fields = grok.AutoFields(IFedexRequest).omit(
                 'locked', 'suspended')
             form_fields['applicant_id'].for_display = True

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -899 +899 @@
         )
 
+class IFedexRequest(IKofaObject):
+    """A applicant requests payment for courier.
+    """
+
+    suspended = schema.Bool(
+        title = _(u'Account suspended'),
+        default = False,
+        required = False,
+        )
+
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        required = False,
+        )
+
+    applicant_id = schema.TextLine(
+        title = _(u'Applicant Id'),
+        required = False,
+        readonly = False,
+        )
+
+    #reg_number = TextLineChoice(
+    #    title = _(u'Kofa Registration Number'),
+    #    readonly = False,
+    #    required = True,
+    #    source = contextual_reg_num_source,
+    #    )
+
+    firstname = schema.TextLine(
+        title = _(u'First Name'),
+        required = True,
+        )
+
+    middlename = schema.TextLine(
+        title = _(u'Middle Name'),
+        required = False,
+        )
+
+    lastname = schema.TextLine(
+        title = _(u'Last Name (Surname)'),
+        required = True,
+        )
+
+    sex = schema.Choice(
+        title = _(u'Gender'),
+        source = GenderSource(),
+        required = True,
+        )
+
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+
+    phone = PhoneNumber(
+        title = _(u'Phone'),
+        description = u'',
+        required = False,
+        )
+
+    matric_number = schema.TextLine(
+        title = _(u'WES Reference Number (where applicable)'),
+        readonly = False,
+        required = False,
+        )
+
+    dispatch_address = schema.Text(
+        title = _(u'Dispatch Address'),
+        required = True,
+        )
+
 class ISendByEmailRequest(IKofaObject):
     """A applicant asking for sending an email.

main/waeup.aaue/trunk/src/waeup/aaue/applicants/utils.py

@@ -47 +47 @@
         'ver': ['Verification Request', 'VR'],
         'send': ['Send-By-Email Request', 'SE'],
+        'fedex': ['Payment for Courier (Fedex)', 'FED'],
         }