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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

Browse Source
This commit is contained in:
Aung Myo
2017-12-06 13:44:08 +06:30
parent 7aa1627e90 93a735c55e
commit b9b7d963ae
11 changed files with 458 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,26 +117,26 @@
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="card">
<div class="body">
<h6>Sale</h6>
<h6><%= t :sale %></h6>
<table class="table">
<tr>
<td>Total Receipt : </td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.receipt") %> : </td>
<td align="right"><%= @summ_sale.total_receipt %></td>
</tr>
<tr>
<td>Total Sale : </td>
<td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
<td align="right"><%= @summ_sale.total_amount %></td>
</tr>
<tr>
<td>Total Discount : </td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
<td align="right"><%= @summ_sale.total_discount %></td>
</tr>
<tr>
<td>Total Tax : </td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
<td align="right"><%= @summ_sale.total_tax %></td>
</tr>
<tr>
<td>Grand Total : </td>
<td><%= t("views.right_panel.detail.grand_total") %> : </td>
<td align="right"><%= @summ_sale.grand_total %></td>
</tr>
</table>
@@ -157,17 +157,17 @@
<% end %>
<% end %>
<% end %>
<tr>
<td><%= t("views.right_panel.detail.card_sale") %> : </td>
<td align="right">
<% total_card = 0.0 %>
<% @sale_data.each do |data| %>
<% total_card = data["card"] %>
<% break end %>
<%= total_card.to_f %>
</td>
</tr>
<% end %>
<tr>
<td>Card Sale : </td>
<td align="right">
<% total_card = 0.0 %>
<% @sale_data.each do |data| %>
<% total_card = data["card"] %>
<% break end %>
<%= total_card.to_f %>
</td>
</tr>
</table>
</div>
</div>
@@ -179,35 +179,35 @@
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="card">
<div class="body">
<h6>Customer</h6>
<h6><%= t :customer %></h6>
<table class="table">
<% if !@total_customer.nil? %>
<tr>
<td>Total Customer : </td>
<td><%= t("views.right_panel.detail.total") %> <%= t :customer %> : </td>
<td align="right"><%= @total_customer.total_cus %></td>
</tr>
<% end %>
<% if !@total_dinein.nil? %>
<tr>
<td>Dine in : </td>
<td><%= t("views.right_panel.detail.dine_in") %> : </td>
<td align="right"><%= @total_dinein.total_dinein_cus %></td>
</tr>
<% end %>
<% if !@total_takeaway.nil? %>
<tr>
<td>Takeaway : </td>
<td><%= t("views.right_panel.detail.takeaway") %> : </td>
<td align="right"><%= @total_takeaway.total_take_cus %></td>
</tr>
<% end %>
<% if !@total_other_customer.nil? %>
<tr>
<td>Customer : </td>
<td><%= t :customer %> : </td>
<td align="right"><%= @total_other_customer.total_cus %></td>
</tr>
<% end %>
<% if !@total_membership.nil? %>
<tr>
<td>Membership : </td>
<td><%= t("views.right_panel.detail.membership") %> : </td>
<td align="right"><%= @total_membership.total_memb_cus %></td>
</tr>
<% end %>
@@ -221,16 +221,16 @@
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div class="card">
<div class="body">
<h6>Order</h6>
<h6><%= t("views.right_panel.detail.order") %></h6>
<table class="table">
<% if !@total_order.nil? %>
<tr>
<td width="40px">Total Order : </td>
<td width="40px"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.order") %> : </td>
<td align="right" width="60px" style="padding: 5px"><%= @total_order.total_order %></td>
</tr>
<% end %>
<% if !(@total_accounts.nil?) %>
<% if !@total_accounts.nil? %>
<% @total_accounts.each do |account| %>
<tr>
<td width="40px"><%= account.title %> (Account) : </td>
@@ -245,14 +245,14 @@
<% end %>
<% if !@top_items.nil? %>
<tr>
<td width="40px">Top Item : </td>
<td width="40px"><%= t :top %> <%= t("views.right_panel.detail.item") %> : </td>
<td align="right" width="60px" style="padding: 5px"><%= @top_items.item_name %>
<br>(<%= @top_items.item_total_price %>)</td>
</tr>
<% end %>
<% if !@total_foc_items.nil? %>
<tr>
<td width="40px">Total FOC Item : </td>
<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" style="padding: 5px"><%= @total_foc_items %></td>
</tr>
<% end %>

2
app/views/settings/menu_categories/show.html.erb
View File

@@ -45,7 +45,7 @@
<td><%= @settings_menu_category.menu.name %></td>
<td><%= @settings_menu_category.name rescue "-" %></td>
<td><%= @settings_menu_category.alt_name %></td>
<td><%= settings_menu_category.is_available rescue false%></td>
<td><%= @settings_menu_category.is_available rescue false%></td>
<!-- <td><%= @settings_menu_category.order_by %></td> -->
<td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>