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

Merge branch 'doemal_ordering' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-25 17:54:53 +06:30
parent 07eb95b0db 6ed1f4ba03
commit ba0a7b3391
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/reports/product_sale/index.html.erb
View File

@@ -59,6 +59,7 @@
<% total_data = {} %> <% total_data = {} %>
<% @sale_data.each do |sale| <% @sale_data.each do |sale|
if !total_item.has_key?(sale.item_code) if !total_item.has_key?(sale.item_code)
grand_total += sale.grand_total
total_item[sale.item_code] = sale.total_item total_item[sale.item_code] = sale.total_item
total_data[sale.item_code] = sale.grand_total total_data[sale.item_code] = sale.grand_total
else else
@@ -67,13 +68,13 @@
end end
if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc"
total_data[sale.item_code] += sale.grand_total total_data[sale.item_code] += sale.grand_total
grand_total += sale.grand_total
end end
end end
end %> end %>
<% @sale_data.each do |sale| %> <% @sale_data.each do |sale| %>
<% grand_total += sale.grand_total %> <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
<% if sale.status_type != "Discount" && sale.status_type != "foc"
total_qty += sale.total_item total_qty += sale.total_item
end %> end %>
<% if sale.status_type == "foc" && sale.price > 0 <% if sale.status_type == "foc" && sale.price > 0

5
app/views/reports/product_sale/index.xls.erb
View File

@@ -32,6 +32,7 @@
<% total_data = {} %> <% total_data = {} %>
<% @sale_data.each do |sale| <% @sale_data.each do |sale|
if !total_item.has_key?(sale.item_code) if !total_item.has_key?(sale.item_code)
grand_total += sale.grand_total
total_item[sale.item_code] = sale.total_item total_item[sale.item_code] = sale.total_item
total_data[sale.item_code] = sale.grand_total total_data[sale.item_code] = sale.grand_total
else else
@@ -40,13 +41,13 @@
end end
if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc"
total_data[sale.item_code] += sale.grand_total total_data[sale.item_code] += sale.grand_total
grand_total += sale.grand_total
end end
end end
end %> end %>
<% @sale_data.each do |sale| %> <% @sale_data.each do |sale| %>
<% grand_total += sale.grand_total %> <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
<% if sale.status_type != "Discount" && sale.status_type != "foc"
total_qty += sale.total_item total_qty += sale.total_item
end %> end %>
<% if sale.status_type == "foc" && sale.price > 0 <% if sale.status_type == "foc" && sale.price > 0