Changeset 16222 for main

Timestamp:

1 Sep 2020, 06:11:13 (4 years ago)

Author:

Henrik Bettermann

Message:

Implement Required Combi Payment.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Files:

• etranzact/browser.py (modified) (2 diffs)
• interswitch/browser.py (modified) (1 diff)
• students/tests/test_utils.py (modified) (5 diffs)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (4 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/etranzact/browser.py

@@ -160 +160 @@
         # and add the gateway amount.
         provider_amt = 0.0
-        if self.context.p_category == 'registration':
+        if self.context.p_category == 'registration' or \
+            self.context.p_category == 'required_combi':
             provider_amt = 5000.0
         if not self.context.r_company:
@@ -222 +223 @@
         # and add the gateway amount.
         provider_amt = 0.0
-        if self.context.p_category == 'registration':
+        if self.context.p_category == 'registration'or \
+            self.context.p_category == 'required_combi':
             provider_amt = 5000.0
         if not self.context.r_company:

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

@@ -117 +117 @@
             xmldict['institution_bank_id'] = '117'
             self.pay_item_id = '102'
-        if self.context.p_category == 'registration':
+        if self.context.p_category == 'registration' or \
+            self.context.p_category == 'required_combi':
             provider_amt = 5000.0
         if self.context.p_category in (

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/tests/test_utils.py

@@ -52 +52 @@
         self.assertEqual(error,
             'Registration Fee, Book Deposit, Development Fee, Municipal Fee, '
-            'Parents Consultative Forum (PCF) Fee must be paid before Tution Fee.')
+            'Parents Consultative Forum (PCF) Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
+        # A 'Required Combi Payment' is sufficient.
         reg_payment = createObject('waeup.StudentOnlinePayment')
-        reg_payment.p_category = u'registration'
+        reg_payment.p_category = u'required_combi'
         reg_payment.p_id = u'anyid'
         reg_payment.p_state = u'paid'
@@ -60 +62 @@
         self.student['payments']['anykey'] = reg_payment
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, None)
+        # Let's try with single payments.
+        reg_payment.p_category = u'registration'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error,
             'Book Deposit, Development Fee, Municipal Fee, Parents Consultative '
-            'Forum (PCF) Fee must be paid before Tution Fee.')
+            'Forum (PCF) Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
         IWorkflowState(self.student).setState('returning')
         configuration = createObject('waeup.SessionConfiguration')
@@ -71 +78 @@
         self.assertEqual(error,
             'Registration Fee, Book Deposit, Development Fee, Municipal Fee, '
-            'Parents Consultative Forum (PCF) Fee must be paid before Tution Fee.')
+            'Parents Consultative Forum (PCF) Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
         reg_payment.p_session = 2005
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error,
             'Book Deposit, Development Fee, Municipal Fee, Parents Consultative '
-            'Forum (PCF) Fee must be paid before Tution Fee.')
+            'Forum (PCF) Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
         pcf_payment = createObject('waeup.StudentOnlinePayment')
         pcf_payment.p_category = u'parentsconsult'
@@ -85 +94 @@
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error,
-            'Book Deposit, Development Fee, Municipal Fee must be paid before Tution Fee.')
+            'Book Deposit, Development Fee, Municipal Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
         munic_payment = createObject('waeup.StudentOnlinePayment')
         munic_payment.p_category = u'municipal_fresh'
@@ -94 +104 @@
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error,
-            'Book Deposit, Development Fee must be paid before Tution Fee.')
+            'Book Deposit, Development Fee must be paid before Tution Fee. '
+            'Make either single payments or make a \'Required Combi Payment\'.')
         book_payment = createObject('waeup.StudentOnlinePayment')
         book_payment.p_category = u'book'

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

@@ -68 +68 @@
             for category in self.REQUIRED_PAYMENTS.keys():
                 for ticket in student['payments'].values():
+                    if ticket.p_category == 'required_combi' and \
+                        ticket.p_session == session and \
+                        ticket.p_state == 'paid':
+                        cats_missing = None
+                        break
                     if ticket.p_state == 'paid' and \
                         ticket.p_category.startswith(category) and \
                         ticket.p_session == session:
                         del cats_missing[category]
-        if cats_missing:
-            return "%s must be paid before Tution Fee." % ', '.join(
-                cats_missing.values())
-        return
+                if not cats_missing:
+                    return
+        return "%s must be paid before Tution Fee. Make either single payments or make a 'Required Combi Payment'." % ', '.join(
+            cats_missing.values())
 
     def setPaymentDetails(self, category, student,
@@ -194 +199 @@
                 p_item += u'%s + ' % categories[cat]
             p_item = p_item.strip(' + ')
+        elif category == 'required_combi':
+            rp = deepcopy(self.REQUIRED_PAYMENTS)
+            for cat in rp:
+                fee_name = cat + '_fee'
+                cat_amount = getattr(academic_session, fee_name, 0.0)
+                if not cat_amount:
+                    return _('%s undefined.' % rp[cat]), None
+                amount += cat_amount
+                p_item += u'%s + ' % rp[cat]
+            p_item = p_item.strip(' + ')
         else:
             fee_name = category + '_fee'

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/utils/utils.py

@@ -72 +72 @@
         'resit9': '9 Make-Up Examination Courses',
         'id_card': 'Student ID Card',
+        'required_combi': 'Required Combi Payment',
         }
 
@@ -119 +120 @@
         'resit9': '9 Make-Up Examination Courses',
         'id_card': 'Student ID Card',
+        'required_combi': 'Required Combi Payment',
         }
 
@@ -150 +152 @@
 
     COMBI_PAYMENT_CATEGORIES = {
+        #'registration': 'Registration Fee',
         'grad_clearance': 'Clearance Fee',
         'late_registration': 'Late Registration Fee',
         'science': 'Science Bench Fee',
         'clinical': 'Clinical Fee (Medical Students)',
-        'develop': 'Development Fee',
-        'municipal_fresh': 'Municipal Fee (Fresh Students)',
-        'municipal_returning': 'Municipal Fee (Returning Students)',
+        #'develop': 'Development Fee',
+        #'municipal_fresh': 'Municipal Fee (Fresh Students)',
+        #'municipal_returning': 'Municipal Fee (Returning Students)',
         'alumni': 'Alumni Fee',
         'conv': 'Convocation Fee',
@@ -162 +165 @@
         'waecneco': 'WAEC and NECO Verification',
         'jambver': 'JAMB Verification',
-        'book': 'Book Deposit',
-        'parentsconsult': 'Parents Consultative Forum (PCF) Fee',
+        #'book': 'Book Deposit',
+        #'parentsconsult': 'Parents Consultative Forum (PCF) Fee',
         'pharmlab': 'Pharmacy Lab Support Fee',
         'lo_ident': 'Letter of Identification Fee',