Changeset 16309 for main

Timestamp:

10 Nov 2020, 14:33:53 (4 years ago)

Author:

Henrik Bettermann

Message:

Implement GNS Pack payments. This is a good example how sophisticated such requirements are.

Location:

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

Files:

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

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interfaces.py

@@ -406 +406 @@
         )
 
+    gns_1_fee = schema.Float(
+        title = _(u'GNS Pack I'),
+        default = 0.0,
+        required = True,
+        )
+
+    gns_2_fee = schema.Float(
+        title = _(u'GNS Pack II'),
+        default = 0.0,
+        required = True,
+        )
+
     bfn_fee = schema.Float(
         title = _(u'BFN Pack'),

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

@@ -186 +186 @@
             xmldict['institution_acct'] = '2015327204'
             xmldict['institution_bank_id'] = '8'
+        elif self.context.p_category == 'gns_1':
+            self.pay_item_id = '154'
+            xmldict['institution_acct'] = '2017447652'
+            xmldict['institution_bank_id'] = '8'
+        elif self.context.p_category == 'gns_2':
+            self.pay_item_id = '155'
+            xmldict['institution_acct'] = '2017447652'
+            xmldict['institution_bank_id'] = '8'
         elif self.context.p_category == 'hostel_maintenance':
             if self.context.p_item != 'Balance':

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

@@ -67 +67 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertTrue('You have to pay NADESU/SA/SUG Dues first'
+        self.assertTrue('You have to pay NADESU/SA/SUG and GNS Dues first'
             in self.browser.contents)
         payment = createObject('waeup.StudentOnlinePayment')
@@ -75 +75 @@
         payment.p_state = u'paid'
         self.student['payments']['anykey'] = payment
+        payment2 = createObject('waeup.StudentOnlinePayment')
+        payment2.p_category = u'gns_1'
+        payment2.p_session = self.student.current_session
+        payment2.p_id = u'anyid2'
+        payment2.p_state = u'paid'
+        self.student['payments']['anykey2'] = payment2
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']

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

@@ -88 +88 @@
         self.assertEqual(payment.p_session, 2005)
         self.assertEqual(payment.amount_auth, 3150.0)
-        # Students can pay school fee if dep_sug has been paid first.
+        # Students can pay school fee if dep_sug and gns dues have been paid first.
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
         error, payment = utils.setPaymentDetails('dep_sug',self.student)
         self.student['payments']['any_key'] = payment
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
+
+        configuration.gns_1_fee = 1150.0
+        error, payment2 = utils.setPaymentDetails('gns_1',self.student)
+        self.student['payments']['any_key2'] = payment2
+        self.assertEqual(payment2.p_level, 200)
+        self.assertEqual(payment2.p_session, 2005)
+        self.assertEqual(payment2.amount_auth, 1150.0)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+
         self.student['payments']['any_key'].p_state = 'paid'
+        self.student['payments']['any_key2'].p_state = 'paid'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error, None)

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

@@ -38 +38 @@
     STUDENT_ID_PREFIX = u'P'
 
-    def _dep_sug_paymentMade(self, student, session):
+    def _dep_sug_gns_paymentMade(self, student, session):
         if student.state == RETURNING:
             session += 1
+        dep_sug = False
+        gns = False
         if len(student['payments']):
             for ticket in student['payments'].values():
@@ -46 +48 @@
                     ticket.p_category == 'dep_sug' and \
                     ticket.p_session == session:
+                    dep_sug = True
+                if ticket.p_state == 'paid' and \
+                    ticket.p_category.startswith('gns') and \
+                    ticket.p_session == session:
+                    gns = True
+                if dep_sug and gns:
                     return True
         return False
@@ -163 +171 @@
             else:
                 # Students are only allowed to pay school fee 
-                # if current session dep_sug payment has been made.
-                if student.faccode != 'SPAT' and not self._dep_sug_paymentMade(
+                # if current session dep_sug_gns payment has been made.
+                if student.faccode != 'SPAT' and not self._dep_sug_gns_paymentMade(
                     student, student.current_session):
-                    return _('You have to pay NADESU/SA/SUG Dues first.'), None
+                    return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
                 penalty = getattr(academic_session, 'lsfp_penalty_fee')
                 if  penalty and not self._lsfp_penalty_paymentMade(
@@ -257 +265 @@
             if student.state == RETURNING and not previous_session:
                 p_session, p_level = self.getReturningData(student)
+        elif category.startswith('gns'):
+            if student.state == RETURNING and not previous_session:
+                p_session, p_level = self.getReturningData(student)
+                fee_name = category + '_fee'
+                academic_session = self._getSessionConfiguration(p_session)
+                amount = getattr(academic_session, fee_name, 0.0)
         else:
             fee_name = category + '_fee'

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

@@ -116 +116 @@
         'sbs_1':'SBS Pack I',
         'sbs_2':'SBS Pack II',
+        'gns_1':'GNS Pack I',
+        'gns_2':'GNS Pack II',
         'bfn':'BFN Pack',
         'mkt':'MKT Pack',
@@ -184 +186 @@
         'sbs_1':'SBS Pack I',
         'sbs_2':'SBS Pack II',
+        'gns_1':'GNS Pack I',
+        'gns_2':'GNS Pack II',
         'bfn':'BFN Pack',
         'mkt':'MKT Pack',