wt updated

This commit is contained in:
code2lab
2019-05-29 18:37:58 +06:30
parent d5d137338d
commit 0fef2d5ba2
15 changed files with 439 additions and 176 deletions

View File

@@ -18,19 +18,19 @@
<%if current_login_employee.role !="waiter" %>
<a href="javascript:void(0);" class="bars"></a>
<% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "account" %>
<a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
<a class="navbar-brand mbl_view" href="<%=dashboard_path%>" style="margin-left: 20px;">
<% elsif current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
<a class="navbar-brand" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<%else%>
<a class="navbar-brand" href="" style="margin-left: 20px;">
<a class="navbar-brand mbl_view" href="" style="margin-left: 20px;">
<% end %>
<% else %>
<a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
<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" />
<span class="navbar-brand-txt">SX Restaurant</span>
</a>
<span class="navbar-brand m-0">
<span id="others_payment"></span>
</span>
@@ -40,11 +40,17 @@
<span class="navbar-brand navbar-brand-txt"><%= shop_detail.name %></span>
</div>
<!-- End Shop Info -->
<div class="navbar-right m-auto">
<% if order_reservation %>
<div class="online_order">
<span class="navbar-brand navbar-brand-txt header-default-color"><%= t :order_reservation %></span>
<span class="navbar-brand navbar-brand-txt header-default-color">
<% if request.user_agent.include? "Mobile" %>
<img src="/assets/online_order_icon.png" alt="<%= t :order_reservation %>" />
<% else %>
<%= t :order_reservation %>
<% end %>
</span>
<span class="order_no"></span>
</div>
<% end %>
@@ -52,7 +58,7 @@
<!-- Start Quick Access for Cashier -->
<!-- <div class="navbar-right m-auto">
<a href="#" class="dropdown-toggle waves-block col-white" data-toggle="dropdown" aria-haspopup="true" aria-expanded="flase">
<a href="#" class="dropdown-toggle waves-block col-white" data-toggle="dropdown" aria-haspopup="true" aria-expanded="flase">
<span><%= t :cashier %></span>
</a>
<ul class="dropdown-menu">
@@ -62,7 +68,7 @@
<i class="material-icons font-7 logout_icon shopinfo">monetization_on</i>
<span class="font-15 shopinfo dinein" ><%= t :dine_in %></span>
</a>
</p>
</p>
</li>
<li>
<p class="waves-effect waves-block p-l-20 m-b-5">
@@ -70,7 +76,7 @@
<i class="material-icons font-7 logout_icon shopinfo">restaurant_menu</i>
<span class="font-15 shopinfo quick_service" ><%= t :quick_service %></span>
</a>
</p>
</p>
</li>
<% if order_reservation %>
<li>
@@ -80,7 +86,7 @@
<span class="font-15 col-black online_order" ><%= t :order_reservation %></span>
<span class="order_no"></span>
</a>
</p>
</p>
</li>
<% end %>
<li>
@@ -89,7 +95,7 @@
<i class="material-icons font-7 logout_icon shopinfo">book</i>
<span class="font-15 col-black reservation" ><%= t :reservation %></span>
</a>
</p>
</p>
</li>
<li>
<p class="waves-effect waves-block p-l-20 m-b-5">
@@ -97,17 +103,23 @@
<i class="material-icons font-7 logout_icon shopinfo">restaurant</i>
<span class="font-15 col-black foodcourt" ><%= t :foodcourt %></span>
</a>
</p>
</p>
</li>
</ul>
</div> -->
<!-- End Quick Access for Cashier -->
<!-- Start Delete confirrm text !-->
<div class="navbar-right">
<a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<div class="navbar-right toggle_mbl">
<a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<% if current_login_employee %>
<span><%= current_login_employee.name %></span>
<span>
<% if request.user_agent.include? "Mobile" %>
<img src="/assets/user_icon.png" alt="<%= current_login_employee.name %>" />
<% else %>
<%= current_login_employee.name %>
<% end %>
</span>
<% end %>
</a>
<ul class="dropdown-menu">
@@ -118,14 +130,14 @@
<i class="material-icons font-7 logout_icon shopinfo">info</i>
<span class="font-15 shopinfo" >Shop Info</span>
</a>
</p>
</p>
</li>
<% end %>
<li>
<p class="waves-effect waves-block p-l-30 m-b-5 team_viewer">
<i class="material-icons font-7 logout_icon shopinfo">touch_app</i>
<span class="font-15 shopinfo" >Team Viewer</span>
</p>
</p>
</li>
<li>
<!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
@@ -140,7 +152,7 @@
<h6>Are you sure you want to Logout ?</h6>
<!-- <h6>This action can't be undo. </h6> -->
</span>
</li>
</li>
</ul>
<!-- NO Need for color Change
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
@@ -156,7 +168,7 @@
var method = $(this).attr('data-method');
var url = $(this).attr('data-ref');
var html_text = $(this).siblings( "#delete_text" ).html();
//var page = url.substring(url.lastIndexOf('/') + 1);
//var page = url.substring(url.lastIndexOf('/') + 1);
swal({
title: "Confirmation",
text: html_text,
@@ -168,11 +180,11 @@
if (isConfirm) {
$.ajax({
type: method,
url: url ,
success: function(data) {
url: url ,
success: function(data) {
location.href = data.url;
}
});
});
} else {
swal("Cancelled", "Your imaginary file is safe :)", "error");
}
@@ -203,6 +215,6 @@
}
});
});
});
</script>
</script>