Include support for partial transfers for guardians

lessons/models.py

@@ -85,7 +85,7 @@ def unpaid_invoices(self):
     @property
     def underpaid_invoices(self):
         transfer_list = self.transfers
-        # invoice_list = self.invoices.filter(id__in=transfer_list.values('invoice_id'))
+
         underpaid_invoices = {}
         for transfer in transfer_list:
             if transfer.amount_received < transfer.invoice.price:
@@ -125,6 +125,40 @@ class Guardian(User):
     class Meta:
         proxy = True
 
+    @property
+    def invoices(self):
+        return Invoice.objects.filter(student=self)
+
+    @property
+    def transfers(self):
+        # Make sure incomplete transfers aren't repeated when displayed separately
+        return Transfer.objects.filter(invoice__student=self)
+
+    @property
+    def unpaid_invoices(self):
+        transfer_list = self.transfers
+        invoice_list = self.invoices.exclude(id__in=transfer_list.values('invoice_id'))
+        return invoice_list
+
+    @property
+    def underpaid_invoices(self):
+        transfer_list = self.transfers
+
+        underpaid_invoices = {}
+        for transfer in transfer_list:
+            if transfer.amount_received < transfer.invoice.price:
+                if(underpaid_invoices.get(transfer.invoice)):
+                    underpaid_invoices[transfer.invoice] += transfer.amount_received
+                    if(underpaid_invoices[transfer.invoice] >= transfer.invoice.price):
+                        # Removes invoice from the list of underpaid invoices if the invoice is paid fully or overpaid
+                        del underpaid_invoices[transfer.invoice]
+                else:
+                    underpaid_invoices[transfer.invoice] = transfer.amount_received
+
+
+
+        return underpaid_invoices
+
 '''Admin users'''
 # manages all Admins 
 class AdminManager(BaseUserManager):
@@ -271,6 +305,10 @@ def amount_paid(self):
             amount += transfer.amount_received
 
         return amount
+
+    @property
+    def amount_pending(self):
+        return self.price - self.amount_paid
 
 
 def present_or_past_date(value):

lessons/templates/balance.html

@@ -29,7 +29,7 @@ <h6><i class="bi bi-bookmark-fill"></i> <b>Unique Reference Number</b></h6>
                     <div>
                         <h6><i class="bi bi-cash"></i> <b>Price</b></h6>
                         {% for invoice in invoices %}
-                            <p>£ {{ invoice.price }}</p>
+                            <p>£ {{ invoice.amount_pending }}</p>
                         {% endfor %}
                     </div>
                 </div>