git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check flag

Browse Source
This commit is contained in:
phyusin
2018-09-26 11:51:43 +06:30
parent 75118f5982
commit 786dd8c490
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/home/show.html.erb
View File

@@ -790,7 +790,7 @@
<script> <script>
var cashier_type = "cashier"; var cashier_type = "cashier";
$(document).ready(function () { $(document).ready(function () {
// localStorage.removeItem("tax_type"); localStorage.removeItem("trans_flag");
/* check webview loaded*/ /* check webview loaded*/
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview); showHideNavbar(webview);

2
app/views/origami/payments/show.html.erb
View File

@@ -1151,6 +1151,7 @@ var trans_flag = <%= @trans_flag %>;
if (pdf_view ==1) { if (pdf_view ==1) {
var flag = localStorage.getItem("trans_flag"); var flag = localStorage.getItem("trans_flag");
localStorage.removeItem("trans_flag");
if((flag!=null) && (flag != "true")){ if((flag!=null) && (flag != "true")){
window.location.href = "/transactions/sales/"+sale_id; window.location.href = "/transactions/sales/"+sale_id;
}else{ }else{
@@ -1186,6 +1187,7 @@ var trans_flag = <%= @trans_flag %>;
allowOutsideClick: false allowOutsideClick: false
}, function () { }, function () {
var flag = localStorage.getItem("trans_flag"); var flag = localStorage.getItem("trans_flag");
localStorage.removeItem("trans_flag");
if((flag!=null) && (flag != "true")){ if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id; window.location.href = '/transactions/sales/'+sale_id;
}else{ }else{

1
app/views/origami/rooms/show.html.erb
View File

@@ -840,6 +840,7 @@
var cashier_type = "cashier"; var cashier_type = "cashier";
$(document).ready(function(){ $(document).ready(function(){
// localStorage.removeItem("tax_type"); // localStorage.removeItem("tax_type");
localStorage.removeItem("trans_flag");
/* check webview loaded*/ /* check webview loaded*/
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview); showHideNavbar(webview);