Changeset 16026 for main/kofacustom.dspg

Timestamp:

6 Mar 2020, 14:07:50 (5 years ago)

Author:

Henrik Bettermann

Message:

Implement HND and ND Final Clearance Pack applications.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

• applicants/browser.py (modified) (6 diffs)
• applicants/utils.py (modified) (1 diff)
• applicants/viewlets.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/browser.py

@@ -170 +170 @@
         if self.context.special:
             return grok.AutoFields(ICustomSpecialApplicant)
-        if self.target == 'conv':
+        if self.target in ('conv', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
@@ -238 +238 @@
     @property
     def form_fields(self):
-        if self.target in ('conv', 'special'):
+        if self.target in ('conv', 'special', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
@@ -276 +276 @@
             form_fields['applicant_id'].for_display = True
             return form_fields
-        if self.target == 'conv':
+        if self.target in ('conv', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
@@ -317 +317 @@
             form_fields['applicant_id'].for_display = True
             return form_fields
-        if self.target == 'conv':
+        if self.target in ('conv', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(
@@ -384 +384 @@
     @property
     def form_fields(self):
-        if self.context.__parent__.prefix in ('conv', 'special'):
+        if self.context.__parent__.prefix in (
+            'conv', 'special', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomApplicant).select(
                 'applicant_id', 'reg_number', 'email')
@@ -406 +407 @@
         form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
         form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-        if self.context.__parent__.__parent__.prefix in ('conv', 'special'):
+        if self.context.__parent__.__parent__.prefix in (
+            'conv', 'special', 'hndfincl', 'ndfincl'):
             form_fields = form_fields.omit('p_session')
         return form_fields

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/utils.py

@@ -54 +54 @@
         'special': ['Supplementary Payment', 'SP'],
         'conv': ['Convocation Pack Payment', 'CPP'],
+        'hndfincl': ['HND Final Clearance Pack Payment', 'HNDF'],
+        'ndfincl': ['ND Final Clearance Pack Payment', 'NDF'],
         }
 

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/viewlets.py

@@ -31 +31 @@
         if self.context.state in ('initialized', 'started', 'paid'):
             return
-        if self.context.__parent__.prefix == 'conv':
+        if self.context.__parent__.prefix in ('conv', 'hndfincl', 'ndfincl'):
             return
         return self.view.url(self.view.context, self.target)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interswitch/browser.py

@@ -510 +510 @@
             xmldict['institution_acct'] = '1015220292'
             xmldict['institution_bank_id'] = '117'
-        elif self.applicant.__parent__.prefix == 'conv':
+        elif self.applicant.__parent__.prefix in ('conv', 'hndfincl', 'ndfincl'):
             xmldict['institution_acct'] = '1012808851'
             xmldict['institution_bank_id'] = '117'