Changeset 15664 for main/waeup.kofa/trunk/src/waeup

Timestamp:

13 Oct 2019, 19:15:33 (5 years ago)

Author:

Henrik Bettermann

Message:

Implement combi payments (tests will follow).

Location:

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

Files:

• applicants/tests/test_export.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• payments/interfaces.py (modified) (2 diffs)
• students/browser.py (modified) (4 diffs)
• students/browser_templates/onlinepaymentaddform.pt (modified) (4 diffs)
• students/interfaces.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (4 diffs)
• students/tests/test_export.py (modified) (13 diffs)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

@@ -288 +288 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_id,'
             'p_item,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
-            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            ',0.0,%s,application,[],p120,,2012,paid,,0.0,,,dp2011_654321,'
             '123456,Anna M. Tester\r\n' % cdate, result)
         return
@@ -302 +302 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_id,'
             'p_item,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
-            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            ',0.0,%s,application,[],p120,,2012,paid,,0.0,,,dp2011_654321,'
             '123456,Anna M. Tester\r\n' % cdate, result)
         return
@@ -317 +317 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_id,'
             'p_item,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
-            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            ',0.0,%s,application,[],p120,,2012,paid,,0.0,,,dp2011_654321,'
             '123456,Anna M. Tester\r\n' % cdate, result)
         return

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

@@ -303 +303 @@
     """A zope.schema-like field for usage in interfaces.
 
-    Marker interface to distuingish result entries from ordinary
+    Marker interface to distuingish referee entries from ordinary
     object fields. Needed for registration of widgets.
     """

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

@@ -37 +37 @@
     DICT_NAME = 'PAYMENT_CATEGORIES'
 
+class CombiPaymentCategorySource(ContextualDictSourceFactoryBase):
+    """A payment category source delivers all categories of payments.
+
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'COMBI_PAYMENT_CATEGORIES'
+
 class IPaymentsContainer(IKofaObject):
     """A container for all kind of payment objects.
@@ -59 +66 @@
         default = None,
         required = False,
+        )
+
+    p_combi = schema.List(
+        title = _(u'Combi Payment'),
+        value_type = schema.Choice(
+            source = CombiPaymentCategorySource(),
+            ),
+        required = False,
+        defaultFactory=list,
         )
 

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

@@ -1985 +1985 @@
     grok.template('onlinepaymentaddform')
     grok.require('waeup.payStudent')
-    form_fields = grok.AutoFields(IStudentOnlinePayment).select(
-        'p_category')
+    form_fields = grok.AutoFields(IStudentOnlinePayment).select('p_combi')
     label = _('Add online payment')
     pnav = 4
@@ -1999 +1998 @@
     @action(_('Create ticket'), style='primary')
     def createTicket(self, **data):
-        p_category = data['p_category']
-        previous_session = data.get('p_session', None)
-        previous_level = data.get('p_level', None)
+        form = self.request.form
+        p_category = form.get('form.p_category', None)
+        p_combi = form.get('form.p_combi', None)
+        if isinstance(form.get('form.p_combi', None), unicode):
+            p_combi = [p_combi,]
         student = self.context.__parent__
         # The hostel_application payment category is temporarily used
@@ -2020 +2021 @@
         students_utils = getUtility(IStudentsUtils)
         error, payment = students_utils.setPaymentDetails(
-            p_category, student, previous_session, previous_level)
+            p_category, student, None, None, p_combi)
         if error is not None:
             self.flash(error, type="danger")
             return
         if p_category == 'transfer':
-            payment.p_item = self.request.form['new_programme']
+            payment.p_item = form['new_programme']
         self.context[payment.p_id] = payment
         self.flash(_('Payment ticket created.'))
@@ -2061 +2062 @@
         students_utils = getUtility(IStudentsUtils)
         error, payment = students_utils.setPaymentDetails(
-            p_category, student, previous_session, previous_level)
+            p_category, student, previous_session, previous_level, None)
         if error is not None:
             self.flash(error, type="danger")

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

@@ -10 +10 @@
         <td>
           <select id="form.p_category" name="form.p_category" size="1"
-                  class="form-control half" onclick="test()">
+                  class="form-control half" onclick="further()">
             <option tal:repeat="item view/selectable_categories"
                     tal:attributes="value python:item[0]">
@@ -18 +18 @@
         </td>
       </tr>
+    </tbody>
+  </table>
+
+  <table id="widgets" class="form-table" style="display: none;">
+    <tbody>
+      <tal:widgets content="structure provider:widgets" />
     </tbody>
   </table>
@@ -47 +53 @@
 
 <script type="text/javascript">
-  function test() {
+  function further() {
       if (document.getElementById('form.p_category').value == 'transfer') {
           document.getElementById('p_item').style.display = 'block';
@@ -53 +59 @@
           document.getElementById('p_item').style.display = 'none';
       }
+      if (document.getElementById('form.p_category').value == 'combi') {
+          document.getElementById('widgets').style.display = 'block';
+      } else {
+          document.getElementById('widgets').style.display = 'none';
+      }
   }
 </script>

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

@@ -83 +83 @@
 
     def setPaymentDetails(category, student, previous_session=None,
-            previous_level=None,):
+            previous_level=None, combi=None):
         """Create Payment object and set the payment data of a student for
         the payment category specified.

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -3834 +3834 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
             'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
@@ -3880 +3880 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
             'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
@@ -4237 +4237 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
             'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)
@@ -4263 +4263 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            '666,12.12,2012-12-13 00:00:00#,schoolfee,1,my-id,p-item,100,2013,'
+            '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,2013,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
             'Tester,created,2004,2004,,fac1,dep1,CERT1' in self.browser.contents)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -823 +823 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,\r\n'
+            ',0.0,2012-04-01 13:12:01#,,[],1,,,,,unpaid,,0.0,,,,,\r\n'
             )
         return
@@ -841 +841 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,paid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -861 +861 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,paid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -881 +881 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,paid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -904 +904 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,paid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -942 +942 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,paid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -960 +960 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
@@ -971 +971 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
@@ -984 +984 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
@@ -1009 +1009 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
@@ -1019 +1019 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,'
             'p-item,100,%s,unpaid,%s-04-01 14:12:01#,12.12,'
             'r-code,,A111111,created,2012\r\n'
@@ -1048 +1048 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,p_item,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,p_item,'
             'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
             'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,'
             'state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
 
-            '666,12.12,%s-04-01 13:12:01#,schoolfee,1,my-id,p-item,100,%s,'
+            '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,r-code,,A111111,234,123,'
             'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
@@ -1107 +1107 @@
         self.assertEqual(
             result,
-            'ac,amount_auth,creation_date,p_category,p_current,p_id,p_item,'
+            'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,p_item,'
             'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
             'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,'
             'state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
-            'abc,12.12,%s-04-01 13:12:01#,bed_allocation,1,id1,xyz,100,%s,'
+            'abc,12.12,%s-04-01 13:12:01#,bed_allocation,[],1,id1,xyz,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,cde,,A111111,234,123,'
             'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
-            'abc,12.12,%s-04-01 13:12:01#,hostel_maintenance,1,id2,xyz,100,%s,'
+            'abc,12.12,%s-04-01 13:12:01#,hostel_maintenance,[],1,id2,xyz,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,cde,,A111111,234,123,'
             'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'

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

@@ -403 +403 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session, previous_level):
+            previous_session, previous_level, combi):
         """Create a payment ticket and set the payment data of a
         student for the payment category specified.
@@ -493 +493 @@
             else:
                 return _(u'No bed allocated.'), None
+        elif category == 'combi' and combi:
+            categories = getUtility(IKofaUtils).COMBI_PAYMENT_CATEGORIES
+            for cat in combi:
+                fee_name = cat + '_fee'
+                cat_amount = getattr(academic_session, fee_name, 0.0)
+                if not cat_amount:
+                    return _('%s undefined.' % categories[cat]), None
+                amount += cat_amount
+                p_item += u'%s + ' % categories[cat]
+            p_item = p_item.strip(' + ')
         else:
             fee_name = category + '_fee'

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

@@ -183 +183 @@
         'app_balance': 'Application Fee Balance',
         'transcript': 'Transcript Fee',
-        'late_registration': 'Late Course Registration Fee'
+        'late_registration': 'Late Course Registration Fee',
+        'combi': 'Combi Payments',
         }
 
@@ -200 +201 @@
     BALANCE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee',
+        }
+
+    COMBI_PAYMENT_CATEGORIES = {
+        'gown': 'Gown Hire Fee',
+        'transcript': 'Transcript Fee',
+        'late_registration': 'Late Course Registration Fee',
         }