Changeset 18014 for main/waeup.uniben/trunk

Timestamp:

12 Feb 2025, 01:22:42 (40 hours ago)

Author:

Henrik Bettermann

Message:

Revise DESTINATION_COST. Keep old items.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py

@@ -117 +117 @@
 DESTINATION_COST = {
     #'none': ('To the moon', 1000000000.0, 1),
-    'nigeria': ('Local (Within Nigeria)', 25000.0, 1),
-    #'africa': ('Within Africa ', 30000.0, 2),
-    'inter': ('International', 35000.0, 3),
-    #'cert_nigeria': ('Certified Copy - Within Nigeria', 13000.0, 4),
-    #'cert_africa': ('Certified Copy - Within Africa', 23000.0, 5),
-    #'cert_inter': ('Certified Copy - International', 28000.0, 6),
+    'nigeria': ('Within Nigeria (deprecated)', 20000.0, 1),
+    'africa': ('Within Africa (deprecated)', 30000.0, 2),
+    'inter': ('International (deprecated)', 35000.0, 3),
+    'cert_nigeria': ('Certified Copy - Within Nigeria (deprecated)', 13000.0, 4),
+    'cert_africa': ('Certified Copy - Within Africa (deprecated)', 23000.0, 5),
+    'cert_inter': ('Certified Copy - International (deprecated)', 28000.0, 6),
+    'nigeria2': ('Local (Within Nigeria)', 25000.0, 1),
+    'inter2': ('International', 35000.0, 3),
     }
 

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

@@ -352 +352 @@
         applicant_url = self.browser.url
         self.browser.getControl("Create and make online").click()
+        self.assertTrue('This fee is outdated' in self.browser.contents)
+        self.browser.getLink("Application record").click()
+        self.browser.getControl(name="form.charge").value = ['nigeria2']
+        self.browser.getControl("Save").click()
+        self.browser.getControl("Create and make online").click()
         self.assertTrue('Payment ticket created' in self.browser.contents)
         self.assertTrue('<span>50000.0</span>' in self.browser.contents)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/utils.py

@@ -138 +138 @@
             if not applicant.charge:
                 return _(u'No transcript charge selected.')
+            if 'deprecated' in DESTINATION_COST[applicant.charge][0]:
+                return _(u'This fee is outdated. Please select the current ranscript charge.')
             cost = DESTINATION_COST[applicant.charge][1]
             payment.amount_auth = applicant.no_copies * cost