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

[Fix] Allow user to edit rate in online POS (#12701)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-01-30 10:39:46 +05:30 committed by Nabin Hait
parent 32c2c474fd
commit ce5b93ca77
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -242,7 +242,10 @@ class SalesInvoice(SellingController):
super(SalesInvoice, self).set_missing_values(for_validate) super(SalesInvoice, self).set_missing_values(for_validate)
if pos: if pos:
return {"print_format": pos.get("print_format_for_online") } return {
"print_format": pos.get("print_format_for_online"),
"allow_edit_rate": pos.get("allow_user_to_edit_rate")
}
def update_time_sheet(self, sales_invoice): def update_time_sheet(self, sales_invoice):
for d in self.timesheets: for d in self.timesheets:

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

@ -463,6 +463,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;
} }
} }
@ -727,6 +728,7 @@ class POSCart {
disable_highlight: ['Qty', 'Disc', 'Rate', 'Pay'], disable_highlight: ['Qty', 'Disc', 'Rate', 'Pay'],
reset_btns: ['Qty', 'Disc', 'Rate', 'Pay'], reset_btns: ['Qty', 'Disc', 'Rate', 'Pay'],
del_btn: 'Del', del_btn: 'Del',
disable_btns: !this.frm.allow_edit_rate ? ['Rate']: [],
wrapper: this.wrapper.find('.number-pad-container'), wrapper: this.wrapper.find('.number-pad-container'),
onclick: (btn_value) => { onclick: (btn_value) => {
// on click // on click
@ -1257,7 +1259,7 @@ class NumberPad {
constructor({ constructor({
wrapper, onclick, button_array, wrapper, onclick, button_array,
add_class={}, disable_highlight=[], add_class={}, disable_highlight=[],
reset_btns=[], del_btn='', reset_btns=[], del_btn='', disable_btns
}) { }) {
this.wrapper = wrapper; this.wrapper = wrapper;
this.onclick = onclick; this.onclick = onclick;
@ -1266,6 +1268,7 @@ class NumberPad {
this.disable_highlight = disable_highlight; this.disable_highlight = disable_highlight;
this.reset_btns = reset_btns; this.reset_btns = reset_btns;
this.del_btn = del_btn; this.del_btn = del_btn;
this.disable_btns = disable_btns;
this.make_dom(); this.make_dom();
this.bind_events(); this.bind_events();
this.value = ''; this.value = '';
@ -1296,6 +1299,14 @@ class NumberPad {
} }
this.set_class(); this.set_class();
this.disable_btns.forEach((btn) => {
const $btn = this.get_btn(btn);
$btn.prop("disabled", true)
$btn.hover(() => {
$btn.css('cursor','not-allowed');
})
})
} }
set_class() { set_class() {