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

change read NFC UI

Browse Source
This commit is contained in:
nyanlinhtut
2023-05-25 13:46:59 +06:30
parent fe6b1057f3
commit 34b7cbb178
8 changed files with 180 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/views/foodcourt/orders/app_orders.html.erb
View File

@@ -410,14 +410,14 @@
<%end%>
<% if current_user.role != "waiter" && @status != "order"%>
<button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
<button type="button" id="pay" class="btn bg-blue btn-block" data-toggle="modal" data-target="#read_modal">Pay</button>
<button type="button" id="void" class="btn btn-block bg-red waves-effect" >VOID</button>
<%end%>
<% if @status != "sale"%>
<!-- <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button> -->
<% order_id = @pending.try(:orders).try(:first).try(:order_id) if @status == 'order' %>
<button type="button" class="btn btn-block bg-blue waves-effect req_bill" >Req.Bill</button>
<button type="button" class="btn btn-block bg-blue waves-effect req_bill" data-toggle="modal" data-target="#read_modal" >Req.Bill</button>
<button type="button" id="order_cancel" class="btn btn-block bg-red waves-effect" >CANCEL</button>
<input type="hidden" id="save_order_id" value="<%=order_id%>">
<%end%>
@@ -498,14 +498,8 @@
</div>
</div>
</div>
<div id="sxModal">
<div id="sxModal-Content">
<h3>Scan OR Tap Card</h3>
</div>
<div style="position: absolute; bottom: 0; margin-left: 45%; margin-bottom: 60px;">
<button type="button" class="btn btn-lg btn-link bg-red waves-effect btn_cancel">Cancel</button>
</div>
</div>
<%= render "layouts/read_modal" %>
<script type="text/javascript">
var cashier_type = 'food_court';
$(document).ready( function() {
@@ -515,8 +509,8 @@
})
$('#pay, .req_bill').on('click', function () {
$("#sxModal").show();
$("#sxModal").attr('data-for', 'member');
$("#read_modal").show();
$("#read_modal").attr('data-for', 'member');
var sale_id = $('#sale_id').text();
getCardNo();
@@ -531,11 +525,11 @@
// getCardNo();
// });
$("#sxModal .btn_cancel").on('click',function(){
$("#read_modal #close").on('click',function(){
if($("#order-items-table tr").length > 1){
$( "#create_pay_order" ).prop( "disabled", false );
}
$("#sxModal").hide();
$("#read_modal").modal('hide');
});
$('#addorder').on('click', function () {