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

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

Browse Source
This commit is contained in:
Yan
2017-11-24 19:04:55 +06:30
parent 5beb427dfe 6aed8f89c5
commit 3809413a6f
5 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/views/reports/saleitem/index.html.erb Executable file → Normal file
View File

@@ -59,18 +59,21 @@
<% acc_arr = Array.new %>
<% cate_arr = Array.new %>
<% sub_total = 0.0 %>
<% count = 0%>
<% total_price = 0.0 %>
<% sub_total = 0 %>
<% count = 0 %>
<% total_price = 0 %>
<% cate_count = 0 %>
<% acc_count = 0%>
<% grand_total = 0%>
<% total_qty = 0%>
<% acc_count = 0 %>
<% grand_total = 0 %>
<% total_qty = 0 %>
<% total_amount = 0 %>
<% discount = 0%>
<% discount = 0 %>
<% total_item_foc = 0 %>
<% total_item_dis = 0 %>
<% @sale_data.each do |sale| %>
<% total_qty += sale.total_item %>
<% total_qty += sale.total_item %>
<% if !acc_arr.include?(sale.account_id) %>
<tr>
@@ -102,55 +105,67 @@
<td><%= sale.total_item rescue '-' %></td>
<td><%= sale.unit_price rescue '-' %></td>
<td><%= sale.grand_total rescue '-' %></td>
</tr>
<!-- sub total -->
<% @menu_cate_count.each do |key,value| %>
<% if sale.menu_category_id == key %>
<% count = count + 1 %>
<% sub_total += sale.grand_total %>
<% count = count + 1 %>
<% sub_total += sale.grand_total %>
<% if count == value %>
<tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.sub_total") %></td>
<td ><span class="underline"><%= sub_total %></span></td>
</tr>
<% if sale.status_type === "foc"
total_item_foc += sale.grand_total
end %>
<% if sale.status_type === "Discount"
total_item_dis += sale.grand_total
end %>
<% sub_total = 0.0%>
<% count = 0%>
<% end %>
<% end %>
<% end %>
<!-- end sub total -->
<% end %>
<tr style="border-top:2px solid grey;">
<td colspan="3">&nbsp;</td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
<td><span><%= total_qty%></span></td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
<td><%= t("views.right_panel.detail.net_amount") %></td>
<td><span><%= grand_total%></span></td>
</tr>
<% end %>
<tr>
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.cash_received") %></td>
<td><span><%= @cash_data - @change_amount %></span></td>
</tr>
<tr>
</tr> -->
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.card_sales") %></td>
<td><span><%= @card_data %></span></td>
</tr>
<tr>
</tr> -->
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.credit_sales") %></td>
<td><span><%= @credit_data %></span></td>
</tr> -->
<tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= total_item_foc %></span></td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= total_item_dis %></span></td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
@@ -162,12 +177,18 @@
<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
<td><span><%= @discount_data %></span></td>
</tr>
<tr>
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.grand_total") %></td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
</tr>
<!-- <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
</tr> -->
<!-- <tr>
<td colspan="5">&nbsp;</td>
<td><%= t("views.right_panel.detail.grand_total") %></td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<!--<td><span class="double_underline"><%= grand_total + total_item_foc.abs+ total_item_dis.abs+ @foc_data+@discount_data%></span></td>
</tr> -->
</tbody>
</table>
</div>