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

add req bill and payment #left order and sale

Browse Source
This commit is contained in:
phyusin
2018-09-24 10:29:08 +06:30
parent e7ef645200
commit f4b85ad4cc
13 changed files with 311 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,22 +557,26 @@
<h4 class="modal-title" id="paymentModalLabel">Choose Payment Method</h4>
</div>
<div class="modal-body">
<!-- <select class="form-control show-tick payment_method" multiple="true" id="payment_method" > -->
<!-- <option value="Cash">Cash</option> -->
<button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
<% @payment_methods.each do |pay| %>
<!-- <option value="<%= pay.payment_method %>">
<%= pay.payment_method %>
</option> -->
<button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
<%end %>
<!-- </select> -->
<div class="row text-center">
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<button class='btn btn-md waves-effect btn-link payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
</div>
<% @payment_methods.each_with_index do |pay, pay_index| %>
<%if (pay_index+1)%3 == 0 %>
<div class="row clearfix"></div>
<% end %>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<button class='btn btn-md btn-link payment-btn-box waves-effect payment_btn bg-green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
</div>
<%end %>
</div>
</div>
<div class="modal-footer p-r-30">
<button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
<div class="modal-footer p-r-30 pb-3">
<button type="button" class="btn btn-md btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
&nbsp; &nbsp;
<button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
<button type="button" class="btn btn-md btn-link bg-blue waves-effect choose_payment">SAVE</button>
</div>
</div>
</div>

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

@@ -678,10 +678,19 @@ var cashier_type = "<%= @cashier_type %>";
var customer_id = "<%= @customer.id %>";
var customer_name = "<%= @customer.name %>";
var pdf_view = '<%=@pdf_view%>';
console.log(pdf_view)
var trans_flag = <%= @trans_flag %>;
// console.log(pdf_view)
$(document).ready(function(){
setHeaderBreadCrumb(_PAYMENTS_);
/* replace url type*/
if(!trans_flag){
localStorage.setItem("trans_flag", trans_flag);
var sale_id = $('#sale_id').text();
window.location.replace('/origami/sale/'+sale_id+'/cashier/payment');
}
/* replace url type*/
/* start check first bill or not*/
var member_id = $('#membership_id').text();
var member_discount = $('#member_discount').text();
@@ -727,11 +736,17 @@ var pdf_view = '<%=@pdf_view%>';
localStorage.removeItem('cash');
customer_display_view(null,"reload");
var sale_id = $('#sale_id').text();
if (cashier_type=="cashier") {
window.location.href = '/origami/table/'+ dining_id;
var flag = localStorage.getItem("trans_flag");
if(flag != "true"){
window.location.href = '/transactions/sales/'+sale_id;
}else{
window.location.href = '/origami/quick_service/pending_order/'+sale_id;
}
if (cashier_type=="cashier") {
window.location.href = '/origami/table/'+ dining_id;
}else{
window.location.href = '/origami/quick_service/pending_order/'+sale_id;
}
}
});
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
@@ -1135,12 +1150,17 @@ var pdf_view = '<%=@pdf_view%>';
}
if (pdf_view ==1) {
if (cashier_type=="cashier") {
window.location.href = '/origami';
var flag = localStorage.getItem("trans_flag");
if(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");
}
}
}else{
payment_success_alert();
}
@@ -1176,11 +1196,18 @@ var pdf_view = '<%=@pdf_view%>';
$(".btn_pdf_close").on('click',function(){
if (cashier_type=="cashier") {
window.location.href = '/origami';
var flag = localStorage.getItem("trans_flag");
if(flag != "true"){
var sale_id = $('#sale_id').text();
window.location.href = "/transactions/sales/"+sale_id;
}else{
window.location.href = '/origami/quick_service';
}
if (cashier_type=="cashier") {
window.location.href = '/origami';
}else{
window.location.href = '/origami/quick_service';
}
}
});
$(".btn_customer_yes").on('click',function(){

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

@@ -575,18 +575,26 @@
<h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
</div>
<div class="modal-body">
<button class='btn waves-effect payment_btn green' data-type='Credit' data-value='Credit'>Credit</button>
<% @payment_methods.each do |pay| %>
<!-- <option value="<%= pay.payment_method %>">
<%= pay.payment_method %>
</option> -->
<button class='btn btn-lg waves-effect payment_btn green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
<%end %>
<div class="row text-center">
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<button class='btn btn-md waves-effect btn-link payment-btn-box payment_btn bg-green' data-type='Credit' data-value='Credit'>Credit</button>
</div>
<% @payment_methods.each_with_index do |pay, pay_index| %>
<%if (pay_index+1)%3 == 0 %>
<div class="row clearfix"></div>
<% end %>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<button class='btn btn-md btn-link payment-btn-box waves-effect payment_btn bg-green' data-type='<%= pay.payment_method %>' data-value='<%= pay.payment_method %>'><%= pay.payment_method %></button>
</div>
<%end %>
</div>
</div>
<div class="modal-footer p-r-30">
<button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
<div class="modal-footer p-r-30 pb-3">
<button type="button" class="btn btn-md btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
&nbsp; &nbsp;
<button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
<button type="button" class="btn btn-md btn-link bg-blue waves-effect choose_payment">SAVE</button>
</div>
</div>
</div>