check flag for transaction payment

This commit is contained in:
phyusin
2018-09-25 17:49:33 +06:30
parent 3d44c570b2
commit 3cf4abe9ce
8 changed files with 303 additions and 39 deletions

View File

@@ -737,7 +737,7 @@ var trans_flag = <%= @trans_flag %>;
customer_display_view(null,"reload");
var sale_id = $('#sale_id').text();
var flag = localStorage.getItem("trans_flag");
if(flag != "true"){
if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id;
}else{
if (cashier_type=="cashier") {
@@ -1151,7 +1151,7 @@ var trans_flag = <%= @trans_flag %>;
if (pdf_view ==1) {
var flag = localStorage.getItem("trans_flag");
if(flag != "true"){
if((flag!=null) && (flag != "true")){
window.location.href = "/transactions/sales/"+sale_id;
}else{
if (cashier_type=="cashier") {
@@ -1185,19 +1185,24 @@ var trans_flag = <%= @trans_flag %>;
closeOnCancel: false,
allowOutsideClick: false
}, function () {
if (cashier_type=="cashier") {
window.location.href = '/origami';
var flag = localStorage.getItem("trans_flag");
if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id;
}else{
window.location.href = '/origami/quick_service';
customer_display_view(null,"reload");
}
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
customer_display_view(null,"reload");
}
}
});
}
$(".btn_pdf_close").on('click',function(){
var flag = localStorage.getItem("trans_flag");
if(flag != "true"){
if((flag!=null) && (flag != "true")){
var sale_id = $('#sale_id').text();
window.location.href = "/transactions/sales/"+sale_id;
}else{
@@ -1430,16 +1435,21 @@ var trans_flag = <%= @trans_flag %>;
title: "Information!",
text: 'Thank You !',
}, function () {
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
});
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
var flag = localStorage.getItem("trans_flag");
if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id;
}else{
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
}
});
}
}
});
@@ -1472,11 +1482,16 @@ var trans_flag = <%= @trans_flag %>;
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
var flag = localStorage.getItem("trans_flag");
if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id;
}else{
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
}
}
})
}
@@ -1503,18 +1518,23 @@ var trans_flag = <%= @trans_flag %>;
data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
success: function (result) {
// console.log(result)
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
customer_display_view(null,"reload");
}
}
});
// For Server Print - from jade
if ($("#server_mode").val() == "cloud") {
code2lab.printFile(result.filepath.substr(6), result.printer_url);
}
var flag = localStorage.getItem("trans_flag");
if((flag!=null) && (flag != "true")){
window.location.href = '/transactions/sales/'+sale_id;
}else{
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
customer_display_view(null,"reload");
}
}
}
});
}
});
}

View File

@@ -2,8 +2,102 @@
<%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %>
<div class="container-fluid">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<div class="card" id="make-reservation-slimscroll" data-height="-50">
<div class="card-header">
<h5 class="card-title text-center"><%= t :make_reservation %></h5>
</div>
<div class="card-body">
<div class="wizard">
<div class="wizard-inner">
<div class="active-line"></div>
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="nav-item">
<div class="connecting-line border-right"></div>
<a href="#step1" class="nav-link active" data-toggle="tab" aria-controls="reservation" role="tab" title="Reservation">
<span class="round-tab">
1s
</span>
</a>
</li>
<li role="presentation" class="nav-item disabled">
<div class="connecting-line"></div>
<a href="#complete" class="nav-link disable" data-toggle="tab" aria-controls="personal_detail" role="tab" title="Personal Detail">
<span class="round-tab">
2
</span>
</a>
</li>
</ul>
</div> <!-- .end.wizard-inner -->
<div class="tab-content">
<div class="tab-pane active" role="tabpanel" id="reservation">
<div class="form-row">
<div class="col-sm-12 col-md-12 col-lg-12">
<label class="font-12 radio-inline">
<input type="radio" name="type" checked class="radio-col-indigo" value="0"><%= t("views.right_panel.detail.dine_in") %>
</label>&nbsp;
<label class="font-12 radio-inline">
<input type="radio" name="type" class="radio-col-indigo" value="1"><%= t :room %>
</label>
</div>
</div>
<div class="form-row clearfix">
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<input class="form-control check_in_date" name="from" id="from" type="text" placeholder="Check In Date">
</div>
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<input class="form-control check_out_date" name="from" id="from" type="text" placeholder="Check Out Date">
</div>
</div>
<div class="form-row clearfix">
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<input class="form-control check_in_time" name="from" id="from" type="text" placeholder="Check In Time">
</div>
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<input class="form-control check_out_time" name="from" id="from" type="text" placeholder="Check Out Time">
</div>
</div>
<div class="form-row clearfix">
<div class="form-group col-sm-12 col-md-12 col-lg-12">
<label for="room_count" class="control-label">ROOMS</label>
<input type="number" class="form-control" name="room_count">
</div>
</div>
<div class="form-row clearfix">
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<label for="adult_count" class="control-label">ADULT</label>
<input type="number" class="form-control" name="adult_count">
</div>
<div class="form-group col-sm-6 col-md-6 col-lg-6">
<label for="child_count" class="control-label">CHILD</label>
<input type="number" class="form-control" name="child_count">
</div>
</div>
<div class="row text-center">
<div class="form-group col-sm-12 col-md-12 col-lg-12">
<button class="btn bg-blue btn-lg waves-effect">CHECK AVAILABLE</button>
</div>
</div>
</div><!-- .end.tab-content .reservation -->
<div class="tab-pane" role="tabpanel" id="personal_detail">
</div>
</div><!-- .end.tab-content .personal_detail -->
</div> <!-- .end.wizard -->
</div>
</div>
</div>
<div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
<div class="card font-13">
</div>
</div>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<div class="card font-13">
</div>
</div>
</div>
</div>