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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
yarzar_code
2020-03-03 11:06:22 +06:30
parent e1dea34320 a1b2514023
commit 052be7f028
6 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,13 @@
</style>
<%= javascript_include_tag 'custom', 'data-turbolinks-track': 'reload' %>
<button type="button" class="btn btn-block btn-default waves-effect float-right m-t-10" id='back' style="width: 112px; margin-right: -10px">
<i class="material-icons">reply</i>
Back
</button>
<!-- Nav tabs -->
<ul class="nav nav-tabs tab-col-teal" role="tablist">
<ul class="nav nav-tabs tab-col-teal m-t--10" role="tablist">
<li class="nav-item">
<a class="nav-link <%= 'active' if params[:active].blank? %>" data-toggle="tab" href="#mobile_orders" role="tab">Mobile Orders</a>
</li>
@@ -161,10 +166,6 @@
</div>
</div>
<div class="col-md-1 col-lg-1 col-sm-12">
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons">reply</i>
Back
</button>
<a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a>
</div>
<% end %>

2
app/views/layouts/_foodcourt_left_sidebar.html.erb
View File

@@ -4,7 +4,7 @@
<ul class="list">
<li class="header"><%= t :main_navigation %></li>
<li class="active">
<a href="<%= foodcourt_food_court_path(:anchor => "") %>">
<a href="<%= foodcourt_food_court_path(:anchor => '') %>">
<i class="material-icons">monetization_on</i>
<span><%= t :origami %></span>
</a>

9
app/views/layouts/_header.html.erb
View File

@@ -10,22 +10,23 @@
</div> -->
<!-- #END# Search Bar -->
<!-- Top Bar -->
<%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
<% display_none = (food_court && current_user.role == 'cashier') ? 'd-none' : '' %>
<%if !request.path_info.include?('second_display') %>
<nav class="navbar">
<div class="container-fluid">
<div class="navbar-header">
<!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
<%if current_login_employee.role !="waiter" %>
<a href="javascript:void(0);" class="bars"></a>
<a href="javascript:void(0);" class="bars <%= display_none %>"></a>
<% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "account" %>
<a class="navbar-brand mbl_view" href="<%=dashboard_path%>" style="margin-left: 20px;">
<% elsif current_login_employee.role == "supervisor" %>
<a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<% elsif current_login_employee.role == "cashier" || current_login_employee.role == "waiter"%>
<%if ShiftSale.current_open_shift(current_login_employee) %>
<%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
<%if current_login_employee.role == "cashier" && food_court %>
<a class="navbar-brand mbl_view" href="<%=foodcourt_food_court_path%>" style="margin-left: 20px;">
<a class="navbar-brand mbl_view" href="<%=foodcourt_food_court_path%>" style="margin-left: -10px;">
<%else%>
<a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<%end%>
@@ -38,7 +39,7 @@
<% else %>
<a class="navbar-brand m-0 mbl_view" href="<%= origami_dashboard_path%>">
<%end%>
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo", class="<%= display_none.present? ? 'm-0' : '' %>" />
<span class="navbar-brand-txt">SX Restaurant</span>
</a>

2
app/views/origami/addorders/detail.html.erb
View File

@@ -243,7 +243,7 @@
</div>
<div class="card-block">
<div class="card-text" id="order-detail-slimscroll" data-height="140">
<div class="card-text" id="order-detail-slimscroll" data-height="165">
<table class="table table-striped summary-items" id="order-items-table" >
<thead>
<tr>

2
app/views/origami/dashboard/index.html.erb
View File

@@ -250,7 +250,7 @@ $(function() {
if ($('#server_mode').val() != "cloud" && display_type == 2) {
document.getElementById('second_view').click();
}
window.location.href = '/origami/food_court';
window.location.href = '/foodcourt/food_court#';
});
$(".order_reservation").on('click', function() {