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

check product sale

Browse Source
This commit is contained in:
phyusin
2018-02-28 15:42:07 +06:30
parent 8e4c3864da
commit 7c8b5def81
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/sale.rb
View File

@@ -862,8 +862,8 @@ def self.get_menu_item_query(order_by)
" LEFT JOIN accounts acc ON acc.id = menu_items.account_id" +
" LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
" LEFT JOIN sales s ON s.sale_id = si.sale_id")
.group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
.order("menu_items.menu_category_id #{order_by}, si.qty #{order_by}")
.group("si.qty, mc.id, menu_items.name, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)")
.order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
end
#product sale report query

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

@@ -69,12 +69,7 @@
<tr>
<td>&nbsp;</td>
<% if !cate_arr.include?(sale.menu_category_id) %>
<td><%= sale.menu_category_name %></td>
<% cate_arr.push(sale.menu_category_id) %>
<% else %>
<td>&nbsp;</td>
<% end %>
<td><%= sale.item_code rescue '-' %></td>
<td><%= sale.product_name rescue '-' %></td>
<td><%= sale.total_item rescue '-' %></td>