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

refactor: single function to fetch related row

Browse Source 
There was separate function for batch row which frequently didn't
receive all the love main function received like:
1. empty row reuse
2. max qty validation

Hence it makes sense to combine these in one fat function
This commit is contained in:
Ankush Menat 2022-05-11 19:27:16 +05:30
parent 2f1d118f36
commit ab80783e3a
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
erpnext/public/js/utils/barcode_scanner.js
View File

@ -59,20 +59,10 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
update_table(data) { update_table(data) {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid; let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
let row = null;
const {item_code, barcode, batch_no, serial_no} = data; const {item_code, barcode, batch_no, serial_no} = data;
// Check if batch is scanned and table has batch no field let row = this.get_row_to_modify_on_scan(item_code, batch_no);
let batch_no_scan =
Boolean(batch_no) && frappe.meta.has_field(cur_grid.doctype, this.batch_no_field);
if (batch_no_scan) {
row = this.get_batch_row_to_modify(batch_no);
} else {
// serial or barcode scan
row = this.get_row_to_modify_on_scan(item_code);
}
if (!row) { if (!row) {
if (this.dont_allow_new_row) { if (this.dont_allow_new_row) {
@ -179,20 +169,24 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
return is_duplicate; return is_duplicate;
} }
get_batch_row_to_modify(batch_no) { get_row_to_modify_on_scan(item_code, batch_no) {
// get row if batch already exists in table let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
const existing_batch_row = this.items_table.find((d) => d.batch_no === batch_no);
return existing_batch_row || this.get_existing_blank_row(); // Check if batch is scanned and table has batch no field
let is_batch_no_scan = batch_no && frappe.meta.has_field(cur_grid.doctype, this.batch_no_field);
let check_max_qty = this.max_qty_field && frappe.meta.has_field(cur_grid.doctype, this.max_qty_field);
const matching_row = (row) => {
const item_match = row.item_code == item_code;
const batch_match = row.batch_no == batch_no;
const qty_in_limit = flt(row[this.qty_field]) < flt(row[this.max_qty_field]);
return item_match
&& (!is_batch_no_scan || batch_match)
&& (!check_max_qty || qty_in_limit)
} }
get_row_to_modify_on_scan(item_code) { return this.items_table.find(matching_row) || this.get_existing_blank_row();
// get an existing item row to increment or blank row to modify
const existing_item_row = this.items_table.filter((d) => {
const [qty, max_qty] = [d[this.qty_field], d[this.max_qty_field] || null];
return d.item_code === item_code && ((max_qty === null) || (qty < max_qty));
}).splice(0, 1).pop();
return existing_item_row || this.get_existing_blank_row();
} }
get_existing_blank_row() { get_existing_blank_row() {