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

update conflic

Browse Source
This commit is contained in:
Aung Myo
2018-06-18 10:41:50 +06:30
parent aec212d127 5c55be6c35
commit 2de538aee6
19 changed files with 739 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,25 +137,25 @@
<% if !@total_dinein.nil? %>
<tr>
<td><%= t("views.right_panel.detail.dine_in") %> : </td>
<td align="right"><%= @total_dinein.total_dinein_cus %></td>
<td align="right"><%= @total_dinein %></td>
</tr>
<% end %>
<% if !@total_takeaway.nil? %>
<tr>
<td><%= t("views.right_panel.detail.takeaway") %> : </td>
<td align="right"><%= @total_takeaway.total_take_cus %></td>
<td align="right"><%= @total_takeaway %></td>
</tr>
<% end %>
<% if !@total_other_customer.nil? %>
<!-- <% if !@total_other_customer.nil? %>
<tr>
<td><%= t :customer %> : </td>
<td align="right"><%= @total_other_customer.total_cus %></td>
</tr>
<% end %>
<% end %> -->
<% if !@total_membership.nil? %>
<tr>
<td><%= t("views.right_panel.detail.membership") %> : </td>
<td align="right"><%= @total_membership.total_memb_cus %></td>
<td align="right"><%= @total_membership %></td>
</tr>
<% end %>
</table>