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

fix: merge conflict

Browse Source
This commit is contained in:
Saqib Ansari 2022-02-28 11:36:47 +05:30
parent 823979fbcc
commit d4767b541b
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,27 +170,6 @@ erpnext.PointOfSale.Payment = class {
}); });
frappe.ui.form.on('POS Invoice', 'coupon_code', (frm) => { frappe.ui.form.on('POS Invoice', 'coupon_code', (frm) => {
<<<<<<< HEAD
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)
]);
}
=======
if (!frm.doc.ignore_pricing_rule && frm.doc.coupon_code) { if (!frm.doc.ignore_pricing_rule && frm.doc.coupon_code) {
frappe.run_serially([ frappe.run_serially([
() => frm.doc.ignore_pricing_rule=1, () => frm.doc.ignore_pricing_rule=1,
@ -205,7 +184,6 @@ erpnext.PointOfSale.Payment = class {
message: __("Ignore Pricing Rule is enabled. Cannot apply coupon code."), message: __("Ignore Pricing Rule is enabled. Cannot apply coupon code."),
indicator: "orange" indicator: "orange"
}); });
>>>>>>> 81514516f3 (fix(pos): coupon code is applied even if ignore pricing rule is check)
} }
}); });