From a4c40e0fd6c2cb0733f6bdbc3c8126cc9fe8a3e2 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 5 Feb 2018 12:24:06 +0530 Subject: [PATCH] [Fix] After accesing POS page, it does not work when going back from another page (#12763) --- erpnext/accounts/page/pos/pos.js | 5 +++++ erpnext/selling/page/point_of_sale/point_of_sale.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 558dd8dc1c6..d779de0da03 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -15,6 +15,7 @@ frappe.pages['pos'].on_page_load = function (wrapper) { cur_pos = wrapper.pos; } else { // online + frappe.flags.is_online = true frappe.set_route('point-of-sale'); } }); @@ -24,6 +25,10 @@ frappe.pages['pos'].refresh = function (wrapper) { window.onbeforeunload = function () { return wrapper.pos.beforeunload() } + + if (frappe.flags.is_online) { + frappe.set_route('point-of-sale'); + } } erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js index c20c6f8971d..1d884cc136a 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.js +++ b/erpnext/selling/page/point_of_sale/point_of_sale.js @@ -15,6 +15,7 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) { window.cur_pos = wrapper.pos; } else { // offline + frappe.flags.is_offline = true; frappe.set_route('pos'); } }); @@ -24,6 +25,10 @@ frappe.pages['point-of-sale'].refresh = function(wrapper) { if (wrapper.pos) { cur_frm = wrapper.pos.frm; } + + if (frappe.flags.is_offline) { + frappe.set_route('pos'); + } } erpnext.pos.PointOfSale = class PointOfSale {