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-26 14:40:45 +06:30
parent 9226a7b18d 74a9166620
commit 6eb3d9399e
8 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/reports/payment_method/index.html.erb
View File

@@ -103,7 +103,7 @@
<td><%= payment.cashier_name rescue '-' %></td>
<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
<td><%= payment.payment_method rescue '-' %></td>
<td><%= payment.payment_amount rescue '-' %></td>
<td><%= payment.payment_amount + payment.outstanding_amount%> </td>
<td><%= payment.sale.grand_total rescue '-' %></td>
</tr>

12
app/views/reports/receipt_no/index.html.erb
View File

@@ -46,8 +46,8 @@
<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
<% @sale_taxes.each do |tax| %>
<th><%= tax.tax_name %></th>
<% @tax_profiles.each do |tax| %>
<th><%= tax.name %></th>
<% end %>
<!-- <th>Other Amount</th> -->
<th><%= t("views.right_panel.detail.grand_total") %></th>
@@ -83,6 +83,9 @@
<td><%= result.cashier_name rescue '-' %></td>
<td><%= result.total_amount rescue '-' %></td>
<td><%= result.total_discount rescue '-' %></td>
<%if result.customer.customer_type == "Takeaway"%>
<td>0.0</td>
<%end%>
<% result.sale_taxes.each do |tax| %>
<td><%= tax.tax_payable_amount rescue '-' %></td>
<%end%>
@@ -108,8 +111,9 @@
<td colspan="2">&nbsp;</td>
<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
<% @sale_taxes.each do |tax| %>
<td><%= tax.tax_name %></td>
<% @tax_profiles.each do |tax| %>
<td><%= tax.name %></td>
<% end %>
<td><%= t("views.right_panel.detail.grand_total") %></td>
<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>

4
app/views/reports/saleitem/index.html.erb
View File

@@ -63,7 +63,9 @@
<% @sale_data.each do |sale| %>
<% total_qty += sale.total_item %>
<% if sale.total_item > 0
total_qty += sale.total_item
end %>
<% if !acc_arr.include?(sale.account_id) %>
<tr>