schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29860 from frappe/mergify/bp/version-13-hotfix/pr-29859

Browse Source 
fix: coupon code is applied even if ignore_pricing_rule is enabled (backport #29859)
This commit is contained in:
Saqib Ansari
2022-02-17 16:20:51 +05:30
committed by GitHub
parent 20f7db98cb 63079f3e07
commit 5db80b2b57
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/public/js/controllers/transaction.js
View File

@@ -2265,20 +2265,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
coupon_code: function() { coupon_code: function() {
var me = this; var me = this;
if (this.frm.doc.coupon_code) { frappe.run_serially([
frappe.run_serially([ () => this.frm.doc.ignore_pricing_rule=1,
() => this.frm.doc.ignore_pricing_rule=1, () => me.ignore_pricing_rule(),
() => me.ignore_pricing_rule(), () => this.frm.doc.ignore_pricing_rule=0,
() => this.frm.doc.ignore_pricing_rule=0, () => me.apply_pricing_rule()
() => me.apply_pricing_rule(), ]);
() => this.frm.save()
]);
} else {
frappe.run_serially([
() => this.frm.doc.ignore_pricing_rule=1,
() => me.ignore_pricing_rule()
]);
}
} }
}); });

23
erpnext/selling/page/point_of_sale/pos_payment.js
View File

@@ -169,6 +169,29 @@ erpnext.PointOfSale.Payment = class {
} }
}); });
frappe.ui.form.on('POS Invoice', 'coupon_code', (frm) => {
if (!frm.doc.ignore_pricing_rule) {
if (frm.doc.coupon_code) {
frappe.run_serially([
() => frm.doc.ignore_pricing_rule=1,
() => frm.trigger('ignore_pricing_rule'),
() => frm.doc.ignore_pricing_rule=0,
() => frm.trigger('apply_pricing_rule'),
() => frm.save(),
() => this.update_totals_section(frm.doc)
]);
} else {
frappe.run_serially([
() => frm.doc.ignore_pricing_rule=1,
() => frm.trigger('ignore_pricing_rule'),
() => frm.doc.ignore_pricing_rule=0,
() => frm.save(),
() => this.update_totals_section(frm.doc)
]);
}
}
});
this.setup_listener_for_payments(); this.setup_listener_for_payments();
this.$payment_modes.on('click', '.shortcut', function() { this.$payment_modes.on('click', '.shortcut', function() {