Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11024 from rohitwaghchaure/payment_issue_in_pos

Browse Source 
[Fix] Old invoice payment amount showing in the payment modal while making payment
This commit is contained in:
rohitwaghchaure 2017-10-02 22:29:49 +05:30 committed by GitHub
commit c26e3f1569
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -99,6 +99,17 @@ erpnext.pos.PointOfSale = class PointOfSale {
if (value == 'Pay') { if (value == 'Pay') {
if (!this.payment) { if (!this.payment) {
this.make_payment_modal(); this.make_payment_modal();
} else {
const mop_field = this.payment.default_mop;
let amount = 0.0;
this.frm.doc.payments.map(p => {
if (p.mode_of_payment == mop_field) {
amount = p.amount;
return;
}
});
this.payment.dialog.set_value(mop_field, flt(amount));
} }
this.payment.open_modal(); this.payment.open_modal();
} }
@ -437,6 +448,12 @@ class POSCart {
this.$taxes_and_totals.html(this.get_taxes_and_totals()); this.$taxes_and_totals.html(this.get_taxes_and_totals());
this.numpad && this.numpad.reset_value(); this.numpad && this.numpad.reset_value();
this.customer_field.set_value(""); this.customer_field.set_value("");
this.wrapper.find('.grand-total-value').text(
format_currency(this.frm.doc.grand_total, this.frm.currency));
const customer = this.frm.doc.customer || this.pos_profile.customer;
this.customer_field.set_value(customer);
} }
get_grand_total() { get_grand_total() {
@ -1179,6 +1196,10 @@ class Payment {
const me = this; const me = this;
let fields = this.frm.doc.payments.map(p => { let fields = this.frm.doc.payments.map(p => {
if (p.default) {
this.default_mop = p.mode_of_payment;
}
return { return {
fieldtype: 'Currency', fieldtype: 'Currency',
label: __(p.mode_of_payment), label: __(p.mode_of_payment),