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

change UI

Browse Source
This commit is contained in:
phyusin
2018-10-09 18:03:44 +06:30
parent 9b9c616099
commit b77602754a
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,24 +670,25 @@
</div> </div>
<!-- customer light box --> <!-- customer light box -->
<div class="modal fade" id="is_paymemberModal" tabindex="-1" role="dialog"> <div class="modal fade m-t-40" id="is_paymemberModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md" role="document"> <div class="modal-dialog modal-md" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1> <!-- <h1 class="modal-title" id="is_paymemberModalLabel">Are you Member?</h1> -->
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="paypar_account_no" id="paypar_account_no" /> <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
<input type="hidden" name="qr_code" id="qr_code" /> <input type="hidden" name="qr_code" id="qr_code" />
<div class="row text-center m-t-20"> <div class="row text-center m-t-20" align="center">
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"></div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_member">Card Member</button> <button type="button" class="btn btn-lg btn-link bg-primary btn_paymal_member">Card</button>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> <!-- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_qr_code">QR Code</button> <button type="button" class="btn btn-lg btn-link bg-primary waves-effect btn_paymal_qr_code">QR Code</button>
</div> </div> -->
</div> </div>
</div> </div>
<div class="modal-footer"></div> <div class="modal-footer"></div>
@@ -705,11 +706,12 @@ var customer_id = "<%= @customer.id %>";
var customer_name = "<%= @customer.name %>"; var customer_name = "<%= @customer.name %>";
var pdf_view = '<%=@pdf_view%>'; var pdf_view = '<%=@pdf_view%>';
var trans_flag = <%= @trans_flag %>; var trans_flag = <%= @trans_flag %>;
var paymalcount = <%= @paymalcount %>;
// console.log(pdf_view) // console.log(pdf_view)
$(document).ready(function(){ $(document).ready(function(){
<%if @cashier_type == "food_court" && @paymalcount == 0.0 %> if(cashier_type == "food_court" && paymalcount == 0.0){
$("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false}); $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
<% end %> }
setHeaderBreadCrumb(_PAYMENTS_); setHeaderBreadCrumb(_PAYMENTS_);
/* replace url type*/ /* replace url type*/
@@ -808,9 +810,9 @@ var trans_flag = <%= @trans_flag %>;
window.location.href = '/origami/sale/'+ sale_id + "/"+cashier_type+"/"+url_param+"/others_payment"; window.location.href = '/origami/sale/'+ sale_id + "/"+cashier_type+"/"+url_param+"/others_payment";
return false; return false;
}else{ }else{
<% if @paymalcount == 0.0 %> if(paymalcount == 0.0){
$("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false}); $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
<% end %> }
} }
}); });
@@ -1305,7 +1307,9 @@ var trans_flag = <%= @trans_flag %>;
// Read NFC card no from java // Read NFC card no from java
function getCardNo(){ function getCardNo(){
code2lab.readNFC(); if(typeof code2lab != 'undefined'){
code2lab.readNFC();
}
} }
// get CardNo from Java // get CardNo from Java
@@ -1660,7 +1664,7 @@ var trans_flag = <%= @trans_flag %>;
}); });
// Read Card Reader // Read Card Reader
$(".btn_paymal_member").on('click', function(){ $(".btn_paymal_member").on('click', function (){
var cardNo = ""; var cardNo = "";
var sale_id = $("#sale_id").text() || 0; var sale_id = $("#sale_id").text() || 0;
var receipt_no = ""; var receipt_no = "";