nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29597 from nextchamp-saqib/fix-pos-checkout

Browse Source 
fix(pos): pricing rule on transactions doesn't work
This commit is contained in:
Saqib Ansari
2022-02-02 19:48:05 +05:30
committed by GitHub
parent da7494c208 e082e3f702
commit f696eddceb
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/selling/page/point_of_sale/pos_controller.js
View File

@@ -248,7 +248,7 @@ erpnext.PointOfSale.Controller = class {
numpad_event: (value, action) => this.update_item_field(value, action), numpad_event: (value, action) => this.update_item_field(value, action),
checkout: () => this.payment.checkout(), checkout: () => this.save_and_checkout(),
edit_cart: () => this.payment.edit_cart(), edit_cart: () => this.payment.edit_cart(),
@@ -713,4 +713,9 @@ erpnext.PointOfSale.Controller = class {
}) })
.catch(e => console.log(e)); .catch(e => console.log(e));
} }
async save_and_checkout() {
this.frm.is_dirty() && await this.frm.save();
this.payment.checkout();
}
}; };

5
erpnext/selling/page/point_of_sale/pos_item_cart.js
View File

@@ -191,10 +191,10 @@ erpnext.PointOfSale.ItemCart = class {
this.numpad_value = ''; this.numpad_value = '';
}); });
this.$component.on('click', '.checkout-btn', function() { this.$component.on('click', '.checkout-btn', async function() {
if ($(this).attr('style').indexOf('--blue-500') == -1) return; if ($(this).attr('style').indexOf('--blue-500') == -1) return;
me.events.checkout(); await me.events.checkout();
me.toggle_checkout_btn(false); me.toggle_checkout_btn(false);
me.allow_discount_change && me.$add_discount_elem.removeClass("d-none"); me.allow_discount_change && me.$add_discount_elem.removeClass("d-none");
@@ -985,6 +985,7 @@ erpnext.PointOfSale.ItemCart = class {
$(frm.wrapper).off('refresh-fields'); $(frm.wrapper).off('refresh-fields');
$(frm.wrapper).on('refresh-fields', () => { $(frm.wrapper).on('refresh-fields', () => {
if (frm.doc.items.length) { if (frm.doc.items.length) {
this.$cart_items_wrapper.html('');
frm.doc.items.forEach(item => { frm.doc.items.forEach(item => {
this.update_item_html(item); this.update_item_html(item);
}); });