Changeset 18115

Timestamp:

9 Jul 2025, 15:16:55 (4 hours ago)

Author:

Henrik Bettermann

Message:

Revert last changes.

File:

• main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py (modified) (2 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py

@@ -154 +154 @@
         reduced_inst_amt = 0.0
         lab_amt = 0.0
-        if self.context.student.is_postgrad:
-            inst_acct = "3000151027"
+        #if self.context.student.is_postgrad:
+        #    inst_acct = "3000151027"
         if self.context.p_category in ('schoolfee', 'schoolfee_1'):
             provider_amt = self.dynamic_provider_amt(self.context.student)
@@ -184 +184 @@
                           "beneficiaryAmount":student_union,"deductFeeFrom":"0"},)
 
-        ## Disabled on 07/07/25
+        # Disabled on 07/07/25
+        # Reenabled on 09/07/25
         # We overwrite linetems in case of postgrad student school fee payments
-        #if self.context.student.is_postgrad and self.context.p_category == 'schoolfee':
-        #    microfinance_amt = 0.1 * inst_amt
-        #    inst_amt -= microfinance_amt
-        #    lineitems = (
-        #                  {"lineItemsId":"itemid1","beneficiaryName":"Uniben",
-        #                  "beneficiaryAccount":inst_acct,"bankCode":inst_bankcode,
-        #                  "beneficiaryAmount":inst_amt,"deductFeeFrom":"1"},
-        #                )
-        #    lineitems += ({"lineItemsId":"itemid2","beneficiaryName":"SPGS Scheme",
-        #                  "beneficiaryAccount":"0025636203","bankCode":"039",
-        #                  "beneficiaryAmount":microfinance_amt,"deductFeeFrom":"0"},
-        #                 {"lineItemsId":"itemid3","beneficiaryName":"WAeAC",
-        #                  "beneficiaryAccount":"1014261520","bankCode":"057",
-        #                  "beneficiaryAmount":provider_amt,"deductFeeFrom":"0"},)
+        if self.context.student.is_postgrad and self.context.p_category == 'schoolfee':
+            microfinance_amt = 0.1 * inst_amt
+            inst_amt -= microfinance_amt
+            lineitems = (
+                          {"lineItemsId":"itemid1","beneficiaryName":"Uniben",
+                          "beneficiaryAccount":inst_acct,"bankCode":inst_bankcode,
+                          "beneficiaryAmount":inst_amt,"deductFeeFrom":"1"},
+                        )
+            lineitems += ({"lineItemsId":"itemid2","beneficiaryName":"SPGS Scheme",
+                          "beneficiaryAccount":"0025636203","bankCode":"039",
+                          "beneficiaryAmount":microfinance_amt,"deductFeeFrom":"0"},
+                         {"lineItemsId":"itemid3","beneficiaryName":"WAeAC",
+                          "beneficiaryAccount":"1014261520","bankCode":"057",
+                          "beneficiaryAmount":provider_amt,"deductFeeFrom":"0"},)
 
         ## Disabled on 24/02/21