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

fix: Barcode scanning UX

Browse Source
This commit is contained in:
Faris Ansari 2019-02-12 17:12:48 +05:30
parent 76120309e3
commit 5631ffca68
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,13 +276,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
scan_barcode: function() { scan_barcode: function() {
let scan_barcode_field = this.frm.fields_dict["scan_barcode"]; let scan_barcode_field = this.frm.fields_dict["scan_barcode"];
let show_description = function(idx, item_code, exist=null) { let show_description = function(idx, exist = null) {
if(exist) { if (exist) {
scan_barcode_field.set_new_description(__('Row : ') + idx + ' ' + scan_barcode_field.set_new_description(__('Row #{0}: Qty increased by 1', [idx]));
item_code + __(' Qty increased by 1'));
} else { } else {
scan_barcode_field.set_new_description(__('New row : ') + idx + ' ' + scan_barcode_field.set_new_description(__('Row #{0}: Item added', [idx]));
item_code + __(' Created'));
} }
} }
@ -291,38 +289,39 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
method: "erpnext.selling.page.point_of_sale.point_of_sale.search_serial_or_batch_or_barcode_number", method: "erpnext.selling.page.point_of_sale.point_of_sale.search_serial_or_batch_or_barcode_number",
args: { search_value: this.frm.doc.scan_barcode } args: { search_value: this.frm.doc.scan_barcode }
}).then(r => { }).then(r => {
const data = r && r.message;
if(r && r.message && r.message.item_code) { if (!data) {
let child = ""; scan_barcode_field.set_new_description(__('Cannot find Item with this barcode'));
let add_row_index = -1; return;
let cur_grid= this.frm.fields_dict["items"].grid;
this.frm.doc.items.map(d => {
if(d.item_code==r.message.item_code){
add_row_index = d.idx;
return;
} else if(!d.item_code && add_row_index==-1) {
add_row_index = d.idx;
}
});
if(add_row_index == -1) {
child = frappe.model.add_child(this.frm.doc, cur_grid.doctype, "items", add_row_index);
} else {
child = cur_grid.get_grid_row(add_row_index-1).doc;
}
show_description(child.idx, r.message.item_code, child.item_code);
frappe.model.set_value(child.doctype, child.name, {
"item_code": r.message.item_code,
"qty": (child.qty || 0) + 1
});
} }
else{
scan_barcode_field.set_new_description(this.frm.doc.scan_barcode +__(' does not exist!')); let cur_grid = this.frm.fields_dict.items.grid;
let row_to_modify = null;
const existing_item_row = this.frm.doc.items.find(d => d.item_code === data.item_code);
const blank_item_row = this.frm.doc.items.find(d => !d.item_code);
if (existing_item_row) {
row_to_modify = existing_item_row;
} else if (blank_item_row) {
row_to_modify = blank_item_row;
} }
if (!row_to_modify) {
// add new row
row_to_modify = frappe.model.add_child(this.frm.doc, cur_grid.doctype, 'items');
}
show_description(row_to_modify.idx, row_to_modify.item_code);
frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, {
item_code: data.item_code,
qty: (row_to_modify.qty || 0) + 1
});
this.frm.refresh_field('items');
}); });
scan_barcode_field.set_value(""); scan_barcode_field.set_value('');
} }
return false; return false;
}, },