From e8ad2ce21d3965c196674316f76dafed01ca5ea5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 7 Feb 2022 17:15:58 +0530
Subject: [PATCH] fix: Party Widget payment display
---
models/doctype/Party/PartyWidget.vue | 30 +++++++++++-----------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/models/doctype/Party/PartyWidget.vue b/models/doctype/Party/PartyWidget.vue
index 6ac80727..abc14cf1 100644
--- a/models/doctype/Party/PartyWidget.vue
+++ b/models/doctype/Party/PartyWidget.vue
@@ -25,16 +25,15 @@
{{
frappe.format(
- invoice.baseGrandTotal,
+ amountPaid(invoice),
invoiceMeta.getField('baseGrandTotal')
)
}}
-
+
({{
frappe.format(
invoice.baseGrandTotal,
@@ -59,7 +58,7 @@ export default {
props: ['doc'],
data() {
return {
- pendingInvoices: []
+ pendingInvoices: [],
};
},
computed: {
@@ -69,7 +68,7 @@ export default {
},
invoiceMeta() {
return frappe.getMeta(this.invoiceDoctype);
- }
+ },
},
mounted() {
this.fetchPendingInvoices();
@@ -86,14 +85,15 @@ export default {
'date',
'outstandingAmount',
'baseGrandTotal',
- 'submitted'
+ 'submitted',
],
filters: {
- [partyField]: this.doc.name
+ [partyField]: this.doc.name,
},
limit: 3,
- orderBy: 'creation'
+ orderBy: 'creation',
});
+ window.pendingInvoices = this.pendingInvoices;
},
getStatusBadge(doc) {
let statusColumn = getStatusColumn();
@@ -103,17 +103,11 @@ export default {
routeTo(`/edit/${this.invoiceDoctype}/${doc.name}`);
},
fullyPaid(invoice) {
- return invoice.outstandingAmount == 0;
+ return invoice.outstandingAmount.isZero();
},
- partiallyPaid(invoice) {
- return (
- invoice.outstandingAmount &&
- invoice.outstandingAmount !== invoice.baseGrandTotal
- );
+ amountPaid(invoice) {
+ return invoice.baseGrandTotal.sub(invoice.outstandingAmount);
},
- notPaid(invoice) {
- return invoice.outstandingAmount === invoice.baseGrandTotal;
- }
- }
+ },
};