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

POS batch fixes (#12005)

Browse Source
This commit is contained in:
rohitwaghchaure 2017-12-14 16:06:23 +05:30 committed by Nabin Hait
parent ee7b4f00f8
commit 2b95a5438b
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1225,7 +1225,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
});
erpnext.show_serial_batch_selector = function(frm, d, callback, show_dialog) {
erpnext.show_serial_batch_selector = function(frm, d, callback, on_close, show_dialog) {
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
new erpnext.SerialNoBatchSelector({
frm: frm,
@ -1234,7 +1234,8 @@ erpnext.show_serial_batch_selector = function(frm, d, callback, show_dialog) {
type: "Warehouse",
name: d.warehouse
},
callback: callback
callback: callback,
on_close: on_close
}, show_dialog);
});
}

7
erpnext/public/js/utils/serial_no_batch_selector.js
View File

@ -20,6 +20,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
this.item_code = this.item.item_code;
this.qty = this.item.qty;
this.make_dialog();
this.on_close_dialog();
},
make_dialog: function() {
@ -115,6 +116,12 @@ erpnext.SerialNoBatchSelector = Class.extend({
this.dialog.show();
},
on_close_dialog: function() {
this.dialog.get_close_btn().on('click', () => {
this.on_close && this.on_close(this.item);
});
},
validate: function() {
let values = this.values;
if(!values.warehouse) {

33
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -170,8 +170,10 @@ erpnext.pos.PointOfSale = class PointOfSale {
// if actual_batch_qty and actual_qty if there is only one batch. In such
// a case, no point showing the dialog
if(field === 'qty' && (item.serial_no || item.batch_no)
&& (item.actual_batch_qty != item.actual_qty)) {
const show_dialog = item.has_serial_no || item.has_batch_no;
if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
(item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
this.select_batch_and_serial_no(item);
} else {
this.update_item_in_frm(item, field, value)
@ -198,7 +200,8 @@ erpnext.pos.PointOfSale = class PointOfSale {
// if actual_batch_qty and actual_qty if then there is only one batch. In such
// a case, no point showing the dialog
if (show_dialog && field == 'qty' && (item.actual_batch_qty != item.actual_qty)) {
if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
(item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
// check has serial no/batch no and update cart
this.select_batch_and_serial_no(item);
} else {
@ -209,18 +212,32 @@ erpnext.pos.PointOfSale = class PointOfSale {
}
select_batch_and_serial_no(item) {
frappe.dom.unfreeze();
erpnext.show_serial_batch_selector(this.frm, item, () => {
this.update_item_in_frm(item, 'qty', item.qty)
.then(() => {
// update cart
if (item.qty === 0) {
frappe.model.clear_doc(item.doctype, item.name);
}
this.update_cart_data(item);
frappe.run_serially([
() => {
if (item.qty === 0) {
frappe.model.clear_doc(item.doctype, item.name);
}
},
() => this.update_cart_data(item)
]);
});
}, () => {
this.on_close(item);
}, true);
}
on_close(item) {
if (!this.cart.exists(item.item_code) && item.qty) {
frappe.model.clear_doc(item.doctype, item.name);
}
}
update_cart_data(item) {
this.cart.add_item(item);
this.cart.update_taxes_and_totals();
@ -735,7 +752,7 @@ class POSCart {
if (this.exists(item.item_code)) {
// update quantity
this.update_item(item);
} else {
} else if (flt(item.qty) > 0.0) {
// add to cart
const $item = $(this.get_item_html(item));
$item.appendTo(this.$cart_items);