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

discuont updated for show

Browse Source
This commit is contained in:
Yan
2017-06-22 11:31:05 +06:30
parent bded56a696
commit b13b0afa6c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/discounts_controller.rb
View File

@@ -20,9 +20,9 @@ class Origami::DiscountsController < BaseOrigamiController
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
sale.total_discount = overall_discount.to_f sale.total_discount = overall_discount.to_f
sale.total_amount = sub_total sale.total_amount = sub_total.to_f
sale.grand_total = (sub_total - overall_discount.to_f) + sale.total_tax; sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;
sale.save
if discount_items.length > 0 if discount_items.length > 0
#save sale item for discount #save sale item for discount
discount_items.each do |di| discount_items.each do |di|
@@ -43,8 +43,6 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.price = di["price"] sale_item.price = di["price"]
sale_item.save sale_item.save
end end
sale.save
end end
end end
end end

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

@@ -143,7 +143,10 @@
sub_total = sub_total + sale_item.price sub_total = sub_total + sale_item.price
%> %>
<input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>"> <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
<% unless sale_item.price <= 0 %> <%
# Can't check for discount
unless sale_item.price == 0
%>
<tr> <tr>
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'><%= sale_item.product_name %></td> <td class='item-name'><%= sale_item.product_name %></td>
@@ -164,7 +167,7 @@
count += 1 count += 1
sub_total = sub_total + order_item.price sub_total = sub_total + order_item.price
unless order_item.price <= 0 %> unless order_item.price == 0 %>
<tr> <tr>
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td> <td class='item-name'><%= order_item.item_name %></td>
@@ -188,7 +191,7 @@
</tr> </tr>
<tr> <tr>
<td class="charges-name"><strong>Discount:</strong></td> <td class="charges-name"><strong>Discount:</strong></td>
<td class="item-attr"><strong id="order-discount">(<%= @obj_order.total_discount rescue 0%>)</strong></td> <td class="item-attr"><strong id="order-discount">(<%= @obj_sale.total_discount rescue 0%>)</strong></td>
</tr> </tr>
<% if @status_sale == "sale" %> <% if @status_sale == "sale" %>
<tr> <tr>