+
-
+
-
+
-
+
credit_card
@@ -99,27 +99,27 @@
to_time = ''
end
%>
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -131,26 +131,29 @@
 %>)
-
+
@@ -40,11 +40,17 @@
-
+
<% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
\ No newline at end of file
+
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index a8a6d85c..acb35329 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -154,7 +154,7 @@
$(".collapse.in").each(function () {
$(this).siblings(".panel-heading").find(".glyphicon").addClass("glyphicon-minus").removeClass("glyphicon-plus");
});
-
+
// Toggle plus minus icon on show hide of collapse element
$(".collapse").on('show.bs.collapse', function () {
$(this).parent().find(".glyphicon").removeClass("glyphicon-plus").addClass("glyphicon-minus");
@@ -164,11 +164,3 @@
});
-
-
-
-
-
-
-
-
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 164b6c4f..415e8f2c 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -18,19 +18,19 @@
<%if current_login_employee.role !="waiter" %>
<% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "account" %>
-
+
<% elsif current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
-
+
<%else%>
-
+
<% end %>
<% else %>
-
+
<%end%>
-
+ <% end %>
-
+
-
+
-
+
-
+ <% end %>
+ <%= pie_chart @top_products %>
+ dashboard<%= (t :top) + " " + (t :products) %>
- - <%= pie_chart @top_products %> + <% isMobile = request.user_agent %> + <% if !isMobile.include? "Mobile" %> +
+
-
+
+
+
+
+
+ dashboard<%= (t :top) + " " + (t :products) %>
+ + <%= pie_chart @top_products %> +
+
+
+
dashboard<%= (t :bottom) + " " + (t :products) %>
+ + <%= pie_chart @bottom_products %> +
-
-
-
-
-
- dashboard<%= (t :bottom) + " " + (t :products) %>
- - <%= pie_chart @bottom_products %> -
+
+
+
+
+
+ dashboard<%= (t :bottom) + " " + (t :products) %>
+ + <%= pie_chart @bottom_products %> +
-
+
@@ -40,11 +40,17 @@
<% if order_reservation %>
@@ -90,13 +90,13 @@
-
+
+ <% if request.user_agent.include? "Mobile" %>
+ 
+ <% else %>
+ <%= t :order_reservation %>
+ <% end %>
+
<% end %>
@@ -52,7 +58,7 @@
-
+
-
+ <% else %>
+ <%= t :order_reservation %>
+ <% end %>
+
-
+
<% flash.each do |type, message| %>
- <%
- if type == "notice"
+ <%
+ if type == "notice"
color = "alert-success"
elsif type == "error"
color = "alert-danger"
@@ -67,22 +67,22 @@
else
color = "bg-black"
end %>
-
+
+
<% if current_login_employee %>
- <%= current_login_employee.name %>
+
+ <% if request.user_agent.include? "Mobile" %>
+ 
+ <% else %>
+ <%= current_login_employee.name %>
+ <% end %>
+
<% end %>
@@ -42,7 +42,7 @@
<% if can? :menage, OrderQueueStation %>
-
+
room_service
<%= t :oqs %>
@@ -50,8 +50,8 @@
<% end %>
<% if can? :index, :home %>
- <% if current_login_employee.role != "kitchen" %>
-
+ <% if current_login_employee.role != "kitchen" %>
+
monetization_on
<%= t :origami %>
@@ -60,27 +60,27 @@
<% end %>
<% end %>
<% if can? :menage, Customer %>
-
+
widgets
<%= t :crm %>
+ <% end %>
- <% end %>
+ <% end %>
<% if can? :menage, Inventory %>
-
+
store
<%= t :inventory %>
@@ -88,66 +88,9 @@
<%end%>
<%= t :backend %>
-
-
- widgets
- <%= t :transactions %>
-
-
-
- <% if can? :index, :dailysale %>
+ <% device = request.user_agent %>
+ <% if device.include? 'Mobile' %>
+ <% if can? :index, :dailysale %>
assessment
@@ -207,8 +150,193 @@
<% end %>
-
+
<%end%>
+
+
+
+ widgets
+ <%= t :transactions %>
+
+
+
+
+ <%else%>
+
+
+ widgets
+ <%= t :transactions %>
+
+
+
+ <% if can? :index, :dailysale %>
+
+
+ assessment
+ <%= t :reports %>
+
+
+
+ <% end %>
+ <% end %>
+
<%= t :settings %>
<% if can? :menage, Zone %>
@@ -232,7 +360,7 @@
donut_large
<%= t :oqs %>
-
+
<% end %>
<% if can? :menage, Employee %>
@@ -256,7 +384,7 @@
donut_large
<%= t :printer %>
-
+
<% end %>
<% if can? :menage, TaxProfile %>
@@ -312,8 +440,11 @@
<% end %>
+
+
+
+ <% else %>
+ <%= current_login_employee.name %>
+ <% end %>
+
<% end %>
@@ -42,7 +42,7 @@
<% if can? :menage, OrderQueueStation %>
-
@@ -326,4 +457,4 @@
-
- <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
+ <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
@@ -57,8 +57,8 @@
- <% end %> + <% end %>
Version - 1.0.1 -
+
- <%= shop_detail.name %>
+ <%= shop_detail.name %>
-
<% end %>
@@ -139,7 +145,7 @@
$("#login_form_password").focus();
$(".pin_pad").click(function (event) {
- event.preventDefault();
+ event.preventDefault();
var value = $(this).data("value");
if (value == "CLR") {
@@ -154,12 +160,12 @@
}
});
$(".enter").click(function (event) {
- event.preventDefault();
+ event.preventDefault();
var value = $(this).data("value");
if (value == "ENT") {
$("#new_login_form").submit();
- }
+ }
});
});
function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
@@ -199,5 +205,3 @@
+
<%= f.input :emp_id, as: :hidden, required: false, class: "form-control" %>
<%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
-
+
send @@ -126,10 +126,16 @@ + <% if request.user_agent.include? 'Mobile' %> +
+
send @@ -126,10 +126,16 @@ + <% if request.user_agent.include? 'Mobile' %> +
CLR
+ 0
+ ENTER
+ <% else %>
BACK
0
- CLR
- CLR
+ <% end %>
+