Changeset 15828

Timestamp:

19 Nov 2019, 20:31:30 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base packages.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• interswitch/browser.py (modified) (4 diffs)
• remita/browser.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser.py

@@ -73 +73 @@
             self.redirect(self.url(self.context, '@@index'))
             return
+        self.context.r_company = u'interswitch'
         student = self.student
         xmldict = self.xmldict
@@ -135 +136 @@
         self.context.provider_amt = provider_amt
         self.context.gateway_amt = GATEWAY_AMT
+        self.amount_auth = int(100 * self.context.amount_auth)
         return
 
@@ -154 +156 @@
             self.redirect(self.url(self.context, '@@index'))
             return
+        self.context.r_company = u'interswitch'
         xmldict = {}
         provider_amt = 400.0
@@ -184 +187 @@
         self.context.provider_amt = provider_amt
         self.context.gateway_amt = GATEWAY_AMT
+        self.amount_auth = int(100 * self.context.amount_auth)
         return
 

main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py

@@ -185 +185 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         self.orderId = self.context.p_id
@@ -279 +280 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         self.orderId = self.context.p_id

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -321 +321 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        # Managers can open payment slip
-        self.browser.getLink("Download payment slip").click()
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
+        # Managers can open payment slip because we did not proceed to
+        # any payment gateway
+        self.assertFalse('Download payment slip' in self.browser.contents)
         # Set ticket paid
         ticket = self.student['payments'].items()[0][1]

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py

@@ -103 +103 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'ac,amount_auth,creation_date,gateway_amt,p_category,p_combi,p_current,'
+            'ac,amount_auth,creation_date,gateway_amt,net_amt,p_category,p_combi,p_current,'
             'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
             'r_pay_reference,rebate_amount,staff_rebate,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,%s-04-01 13:12:01#,,schoolfee,[],1,my-id,p-item,'
+            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
             '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
             '789,r-code,interswatch,,,,,,A111111,created,2012\r\n'