Changeset 16431 for main

Timestamp:

25 Mar 2021, 09:45:54 (4 years ago)

Author:

Henrik Bettermann

Message:

Add payment option (p_option) field to payment tickets and add
select box on online payment add form pages. Disable this feature
in the base package.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/export.py (modified) (1 diff)
• src/waeup/kofa/payments/interfaces.py (modified) (2 diffs)
• src/waeup/kofa/students/browser.py (modified) (8 diffs)
• src/waeup/kofa/students/browser_templates/onlinepaymentaddform.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/previouspaymentaddform.pt (added)
• src/waeup/kofa/students/export.py (modified) (3 diffs)
• src/waeup/kofa/utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Add payment option (`p_option`) field to payment tickets and add
+  select box on online payment add form pages. Disable this feature
+  in the base package.
 
 * Allow lecturers to export all course tickets, not only

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

@@ -819 +819 @@
             self.redirect(self.url(self.context))
             return
+        if getattr(self.context, 'p_option', None):
+            payment.p_option = self.context.p_option
         self.context[payment.p_id] = payment
         self.context.writeLogMessage(self, 'added: %s' % payment.p_id)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py

@@ -162 +162 @@
         IApplicantOnlinePayment,
         exclude_attribs=False,
-        omit=['display_item']))) + (
+        omit=['display_item', 'p_option']))) + (
               'applicant_id',
               'reg_number',

main/waeup.kofa/trunk/src/waeup/kofa/payments/interfaces.py

@@ -38 +38 @@
     DICT_NAME = 'PAYMENT_CATEGORIES'
 
+class PaymentOptionSource(ContextualDictSourceFactoryBase):
+    """A payment option source delivers all options of a payment.
+
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'PAYMENT_OPTIONS'
+
 class CombiPaymentCategorySource(ContextualDictSourceFactoryBase):
     """A payment category source delivers all categories of payments.
@@ -61 +68 @@
         source = PaymentCategorySource(),
         required = True,
+        )
+
+    p_option = schema.Choice(
+        title = _(u'Payment Option'),
+        source = PaymentOptionSource(),
+        required = False,
         )
 

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

@@ -2241 +2241 @@
         return sorted(categories.items(), key=lambda value: value[1])
 
+    @property
+    def selectable_payment_options(self):
+        student = self.context.__parent__
+        options = getUtility(
+            IKofaUtils).selectable_payment_options(student)
+        return sorted(options.items(), key=lambda value: value[1])
+
     @action(_('Create ticket'), style='primary')
     def createTicket(self, **data):
         form = self.request.form
         p_category = form.get('form.p_category', None)
+        p_option = form.get('form.p_option', None)
         p_combi = form.get('form.p_combi', [])
         if isinstance(form.get('form.p_combi', None), unicode):
@@ -2272 +2280 @@
         if p_category == 'transfer':
             payment.p_item = form['new_programme']
+        if p_option:
+            payment.p_option = p_option
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))
@@ -2287 +2297 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('addpp')
+    grok.template('previouspaymentaddform')
     grok.require('waeup.payStudent')
     form_fields = grok.AutoFields(IStudentPreviousPayment)
@@ -2299 +2310 @@
         return
 
+    @property
+    def selectable_payment_options(self):
+        student = self.context.__parent__
+        options = getUtility(
+            IKofaUtils).selectable_payment_options(student)
+        return sorted(options.items(), key=lambda value: value[1])
+
     @action(_('Create ticket'), style='primary')
     def createTicket(self, **data):
         p_category = data['p_category']
+        p_option = data.get('p_option', None)
         previous_session = data.get('p_session', None)
         previous_level = data.get('p_level', None)
@@ -2311 +2330 @@
             self.flash(error, type="danger")
             return
+        if p_option:
+            payment.p_option = p_option
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))
@@ -2327 +2348 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('addbp')
+    grok.template('previouspaymentaddform')
     grok.require('waeup.manageStudent')
     form_fields = grok.AutoFields(IStudentBalancePayment)
@@ -2332 +2354 @@
     pnav = 4
 
+    @property
+    def selectable_payment_options(self):
+        student = self.context.__parent__
+        options = getUtility(
+            IKofaUtils).selectable_payment_options(student)
+        return sorted(options.items(), key=lambda value: value[1])
+
     @action(_('Create ticket'), style='primary')
     def createTicket(self, **data):
         p_category = data['p_category']
+        p_option = data.get('p_option', None)
         balance_session = data.get('balance_session', None)
         balance_level = data.get('balance_level', None)
@@ -2346 +2376 @@
             self.flash(error, type="danger")
             return
+        if p_option:
+            payment.p_option = p_option
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/onlinepaymentaddform.pt

@@ -14 +14 @@
                     tal:attributes="value python:item[0]">
               <span tal:replace="python:item[1]">FEE CATEGORY</span>
+            </option>
+          </select>
+        </td>
+      </tr>
+      <tr tal:condition="view/selectable_payment_options">
+        <td class="fieldname">
+          Payment Option:
+        </td>
+        <td>
+          <select id="form.p_option" name="form.p_option" size="1"
+                  class="form-control half" onclick="further()">
+            <option tal:repeat="item view/selectable_payment_options"
+                    tal:attributes="value python:item[0]">
+              <span tal:replace="python:item[1]">PAYMENT OPTION</span>
             </option>
           </select>

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

@@ -491 +491 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item', 'certificate', 'student']))) + (
+            omit=['display_item', 'certificate', 'student', 'p_option']))) + (
             'student_id','state','current_session')
     title = _(u'Student Payments (Data Backup)')
@@ -520 +520 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item', 'certificate', 'student', 'ac']))) + (
+            omit=['display_item', 'certificate', 'student', 'ac', 'p_option']))) + (
             'student_id','faccode', 'depcode', 'state','current_session')
     title = _(u'Student Payments (Sorted Data)')
@@ -640 +640 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item', 'certificate', 'student']))) + (
+            omit=['display_item', 'certificate', 'student', 'p_option']))) + (
             'student_id','matric_number','reg_number',
             'firstname', 'middlename', 'lastname','sex',

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

@@ -188 +188 @@
         }
 
+    #: If PAYMENT_OPTIONS is empty, payment option fields won't show up.
+    PAYMENT_OPTIONS = {
+        #'credit_card': 'Credit Card',
+        #'debit_card': 'Debit Card',
+        }
+
     def selectable_payment_categories(self, student):
         return self.PAYMENT_CATEGORIES
+
+    def selectable_payment_options(self, student):
+        return self.PAYMENT_OPTIONS
 
     PREVIOUS_PAYMENT_CATEGORIES = deepcopy(PAYMENT_CATEGORIES)