Changeset 15742 for main/waeup.aaue/trunk

Timestamp:

2 Nov 2019, 08:07:06 (5 years ago)

Author:

Henrik Bettermann

Message:

Configure fac_dep fee.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• interfaces.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

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

@@ -230 +230 @@
         )
 
-    fac_dep_fee = schema.Float(
-        title = _(u'Faculty and Departmental Dues'),
-        default = 0.0,
-        required = True,
-        )
+    #fac_dep_fee = schema.Float(
+    #    title = _(u'Faculty and Departmental Dues'),
+    #    default = 0.0,
+    #    required = True,
+    #    )
 
     restitution_fee = schema.Float(

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

@@ -602 +602 @@
         # Faculty and Departmental Dues
         elif self.context.p_category == 'fac_dep':
+            xmldict['institution_acct'] = '1016425386'
+            xmldict['institution_bank_id'] = '117'
             self.pay_item_id = '117'
             xmldict['institution_amt'] = 100 * (

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

@@ -111 +111 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'ac,amount_auth,creation_date,gateway_amt,p_category,p_combi,p_current,'
+            'ac,amount_auth,creation_date,gateway_amt,net_amt,p_category,p_combi,p_current,'
             'p_id,p_item,p_level,p_session,p_split_data,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,%s-04-01 13:12:01#,,schoolfee,[],1,my-id,p-item,'
+            '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,'
             '789,r-code,interswatch,,,,A111111,created,2012\r\n'

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

@@ -462 +462 @@
             else:
                 amount += academic_session.penalty_ug
+        elif category == ('fac_dep'):
+            if student.faccode in ('FAT', 'FED', 'FLW', 'FMS', 'FSS'):
+                amount = 4000.0
+            elif student.faccode in ('FAG', 'FBM', 'FCS',
+                                     'FES', 'FET', 'FLS', 'FPS'):
+                amount = 5000.0
+            elif student.faccode == 'AGR' and student.current_level == 400:
+                amount = 10000.0
+            elif student.depcode == 'VAT':
+                amount = 5000.0
         elif not student.is_postgrad:
             fee_name = category + '_fee'