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

Code fix for Enable/Disable Discount in POS using POS Profile #11748

Browse Source
This commit is contained in:
Jay Parikh 2018-02-01 22:52:58 -08:00
parent 171e5af995
commit 2c95ab3897
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -464,7 +464,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
if (r.message) { if (r.message) {
this.frm.meta.default_print_format = r.message.print_format || 'POS Invoice'; this.frm.meta.default_print_format = r.message.print_format || 'POS Invoice';
this.frm.allow_edit_rate = r.message.allow_edit_rate; this.frm.allow_edit_rate = r.message.allow_edit_rate;
this.frm.allow_edit_discount = r.message.allow_edit_discount; this.frm.allow_edit_discount = r.message.allow_edit_discount;
} }
} }
@ -585,6 +585,7 @@ class POSCart {
this.numpad && this.numpad.reset_value(); this.numpad && this.numpad.reset_value();
this.customer_field.set_value(""); this.customer_field.set_value("");
this.$discount_amount.find('input:text').val('');
this.wrapper.find('.grand-total-value').text( this.wrapper.find('.grand-total-value').text(
format_currency(this.frm.doc.grand_total, this.frm.currency)); format_currency(this.frm.doc.grand_total, this.frm.currency));
this.wrapper.find('.rounded-total-value').text( this.wrapper.find('.rounded-total-value').text(
@ -715,19 +716,15 @@ class POSCart {
this.customer_field.set_value(this.frm.doc.customer); this.customer_field.set_value(this.frm.doc.customer);
} }
disable_numpad_control() { disable_numpad_control() {
if(!this.frm.allow_edit_rate && !this.frm.allow_edit_discount) { let disabled_btns = [];
return ['Rate', 'Disc']; if(!this.frm.allow_edit_rate) {
disabled_btns.push('Rate');
} }
if(!this.frm.allow_edit_rate || !this.frm.allow_edit_discount) { if(!this.frm.allow_edit_discount) {
if(!this.frm.allow_edit_rate) { disabled_btns.push('Disc');
return ['Rate'];
} else {
return ['Disc'];
}
} else {
return [];
} }
return disabled_btns;
} }
make_numpad() { make_numpad() {