From d4767b541bcb7451ad202ecab083401941685424 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 28 Feb 2022 11:36:47 +0530 Subject: [PATCH] fix: merge conflict --- .../selling/page/point_of_sale/pos_payment.js | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js index 43cc14b008..1e9f6d7d92 100644 --- a/erpnext/selling/page/point_of_sale/pos_payment.js +++ b/erpnext/selling/page/point_of_sale/pos_payment.js @@ -170,27 +170,6 @@ erpnext.PointOfSale.Payment = class { }); 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) { frappe.run_serially([ () => frm.doc.ignore_pricing_rule=1, @@ -205,7 +184,6 @@ erpnext.PointOfSale.Payment = class { message: __("Ignore Pricing Rule is enabled. Cannot apply coupon code."), indicator: "orange" }); ->>>>>>> 81514516f3 (fix(pos): coupon code is applied even if ignore pricing rule is check) } });