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

merge with master

Browse Source
This commit is contained in:
Yan
2017-12-15 10:36:43 +06:30
parent 3fb3fdfe3f 66200ef11a
commit 13ec405437
30 changed files with 218 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/home/dashboard.html.erb
View File

@@ -56,7 +56,7 @@
<% if current_user.role == 'administrator' || current_user.role == 'manager' %>
<div class="row">
<div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<div class="card">
@@ -111,7 +111,7 @@
</div>
</div>
</div>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
<% if !@summ_sale.nil? %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -185,7 +185,7 @@
<% if !@total_customer.nil? %>
<tr>
<td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
<td align="right"><%= @total_customer.total_cus %></td>
<td align="right"><%= @total_customer %></td>
</tr>
<% end %>
<% if !@total_dinein.nil? %>
@@ -254,7 +254,7 @@
<% if !@total_foc_items.nil? %>
<tr>
<td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.btn.foc") %> <%= t("views.right_panel.detail.item") %> : </td>
<td align="right" width="60px"><%= @total_foc_items %></td>
<td align="right" width="60px"><%= @total_foc_items.to_int %></td>
</tr>
<% end %>
</table>

4
app/views/layouts/origami.html.erb
View File

@@ -41,6 +41,10 @@
<%= render 'layouts/right_sidebar' %>
</section>
<!-- Notify -->
<div id="notify-wrapper"></div>
<!-- Notify -->
<!-- Main Content -->
<section class="content">
<% flash.each do |type, message| %>

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

@@ -12,7 +12,7 @@
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden" id="sub_category_list">
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>

9
app/views/origami/home/show.html.erb
View File

@@ -220,7 +220,7 @@
<input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<%
# Can't check for discount
unless sale_item.price == 0
# unless sale_item.price == 0
count += 1
%>
<tr>
@@ -231,8 +231,7 @@
</tr>
<%
end
# end
end
end
@@ -243,7 +242,7 @@
count += 1
sub_total = sub_total + (order_item.price * order_item.qty)
unless order_item.price == 0 %>
# unless order_item.price == 0 %>
<tr>
<td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td>
@@ -252,7 +251,7 @@
</tr>
<%
end
# end
end
end
end

8
app/views/origami/rooms/show.html.erb
View File

@@ -215,7 +215,7 @@
<input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<%
# Can't check for discount
unless sale_item.price == 0
# unless sale_item.price == 0
count += 1
%>
<tr>
@@ -227,7 +227,7 @@
<%
end
# end
end
end
@@ -238,7 +238,7 @@
count += 1
sub_total = sub_total + (order_item.price * order_item.qty)
unless order_item.price == 0 %>
# unless order_item.price == 0 %>
<tr>
<td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td>
@@ -247,7 +247,7 @@
</tr>
<%
end
# end
end
end
end

6
app/views/origami/sales/show.html.erb
View File

@@ -109,7 +109,7 @@
<div class="col-lg-5 col-md-5 col-sm-5">
<div class="card" >
<div class="card-header">
<div><strong id="order-title">INVOICE DETAILS </strong></div>
<div><strong id="order-title">INVOICE DETAILS </strong>| Table <%= @dining.name rescue "" %></div>
</div>
<div class="card-block">
<div class="card-title row p-l-5 p-r-5">
@@ -146,7 +146,7 @@
sub_total = sub_total + sale_item.price
%>
<input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
<% unless sale_item.price <= 0 %>
<% #unless sale_item.price <= 0 %>
<tr>
<td class='item-name'><%= sale_item.product_name %></td>
<td class='item-attr'><%= sale_item.qty %></td>
@@ -154,7 +154,7 @@
</tr>
<%
end
#end
end
%>