Changeset 15718 for main

Timestamp:

29 Oct 2019, 13:13:31 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust to base package.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly

Files:

• interswitch/tests.py (modified) (7 diffs)
• students/browser.py (modified) (3 diffs)

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

@@ -97 +97 @@
             '<span>40000.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertTrue('<input type="hidden" name="pay_item_id" value="101" />' in
                            self.browser.contents)
@@ -119 +119 @@
             '<span>3456.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertTrue('<input type="hidden" name="pay_item_id" value="101" />' in
                            self.browser.contents)
@@ -139 +139 @@
         self.student['payments']['xyz'] = acc_payment
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...<input type="hidden" name="pay_item_id" value="101" />...',
                            self.browser.contents)
@@ -151 +151 @@
         acc_payment.creation_date -= delta
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',
@@ -158 +158 @@
         acc_payment.creation_date += delta
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -277 +277 @@
     def test_interswitch_form(self):
         # Manager can access InterswitchForm
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -286 +286 @@
         self.applicant.values()[0].creation_date -= delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/browser.py

@@ -29 +29 @@
     StudentBasePDFFormPage, ExportPDFCourseRegistrationSlip,
     CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
-    BedTicketAddPage, ExportPDFTranscriptSlip,
+    ExportPDFTranscriptSlip,
     msave, emit_lock_message)
 from waeup.kofa.students.interfaces import (
@@ -41 +41 @@
     NigeriaExportPDFPaymentSlip,
     NigeriaExportPDFClearanceSlip,
+    NigeriaBedTicketAddPage,
     )
 from kofacustom.edopoly.students.interfaces import (
@@ -47 +48 @@
 from kofacustom.edopoly.interfaces import MessageFactory as _
 
-class CustomBedTicketAddPage(BedTicketAddPage):
+class CustomBedTicketAddPage(NigeriaBedTicketAddPage):
     with_ac = False