Changeset 15685

Timestamp:

15 Oct 2019, 20:13:06 (5 years ago)

Author:

Henrik Bettermann

Message:

Set payment.p_combi but do not display it. We need this list for posting split payment data to Nigerian the payment gateways.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• students/browser.py (modified) (3 diffs)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -2000 +2000 @@
         form = self.request.form
         p_category = form.get('form.p_category', None)
-        p_combi = form.get('form.p_combi', None)
+        p_combi = form.get('form.p_combi', [])
         if isinstance(form.get('form.p_combi', None), unicode):
             p_combi = [p_combi,]
@@ -2117 +2117 @@
     grok.name('index')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IStudentOnlinePayment).omit('p_item')
+    form_fields = grok.AutoFields(IStudentOnlinePayment).omit(
+        'p_item', 'p_combi')
     form_fields[
         'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -2170 +2171 @@
     grok.name('payment_slip.pdf')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IStudentOnlinePayment).omit('p_item')
+    form_fields = grok.AutoFields(IStudentOnlinePayment).omit(
+        'p_item', 'p_combi')
     form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -403 +403 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session, previous_level, combi):
+            previous_session, previous_level, combi=[]):
         """Create a payment ticket and set the payment data of a
         student for the payment category specified.
@@ -521 +521 @@
         payment.p_current = p_current
         payment.amount_auth = amount
+        payment.p_combi = combi
         return None, payment
 

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

@@ -184 +184 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
-        'combi': 'Combi Payments',
+        'combi': 'Combi Payment',
         }