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

feat: barcode scanner promise to return scanned row. (#31018)

Browse Source 
* feat: barcode scanner promise to return scanned row.

* fix: missing reject at alternate code path
This commit is contained in:
Devin Slauenwhite 2022-05-16 03:44:26 -04:00 committed by GitHub
parent a412d2f7e8
commit d76e1b7576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
} }
process_scan() { process_scan() {
return new Promise((resolve, reject) => {
let me = this; let me = this;
const input = this.scan_barcode_field.value; const input = this.scan_barcode_field.value;
@ -50,10 +51,18 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (!data || Object.keys(data).length === 0) { if (!data || Object.keys(data).length === 0) {
this.show_alert(__("Cannot find Item with this Barcode"), "red"); this.show_alert(__("Cannot find Item with this Barcode"), "red");
this.clean_up(); this.clean_up();
reject();
return; return;
} }
me.update_table(data); const row = me.update_table(data);
if (row) {
resolve(row);
}
else {
reject();
}
});
}); });
} }
@ -90,6 +99,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
this.set_batch_no(row, batch_no); this.set_batch_no(row, batch_no);
this.set_barcode(row, barcode); this.set_barcode(row, barcode);
this.clean_up(); this.clean_up();
return row;
} }
// batch and serial selector is reduandant when all info can be added by scan // batch and serial selector is reduandant when all info can be added by scan