Changeset 16632 for main/kofacustom.iuokada/trunk

Timestamp:

21 Sep 2021, 07:44:14 (3 years ago)

Author:

Henrik Bettermann

Message:

Next try.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students

Files:

• browser.py (modified) (2 diffs)
• browser_templates/paymentsmanagepage.pt (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -270 +270 @@
         SF_PAYMENTS = ('schoolfee', 'schoolfee40', 'secondinstal', 'clearance')
         if cs > self.context.student.entry_session:
-            sf_paid = {cs-1: 0, cs: 0, cs+1: 0}
+            sf_paid = {cs-1: 0.0, cs: 0.0, cs+1: 0.0}
             sessions = (cs-1, cs, cs+1)
         else:
-            sf_paid = {cs: 0, cs+1: 0}
+            sf_paid = {cs: 0.0, cs+1: 0.0}
             sessions = (cs, cs+1)
         try:
@@ -283 +283 @@
         else:
             total_sf = getattr(certificate, 'school_fee_2', 0.0)
-        for ticket in self.context.student['payments'].values():
+        brought_fwd = 0.0
+        for ticket in self.context.values():
+            amt = ticket.net_amt
+            if not amt:
+                amt = ticket.amount_auth
             if ticket.p_category in SF_PAYMENTS and \
                 ticket.p_state == 'paid' and \
                 ticket.p_session in sessions:
-                sf_paid[ticket.p_session] += ticket.net_amt
-        brought_fwd = 0.0
-        for key in self.context.keys():
-            ticket = self.context[key]
+                sf_paid[ticket.p_session] += amt
             if ticket.p_state != 'paid' and\
                ticket.p_category == 'brought_fwd':

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser_templates/paymentsmanagepage.pt

@@ -44 +44 @@
   </div>
   <br /><br />
-
+  <p>
+  <strong>Balance Brought Forward:</strong> <span tal:content ="python: view.schoolfee_payments_made[2]">BROUGHTFORWARD</span>
+  </p>
+  <br />
   <table class="table" style="width: 50%;">
     <thead>
@@ -59 +62 @@
         <td tal:content ="python: view.schoolfee_payments_made[1]">TOTAL</td>
         <td tal:content ="python: sfpm[1]">AMOUNT</td>
-        <td tal:content ="python: view.schoolfee_payments_made[1]-sfpm[1]">DUE</td>
+        <td tal:content ="python: view.schoolfee_payments_made[1]+view.schoolfee_payments_made[2]-sfpm[1]">DUE</td>
         
       </tr>
     </tbody>
   </table>
-  <p>
-  <strong>Balance Brought Forward:</strong> <span tal:content ="python: view.schoolfee_payments_made[2]">BROUGHTFORWARD</span>
-  </p>
-
 </form>