fix: pos takes more time to add an item in the cart
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 8c1ddbb..01b935c 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -164,7 +164,7 @@
args_copy.update(item)
data = get_pricing_rule_for_item(args_copy, item.get('price_list_rate'), doc=doc)
out.append(data)
- if set_serial_nos_based_on_fifo and not args.get('is_return'):
+ if not item.get("serial_no") and set_serial_nos_based_on_fifo and not args.get('is_return'):
out[0].update(get_serial_no_for_item(args_copy))
return out
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index dcb9ed1..388605d 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -234,15 +234,20 @@
this.update_item_in_frm(item, field, value)
.then(() => {
frappe.dom.unfreeze();
- let items = this.frm.doc.items.map(item => item.idx);
- if (items && items.length > 0 && items.indexOf(item.idx)) {
- this.frm.doc.items.forEach(item_row => {
- // update cart
- this.on_qty_change(item_row);
- });
- } else {
- this.on_qty_change(item);
- }
+ frappe.run_serially([
+ () => {
+ let items = this.frm.doc.items.map(item => item.name);
+ if (items && items.length > 0 && items.includes(item.name)) {
+ this.frm.doc.items.forEach(item_row => {
+ // update cart
+ this.on_qty_change(item_row);
+ });
+ } else {
+ this.on_qty_change(item);
+ }
+ },
+ () => this.post_qty_change(item)
+ ]);
});
}
return;
@@ -263,9 +268,20 @@
.then(() => {
this.frm.script_manager.trigger('qty', item.doctype, item.name)
.then(() => {
- this.frm.doc.items.forEach(item => {
- this.update_cart_data(item);
- });
+ frappe.run_serially([
+ () => {
+ let items = this.frm.doc.items.map(i => i.name);
+ if (items && items.length > 0 && items.includes(item.name)) {
+ this.frm.doc.items.forEach(item_row => {
+ // update cart
+ this.on_qty_change(item_row);
+ });
+ } else {
+ this.on_qty_change(item);
+ }
+ },
+ () => this.post_qty_change(item)
+ ]);
});
});
},
@@ -286,10 +302,17 @@
on_qty_change(item) {
frappe.run_serially([
() => this.update_cart_data(item),
- () => this.set_form_action()
]);
}
+ post_qty_change(item) {
+ this.cart.update_taxes_and_totals();
+ this.cart.update_grand_total();
+ this.cart.update_qty_total();
+ this.cart.scroll_to_item(item.item_code);
+ this.set_form_action();
+ }
+
select_batch_and_serial_no(row) {
frappe.dom.unfreeze();
@@ -304,7 +327,8 @@
frappe.model.clear_doc(item.doctype, item.name);
}
},
- () => this.update_cart_data(item)
+ () => this.update_cart_data(item),
+ () => this.post_qty_change(item)
]);
});
})
@@ -321,9 +345,6 @@
update_cart_data(item) {
this.cart.add_item(item);
- this.cart.update_taxes_and_totals();
- this.cart.update_grand_total();
- this.cart.update_qty_total();
frappe.dom.unfreeze();
}
@@ -974,7 +995,6 @@
$item.appendTo(this.$cart_items);
}
this.highlight_item(item.item_code);
- this.scroll_to_item(item.item_code);
}
update_item(item) {