nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] After accesing POS page, it does not work when going back from another page (#12763)

Browse Source
This commit is contained in:
rohitwaghchaure
2018-02-05 12:24:06 +05:30
committed by Nabin Hait
parent 59aca770c1
commit a4c40e0fd6
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/page/pos/pos.js
View File

@@ -15,6 +15,7 @@ frappe.pages['pos'].on_page_load = function (wrapper) {
cur_pos = wrapper.pos; cur_pos = wrapper.pos;
} else { } else {
// online // online
frappe.flags.is_online = true
frappe.set_route('point-of-sale'); frappe.set_route('point-of-sale');
} }
}); });
@@ -24,6 +25,10 @@ frappe.pages['pos'].refresh = function (wrapper) {
window.onbeforeunload = function () { window.onbeforeunload = function () {
return wrapper.pos.beforeunload() return wrapper.pos.beforeunload()
} }
if (frappe.flags.is_online) {
frappe.set_route('point-of-sale');
}
} }
erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

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

@@ -15,6 +15,7 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
window.cur_pos = wrapper.pos; window.cur_pos = wrapper.pos;
} else { } else {
// offline // offline
frappe.flags.is_offline = true;
frappe.set_route('pos'); frappe.set_route('pos');
} }
}); });
@@ -24,6 +25,10 @@ frappe.pages['point-of-sale'].refresh = function(wrapper) {
if (wrapper.pos) { if (wrapper.pos) {
cur_frm = wrapper.pos.frm; cur_frm = wrapper.pos.frm;
} }
if (frappe.flags.is_offline) {
frappe.set_route('pos');
}
} }
erpnext.pos.PointOfSale = class PointOfSale { erpnext.pos.PointOfSale = class PointOfSale {