Changeset 16205 for main

Timestamp:

18 Aug 2020, 09:09:15 (4 years ago)

Author:

Henrik Bettermann

Message:

Adjust lineitems.

File:

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

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

@@ -261 +261 @@
     def lineitems(self):
         provider_amt = 1000.0
-        if not self.context.p_item != 'Balance':
-            if self.context.__parent__.applicant_id.startswith('pre'):
-                provider_amt = 2000.0
-            if self.context.__parent__.applicant_id.startswith('tsc'):
-                provider_amt = 1200.0
-            if self.context.__parent__.applicant_id.startswith('ase'):
-                provider_amt = 500.0
+        if self.context.__parent__.applicant_id.startswith('pre'):
+            provider_amt = 2000.0
+        if self.context.__parent__.applicant_id.startswith('tsc'):
+            provider_amt = 1200.0
+        if self.context.__parent__.applicant_id.startswith('ase'):
+            provider_amt = 500.0
         if self.context.__parent__.applicant_id.startswith('dp'):
             inst_acct = "0040217361038"
@@ -274 +273 @@
         if self.context.__parent__.applicant_id.startswith('cbt'):
             provider_amt = 300.0
+        if self.context.p_item == 'Balance':
+            provider_amt = 0.0
         inst_amt = self.context.amount_auth - provider_amt
         lineitems = (
@@ -279 +280 @@
                       "beneficiaryAccount":inst_acct,"bankCode":"000",
                       "beneficiaryAmount":inst_amt,"deductFeeFrom":"1"},
-                      {"lineItemsId":"itemid2","beneficiaryName":"WAeAC",
-                      "beneficiaryAccount":"1014261520","bankCode":"057",
-                      "beneficiaryAmount":provider_amt,"deductFeeFrom":"0"}
                     )
+        if provider_amt:
+            lineitems += ({"lineItemsId":"itemid2","beneficiaryName":"WAeAC",
+                          "beneficiaryAccount":"1014261520","bankCode":"057",
+                          "beneficiaryAmount":provider_amt,"deductFeeFrom":"0"},)
+
         self.context.provider_amt = provider_amt
         self.context.net_amt = inst_amt