Changeset 16416 for main/kofacustom.dspg/trunk

Timestamp:

17 Mar 2021, 21:19:49 (4 years ago)

Author:

Henrik Bettermann

Message:

abraham: "enable *NADESU/SA/SUG* and *GNS Dues* payment pre-codition for the payment of 2020/2021 session school fee for SPAT (Part-time), same way it is for full-time (regular) students"

Location:

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

Files:

• interswitch/tests.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

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

@@ -172 +172 @@
         self.certificate.study_mode = 'nd_ft'
         self.certificate.school_fee_3 = 30000.0
-        # dep_sug tickets cannot be created
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['dep_sug']
-        self.browser.getControl("Create ticket").click()
-        self.assertTrue('Amount could not be determined' in self.browser.contents)
-        #self.assertTrue('ticket created' in self.browser.contents)
-        #ctrl = self.browser.getControl(name='val_id')
-        #dep_sug_pid = ctrl.options[0]
-        #self.assertTrue(self.student['payments'][dep_sug_pid].amount_auth == 1650)
-        #self.browser.getLink(dep_sug_pid).click()
-        #self.browser.getLink("Pay via Interswitch", index=0).click()
-        #self.student['payments'][dep_sug_pid].p_state = 'paid'
-        #self.assertTrue(
-        #    '<item_detail item_id="1" item_name="Students Welfare" '
-        #    'item_amt="50000" bank_id="11" acct_num="0037892949" />'
-        #    in self.browser.contents)
+        # Add dep_sug and gns tickets.
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_category = u'dep_sug'
+        payment.p_session = self.student.current_session
+        payment.p_id = u'anyid'
+        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
         # Add school fee ticket
         self.browser.open(self.payments_path + '/addop')

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

@@ -172 +172 @@
                 # Students are only allowed to pay school fee 
                 # 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):
+                if not self._dep_sug_gns_paymentMade(student, student.current_session):
                     return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
                 penalty = getattr(academic_session, 'lsfp_penalty_fee')
@@ -260 +259 @@
         elif category == 'dep_sug':
             amount = 3150.0 # includes GATEWAY_AMT
-            if student.faccode == 'SPAT':
+            #if student.faccode == 'SPAT':
             #    amount = 1650.0 # includes GATEWAY_AMT
-                amount = 0.0
+            #    amount = 0.0
             if student.state == RETURNING and not previous_session:
                 p_session, p_level = self.getReturningData(student)