Changeset 16144

Timestamp:

5 Jul 2020, 21:01:00 (4 years ago)

Author:

Henrik Bettermann

Message:

Configure DESTINATION_COST.

Location:

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

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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

@@ -134 +134 @@
     'date_of_birth',
     'sex',
-    'place_of_birth',
     'nationality',
     'entry_mode',

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

@@ -80 +80 @@
 
 DESTINATION_COST = {
-    'none': ('To the moon', 1000000000.0, 1),
-    #'nigeria': ('Nigeria', 2000.0, 1),
-    #'africa': ('Africa ', 3000.0, 2),
-    #'eurasia': ('Europe/Asia ', 3000.0, 3),
+    #'none': ('To the moon', 1000000000.0, 1),
+    'nigeria': ('Within Nigeria', 20000.0, 1),
+    'africa': ('Within Africa ', 30000.0, 2),
+    'inter': ('International', 35000.0, 3),
     }
 
@@ -275 +275 @@
         )
 
-    place_of_birth = schema.TextLine(
-        title = _(u'Place of Birth'),
-        readonly = False,
-        required = False,
-        )
-
     nationality = schema.Choice(
         vocabulary = nats_vocab,

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

@@ -123 +123 @@
             for cat in applicant.registration_cats:
                 payment.amount_auth += REGISTRATION_CATS[cat][1]
+            return
         elif applicant.container_code.startswith('trans'):
             cost = DESTINATION_COST[applicant.charge][1]
             payment.amount_auth = applicant.no_copies * cost
             payment.p_category = 'transcript'
+            return
         else:
             payment.p_category = 'application'