schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2022-11-04 11:21:39 +05:30
committed by GitHub
parent d8e403bf5d
commit ab87a950e5
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,11 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
this.items_table_name = opts.items_table_name || "items"; this.items_table_name = opts.items_table_name || "items";
this.items_table = this.frm.doc[this.items_table_name]; this.items_table = this.frm.doc[this.items_table_name];
// optional sound name to play when scan either fails or passes.
// see https://frappeframework.com/docs/v14/user/en/python-api/hooks#sounds
this.success_sound = opts.play_success_sound;
this.fail_sound = opts.play_fail_sound;
// any API that takes `search_value` as input and returns dictionary as follows // any API that takes `search_value` as input and returns dictionary as follows
// { // {
// item_code: "HORSESHOE", // present if any item was found // item_code: "HORSESHOE", // present if any item was found
@@ -42,27 +47,6 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
return; return;
} }
<<<<<<< HEAD
frappe
.call({
method: this.scan_api,
args: {
search_value: input,
},
})
.then((r) => {
const data = r && r.message;
if (!data || Object.keys(data).length === 0) {
this.show_alert(__("Cannot find Item with this Barcode"), "red");
this.clean_up();
reject();
return;
}
me.update_table(data).then(row => {
row ? resolve(row) : reject();
});
=======
this.scan_api_call(input, (r) => { this.scan_api_call(input, (r) => {
const data = r && r.message; const data = r && r.message;
if (!data || Object.keys(data).length === 0) { if (!data || Object.keys(data).length === 0) {
@@ -79,7 +63,6 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}).catch(() => { }).catch(() => {
this.play_fail_sound(); this.play_fail_sound();
reject(); reject();
>>>>>>> e1f9ba78e5 (fix: Scan Barcode UX)
}); });
}); });
}); });
@@ -111,6 +94,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (this.dont_allow_new_row) { if (this.dont_allow_new_row) {
this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red"); this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red");
this.clean_up(); this.clean_up();
reject();
return; return;
} }
this.is_new_row = true; this.is_new_row = true;
@@ -124,6 +108,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (this.is_duplicate_serial_no(row, serial_no)) { if (this.is_duplicate_serial_no(row, serial_no)) {
this.clean_up(); this.clean_up();
reject();
return; return;
} }
@@ -431,6 +416,14 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
return this.items_table.find((d) => !d.item_code); return this.items_table.find((d) => !d.item_code);
} }
play_success_sound() {
this.success_sound && frappe.utils.play_sound(this.success_sound);
}
play_fail_sound() {
this.fail_sound && frappe.utils.play_sound(this.fail_sound);
}
clean_up() { clean_up() {
this.scan_barcode_field.set_value(""); this.scan_barcode_field.set_value("");
refresh_field(this.items_table_name); refresh_field(this.items_table_name);