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

add oos to set items

Browse Source
This commit is contained in:
Zin Moe
2020-03-20 16:09:44 +06:30
parent b8d66044cc
commit 1c88f722e6
4 changed files with 172 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,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 ">
@@ -110,7 +110,7 @@
<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">
<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 ;">
@@ -158,7 +158,7 @@
</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" style="margin-right: -20px;">
<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'>
Orders
@@ -354,14 +354,14 @@
<!-- 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">
@@ -478,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"));

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

@@ -267,7 +267,7 @@
<% elsif @status == 'order' %>
<span id="sale_id" style="display:none"><%= @pending.try(:booking_id) %></span>
<% end %>
<div class="card" style="height: 100%">
<div class="card" style="height: 100%; margin-bottom: 10px;">
<div class="card-header">
<div>
<strong id="order-title">INVOICE DETAILS </strong>| Table - <%= @pending.dining_facility.name rescue "" %>