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

sub total fixed in origami shows

Browse Source
This commit is contained in:
Yan
2017-06-26 14:16:22 +06:30
parent ecc9ab53ec
commit 00c19fdd67
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/home/show.html.erb
View File

@@ -174,7 +174,7 @@
count = 0
@order_items.each do |order_item |
count += 1
sub_total = sub_total + order_item.price
sub_total = sub_total + (order_item.price * order_item.qty)
unless order_item.price == 0 %>
<tr>

4
app/views/origami/rooms/show.html.erb
View File

@@ -148,7 +148,7 @@
sub_total = 0
if @status == "sale"
@obj.sale_items.each do |sale_item|
sub_total = sub_total + sale_item.price
sub_total = sub_total + sale_item.price
%>
<input type="hidden" id="sale_id" value="<%= @obj.sale_id %>">
<% unless sale_item.price == 0 %>
@@ -165,7 +165,7 @@
if @status == 'order'
unless @order_items.nil?
@order_items.each do |order_item |
sub_total = sub_total + order_item.price
sub_total = sub_total + (order_item.price * order_item.qty)
unless order_item.price == 0 %>
<tr>