mirror of
https://github.com/frappe/books.git
synced 2024-09-20 03:29:00 +00:00
fix: Party Widget payment display
This commit is contained in:
parent
0acdaa9b78
commit
e8ad2ce21d
@ -25,16 +25,15 @@
|
|||||||
<div>
|
<div>
|
||||||
<span
|
<span
|
||||||
class="font-medium text-gray-900"
|
class="font-medium text-gray-900"
|
||||||
v-if="fullyPaid(invoice) || notPaid(invoice)"
|
|
||||||
>
|
>
|
||||||
{{
|
{{
|
||||||
frappe.format(
|
frappe.format(
|
||||||
invoice.baseGrandTotal,
|
amountPaid(invoice),
|
||||||
invoiceMeta.getField('baseGrandTotal')
|
invoiceMeta.getField('baseGrandTotal')
|
||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
</span>
|
</span>
|
||||||
<span class="text-gray-600" v-if="partiallyPaid(invoice)">
|
<span class="text-gray-600" v-if="!fullyPaid(invoice)">
|
||||||
({{
|
({{
|
||||||
frappe.format(
|
frappe.format(
|
||||||
invoice.baseGrandTotal,
|
invoice.baseGrandTotal,
|
||||||
@ -59,7 +58,7 @@ export default {
|
|||||||
props: ['doc'],
|
props: ['doc'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pendingInvoices: []
|
pendingInvoices: [],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -69,7 +68,7 @@ export default {
|
|||||||
},
|
},
|
||||||
invoiceMeta() {
|
invoiceMeta() {
|
||||||
return frappe.getMeta(this.invoiceDoctype);
|
return frappe.getMeta(this.invoiceDoctype);
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.fetchPendingInvoices();
|
this.fetchPendingInvoices();
|
||||||
@ -86,14 +85,15 @@ export default {
|
|||||||
'date',
|
'date',
|
||||||
'outstandingAmount',
|
'outstandingAmount',
|
||||||
'baseGrandTotal',
|
'baseGrandTotal',
|
||||||
'submitted'
|
'submitted',
|
||||||
],
|
],
|
||||||
filters: {
|
filters: {
|
||||||
[partyField]: this.doc.name
|
[partyField]: this.doc.name,
|
||||||
},
|
},
|
||||||
limit: 3,
|
limit: 3,
|
||||||
orderBy: 'creation'
|
orderBy: 'creation',
|
||||||
});
|
});
|
||||||
|
window.pendingInvoices = this.pendingInvoices;
|
||||||
},
|
},
|
||||||
getStatusBadge(doc) {
|
getStatusBadge(doc) {
|
||||||
let statusColumn = getStatusColumn();
|
let statusColumn = getStatusColumn();
|
||||||
@ -103,17 +103,11 @@ export default {
|
|||||||
routeTo(`/edit/${this.invoiceDoctype}/${doc.name}`);
|
routeTo(`/edit/${this.invoiceDoctype}/${doc.name}`);
|
||||||
},
|
},
|
||||||
fullyPaid(invoice) {
|
fullyPaid(invoice) {
|
||||||
return invoice.outstandingAmount == 0;
|
return invoice.outstandingAmount.isZero();
|
||||||
|
},
|
||||||
|
amountPaid(invoice) {
|
||||||
|
return invoice.baseGrandTotal.sub(invoice.outstandingAmount);
|
||||||
},
|
},
|
||||||
partiallyPaid(invoice) {
|
|
||||||
return (
|
|
||||||
invoice.outstandingAmount &&
|
|
||||||
invoice.outstandingAmount !== invoice.baseGrandTotal
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
notPaid(invoice) {
|
|
||||||
return invoice.outstandingAmount === invoice.baseGrandTotal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user