Changeset 11759

Timestamp:

14 Jul 2014, 13:34:34 (10 years ago)

Author:

Henrik Bettermann

Message:

Fix: Special payment fee attributes must end with '_fee'.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

Files:

• interfaces.py (modified) (2 diffs)
• interswitch/browser.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interfaces.py

@@ -213 +213 @@
         required = True,
         )
+    log_book_fee = schema.Float(
+        title = _(u'Log Book Fees'),
+        default = 0.0,
+        required = True,
+        )
+    jamb_regularization_fee = schema.Float(
+        title = _(u'Jamb Regularization Fee'),
+        default = 0.0,
+        required = True,
+        )
     penalty_ug = schema.Float(
         title = _(u'UG Penalty Fee'),
@@ -223 +233 @@
         required = True,
         )
-    log_book_fees = schema.Float(
-        title = _(u'Log Book Fees'),
-        default = 0.0,
-        required = True,
-        )
-    jamb_regularization = schema.Float(
-        title = _(u'Jamb Regularization'),
-        default = 0.0,
-        required = True,
-        )
-
 
     def getSessionString():

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

@@ -180 +180 @@
         elif self.context.p_category == 'pgd_certificate':
             self.pay_item_id = '136'
-        elif self.context.p_category == 'log_book_fees':
+        elif self.context.p_category == 'log_book':
             self.pay_item_id = '137'
             xmldict['institution_acct'] = "1010508401"
@@ -353 +353 @@
             elif self.context.p_category == 'pgd_certificate':
                 self.pay_item_id = '136'
-            elif self.context.p_category == 'log_book_fees':
+            elif self.context.p_category == 'log_book':
                 self.pay_item_id = '137'
                 xmldict['institution_acct'] = "1010508401"

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/utils/utils.py

@@ -86 +86 @@
         'hnd_conv_brochure': 'HND Convocation Brochure',
         'pgd_conv_brochure': 'PGD Convocation Brochure',
-        'log_book_fees': 'Log Book Fees',
+        'log_book': 'Log Book Fees',
         'jamb_regularization': 'Jamb Regularization',
         }
@@ -124 +124 @@
         'hnd_conv_brochure': 'HND Convocation Brochure',
         'pgd_conv_brochure': 'PGD Convocation Brochure',
-        'log_book_fees': 'Log Book Fees',
+        'log_book': 'Log Book Fees',
         'jamb_regularization': 'Jamb Regularization',
         }
@@ -169 +169 @@
         'hnd_conv_brochure': 'HND Convocation Brochure',
         'pgd_conv_brochure': 'PGD Convocation Brochure',
-        'log_book_fees': 'Log Book Fees',
+        'log_book': 'Log Book Fees',
         'jamb_regularization': 'Jamb Regularization',
         }