update shift close alert

This commit is contained in:
Aung Myo
2018-07-24 17:48:26 +06:30
parent 01c0f96e87
commit 500384416f
7 changed files with 97 additions and 18 deletions

View File

@@ -224,7 +224,7 @@
<button type="button" id="reprint" class="btn bg-blue btn-block">Reprint</button>
<% end %>
<% end %>
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="close_cashier" type="button" data-count="<%=@occupied_table%>" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
<button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
<% end %>
@@ -337,8 +337,30 @@ $(document).ready(function(){
$('#close_cashier').on('click',function(e){
e.preventDefault(); // Prevent the href from redirecting directly
var linkURL = '/origami/shift/quick_service/close';
warnBeforeRedirect(linkURL);
occupied_count = $(this).data("count");
warnBeforeRedirect(linkURL,occupied_count);
});
function warnBeforeRedirect(linkURL,occupied_count) {
if (occupied_count>0) {
text = "<h5><span style=\"color: #CC0000\"> We have "+occupied_count+" pending orders and sales</span> </h5>.<br>Are you sure you want to close cashier? ";
}else{
text = "Are you sure you want to close cashier?";
}
swal({
title: "Alert!",
text: text,
type: "warning",
showCancelButton: true,
html: true
}, function() {
// Redirect the user
window.location.href = linkURL;
});
}
$('#cash_in').on('click',function(){
window.location.href = '/origami/quick_service/cash_ins';
})

View File

@@ -215,7 +215,7 @@
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
<% if current_user.role != "waiter" %>
<button type="button" class="btn bg-blue btn-block waves-effect" id='pay'>Pay</button>
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="close_cashier" type="button" data-count="<%=@occupied_table%>" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
<button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
<% end %>
@@ -255,7 +255,9 @@ $(document).ready(function(){
$('#close_cashier').on('click',function(e){
e.preventDefault(); // Prevent the href from redirecting directly
var linkURL = '/origami/shift/quick_service/close';
warnBeforeRedirect(linkURL);
occupied_count = $(this).data("count");
warnBeforeRedirect(linkURL,occupied_count);
});
$('#cash_in').on('click',function(){
@@ -270,5 +272,25 @@ $(document).ready(function(){
var sale_id = '<%= @sale.sale_id %>';
window.location.href = '/origami/sale/'+ sale_id + "/"+cashier_type+"/credit_payment";
});
function warnBeforeRedirect(linkURL,occupied_count) {
if (occupied_count>0) {
text = "<h5><span style=\"color: #CC0000\"> We have "+occupied_count+" pending orders and sales</span> </h5>.<br>Are you sure you want to close cashier? ";
}else{
text = "Are you sure you want to close cashier?";
}
swal({
title: "Alert!",
text: text,
type: "warning",
showCancelButton: true,
html: true
}, function() {
// Redirect the user
window.location.href = linkURL;
});
}
});
</script>

View File

@@ -91,7 +91,7 @@
<%= t("views.btn.back") %>
</button>
<% if current_user.role != "waiter" %>
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="close_cashier" type="button" data-count="<%=@occupied_table%>" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
<button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
<% end %>
@@ -135,7 +135,8 @@
$('#close_cashier').on('click',function(e){
e.preventDefault(); // Prevent the href from redirecting directly
var linkURL = '/origami/shift/quick_service/close';
warnBeforeRedirect(linkURL);
occupied_count = $(this).data("count");
warnBeforeRedirect(linkURL,occupied_count);
});
$('#cash_in').on('click',function(){
@@ -147,11 +148,18 @@
});
});
function warnBeforeRedirect(linkURL) {
function warnBeforeRedirect(linkURL,occupied_count) {
if (occupied_count>0) {
text = "<h5><span style=\"color: #CC0000\"> We have "+occupied_count+" pending orders and sales</span> </h5>.<br>Are you sure you want to close cashier? ";
}else{
text = "Are you sure you want to close cashier?";
}
swal({
title: "Alert!",
text: "Are you sure you want to close cashier?",
text: text,
type: "warning",
html: true,
showCancelButton: true
}, function() {
// Redirect the user

View File

@@ -224,7 +224,7 @@
<button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
<%end%>
<% if current_user.role != "waiter" %>
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<button id="close_cashier" type="button" data-count="<%=@occupied_table%>" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
<!-- <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
<button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button> -->
<% end %>
@@ -353,15 +353,23 @@ $(document).ready(function(){
$('#close_cashier').on('click',function(e){
e.preventDefault(); // Prevent the href from redirecting directly
var linkURL = '/origami/shift/quick_service/close';
warnBeforeRedirect(linkURL);
occupied_count = $(this).data("count");
warnBeforeRedirect(linkURL,occupied_count);
});
function warnBeforeRedirect(linkURL) {
function warnBeforeRedirect(linkURL,occupied_count) {
if (occupied_count>0) {
text = "<h5><span style=\"color: #CC0000\"> We have "+occupied_count+" pending orders and sales</span> </h5>.<br>Are you sure you want to close cashier? ";
}else{
text = "Are you sure you want to close cashier?";
}
swal({
title: "Alert!",
text: "Are you sure you want to close cashier?",
text: text,
type: "warning",
showCancelButton: true
showCancelButton: true,
html: true
}, function() {
// Redirect the user
window.location.href = linkURL;