no show void item in discount

2017-07-21 10:52:46 +06:30
parent 30e1854969
commit 409fd05da4
2 changed files with 1 additions and 1 deletions
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -31,7 +31,7 @@
 	            <% @sale_data.sale_items.each do |sale_item| %>
 	          		<% 
 		          		sub_total += sale_item.qty*sale_item.unit_price 
-		          		unless sale_item.price == 0
+		          		if sale_item.price != 0 && sale_item.remark != "void"
 	          		%>
 	            	<tr class="item-row" id=<%= sale_item.sale_item_id %> >
 	                    <td style="width:60%; text-align:left">