mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
This commit is contained in:
@@ -101,16 +101,13 @@ erpnext.pos.PointOfSale = class PointOfSale {
|
|||||||
if (!this.payment) {
|
if (!this.payment) {
|
||||||
this.make_payment_modal();
|
this.make_payment_modal();
|
||||||
} else {
|
} else {
|
||||||
const mop_field = this.payment.default_mop;
|
|
||||||
let amount = 0.0;
|
|
||||||
this.frm.doc.payments.map(p => {
|
this.frm.doc.payments.map(p => {
|
||||||
if (p.mode_of_payment == mop_field) {
|
if (p.amount) {
|
||||||
amount = p.amount;
|
this.payment.dialog.set_value(p.mode_of_payment, p.amount);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.payment.dialog.set_value(mop_field, flt(amount));
|
this.payment.set_title()
|
||||||
}
|
}
|
||||||
this.payment.open_modal();
|
this.payment.open_modal();
|
||||||
}
|
}
|
||||||
@@ -1185,12 +1182,7 @@ class Payment {
|
|||||||
|
|
||||||
make() {
|
make() {
|
||||||
this.set_flag();
|
this.set_flag();
|
||||||
|
|
||||||
let title = __('Total Amount {0}',
|
|
||||||
[format_currency(this.frm.doc.grand_total, this.frm.doc.currency)]);
|
|
||||||
|
|
||||||
this.dialog = new frappe.ui.Dialog({
|
this.dialog = new frappe.ui.Dialog({
|
||||||
title: title,
|
|
||||||
fields: this.get_fields(),
|
fields: this.get_fields(),
|
||||||
width: 800
|
width: 800
|
||||||
});
|
});
|
||||||
@@ -1213,6 +1205,13 @@ class Payment {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set_title() {
|
||||||
|
let title = __('Total Amount {0}',
|
||||||
|
[format_currency(this.frm.doc.grand_total, this.frm.doc.currency)]);
|
||||||
|
|
||||||
|
this.dialog.set_title(title);
|
||||||
|
}
|
||||||
|
|
||||||
bind_events() {
|
bind_events() {
|
||||||
var me = this;
|
var me = this;
|
||||||
$(this.dialog.body).find('.input-with-feedback').focusin(function() {
|
$(this.dialog.body).find('.input-with-feedback').focusin(function() {
|
||||||
@@ -1234,10 +1233,6 @@ 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),
|
||||||
|
|||||||
Reference in New Issue
Block a user