From 613c8158a8d939065439ccfaf8e3ebfe13bb067b Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Fri, 16 Sep 2022 17:49:00 -0400 Subject: [PATCH] fix: actually reject process_scan when update_table fails. --- erpnext/public/js/utils/barcode_scanner.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/utils/barcode_scanner.js b/erpnext/public/js/utils/barcode_scanner.js index a6bff2c148..6a80f92bc1 100644 --- a/erpnext/public/js/utils/barcode_scanner.js +++ b/erpnext/public/js/utils/barcode_scanner.js @@ -59,14 +59,14 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner { } me.update_table(data).then(row => { - row ? resolve(row) : reject(); - }); + resolve(row); + }).catch(() => reject()); }); }); } update_table(data) { - return new Promise(resolve => { + return new Promise((resolve, reject) => { let cur_grid = this.frm.fields_dict[this.items_table_name].grid; const {item_code, barcode, batch_no, serial_no, uom} = data; @@ -77,6 +77,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner { if (this.dont_allow_new_row) { this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red"); this.clean_up(); + reject(); return; } @@ -88,6 +89,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner { if (this.is_duplicate_serial_no(row, serial_no)) { this.clean_up(); + reject(); return; }