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

fixed confilt

Browse Source
This commit is contained in:
NyanLinHtut
2020-03-20 16:19:13 +06:30
parent dce2441b9a 1c88f722e6
commit 3a0a899458
17 changed files with 1119 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/views/foodcourt/addorders/detail.html.erb
View File

@@ -6,10 +6,12 @@
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>
<% @order_id = params[:order_id].gsub('"', '') if params[:order_id] %>
<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
<input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
<input type="hidden" name="link_type" id="link_type" value="<%= @cashier_type %>">
<input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
<input type="hidden" name="order_id" id="order_id" value= "<%= @order_id %>">
<div class="row m-t--10 h-100">
<div class="col-lg-2 col-md-2 col-sm-2 hidden d-flex flex-column h-100" id="menu_data">
<li class="list-menu">
@@ -80,7 +82,7 @@
<div class="col-lg-2 col-md-2 col-sm-2 hidden h-100 d-flex flex-column m-t-10" id="menu_cache">
<div class="card h-100">
<div class="card h-100" style="margin-bottom: 10px;">
<div class="card-header">
<li class="list-menu" style="background: none">
<a href="javascript:void(0);" id="menu_dropdown" class="menu-toggle dropdown-toggle toggled my-toggle ">
@@ -106,8 +108,9 @@
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10 d-flex flex-column h-100" >
<div class="card h-100">
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10 d-flex flex-column h-100" style="margin-left: -10px;
margin-right: -10px;">
<div class="card h-100" style="margin-bottom: 10px;">
<div class="card-block d-flex flex-column h-100" style="">
<div class="card-text" id="foodcourt-slimscroll">
<div class="row menu_items_list" style="margin:0px 1px 0px 1px ;">
@@ -154,11 +157,11 @@
</div>
</div>
</div>
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10 d-flex flex-column h-100 ">
<div class="card h-100">
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10 d-flex flex-column h-100">
<div class="card h-100" style="margin-right: -20px; margin-bottom: 10px;">
<div class="card-header" style="padding: 0.12rem 0.25rem">
<button type="button" class="btn btn-lg btn-primary waves-effect col-md-12" id='app_order'>
Mobile Orders <span class="badge badge-danger" style="font-size: 0.75rem;border-radius: 5px;"><%= @app_order_new_count %></span>
Orders
</button>
<div class="row ">
<div class="col-md-9 col-lg-9 col-sm-9 ">
@@ -174,8 +177,15 @@
</div>
<div class="card-block d-flex flex-column h-100">
<div class="table-responsive">
<table class="table" id="append-table">
<!-- <div class="table-responsive">
<table class="table m-b-0" id="append-table">
<thead>
</thead>
</table>
</div> -->
<div class="card-text h-100" id="foodcourt-order-slimscroll">
<table class="table table-striped summary-items" id="order-items-table">
<thead>
<tr>
<th>#</th>
@@ -184,10 +194,6 @@
<th class="text-nowrap text-right">Price</th>
</tr>
</thead>
</table>
</div>
<div class="card-text h-100" id="foodcourt-order-slimscroll">
<table class="table table-striped summary-items fixed-header" id="order-items-table" >
<tbody class="font-13" >
</tbody>
@@ -198,15 +204,20 @@
<div class="card-footer flex-grow-1 custom-card-footer" id="orders-footer">
<table class="table" id="order-charges-table" border="0">
<tr>
<td colspan="2" style="padding:2px; text-align:" class="charges-name"><strong>Total:</strong></td>
<td style="padding:2px; text-align: center;"><strong id="total_qty">0</strong></td>
<td style="padding:2px; text-align:" class="item-attr float-right"><strong id="sub_total">0.00</strong></td>
<td colspan="2" style="padding:2px;" class="charges-name"><strong>Total:</strong></td>
<td style="padding:2px 20px 2px 2px;"><strong id="total_qty">0</strong></td>
<td style="padding:2px;" class="item-attr <%= params[:modify] ? '' : 'text-right'%>"><strong id="sub_total">0.00</strong></td>
</tr>
</table>
<% if @sale_id.nil?%>
<button type="button" class="btn btn-primary action-btn create col-md-12" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
<% if params[:update] %>
<button type="button" class="btn btn-primary action-btn create col-md-12 m-t-5" id="create_pay_order" disabled="disabled" style=" height: 50px; width: 100%;">Update Order & Pay</button>
<% else %>
<button type="button" class="btn btn-primary action-btn create col-md-12" id="add_to_existing_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
<% if @sale_id.nil?%>
<button type="button" class="btn btn-primary action-btn create col-md-4 d-inline" id="create_pay_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
<% else %>
<button type="button" class="btn btn-primary action-btn create col-md-4 d-inline" id="add_to_existing_order" disabled="disabled" style="padding-top:4px !important;padding-bottom:4px !important;"><i class="material-icons" style="font-size:34px;width:34px">attach_money</i></button>
<% end %>
<button type="button" class="btn btn-primary action-btn create col-md-7 m-l-15 d-inline" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
<% end %>
</div>
</div>
@@ -325,7 +336,8 @@
</div>
<div class="modal-footer">
<div class="mr-auto">
<h4 class=" pull-left">Total : <span id="total_price"></span></h4>
<h4 class=" pull-left d-inline">Total : <span id="total_price"></span></h4>
<div id="wanring_text" class="d-inline text-danger" style="margin-left: 50px"></div>
</div>
<div class="row">
<div class="col-md-4">
@@ -342,14 +354,15 @@
<!-- Large modal -->
<div class="modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="sx_item_set_detailLabel" aria-hidden="true" >
<div class="modal-dialog custom-modal-dialog modal-lg">
<div class="modal-content">
<div class="modal sx_item_set_detailModal h-100" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="sx_item_set_detailLabel" aria-hidden="true" >
<div class="modal-dialog custom-modal-dialog modal-lg h-100">
<div class="modal-content h-100">
<div class="modal-header" style="background-color: #54A5AF;padding-top:10px !important;">
<h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
<button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
</div>
<div class="modal-body" data-height="50">
<div class="modal-body h-100" id="set-menu-item-slimscroll" data-height="50">
<!-- id="set-menu-item-slimscroll" -->
<div class="row set-item">
<div class="col-md-4">
<p class="set_default_option" style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
@@ -465,6 +478,9 @@ $(document).ready(function () {
});
$(document).on('click', '.menu_click', function(event){
$('.category_list').find('li').find('.nav-link').removeClass('active');
var menu_id = $(this).attr("data-id");
var name = $(this).attr("data-name");
var menus = JSON.parse(localStorage.getItem("menus"));