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

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

Browse Source
This commit is contained in:
phyusin
2018-06-25 11:25:47 +06:30
parent 5b8eb68169 bc988e5e9a
commit 99c2325aab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@
<% if sale.status_type == "Discount" <% if sale.status_type == "Discount"
total_qty += sale.total_item*(-1) total_qty += sale.total_item*(-1)
end %> end %>
<% if sale.remark =="promotion" <% if sale.status_type =="promotion" && @type == "promotion"
total_qty += sale.total_item*(-1) total_qty += sale.total_item*(-1)
end %> end %>
<!-- end all total qty --> <!-- end all total qty -->
@@ -150,7 +150,7 @@
sub_qty += sale.total_item*(-1) sub_qty += sale.total_item*(-1)
end %> end %>
<% if sale.remark == "promotion" <% if sale.status_type == "promotion" && @type == "promotion"
sub_qty += sale.total_item*(-1) sub_qty += sale.total_item*(-1)
end %> end %>
<% if count == value %> <% if count == value %>