From 409fd05da46b3655ec1b8b8fab176257f46095b2 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 21 Jul 2017 10:52:46 +0630
Subject: [PATCH] no show void item in discount

---
 app/views/origami/discounts/index.html.erb |   2 +-
 dump.rdb                                   | Bin 522 -> 487 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index c1250e39..ba7bf989 100644
--- 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">
diff --git a/dump.rdb b/dump.rdb
index 1967e324a9015034ad0371eb8d18b1eeaa785db0..0e8d606fd2b675a0c3e88d8fa1ab9153d5ebc576 100644
GIT binary patch
delta 73
zcmV-P0Ji^%1m^>gFc=f1a9R2Yb#rB8Ep26O!njul0R8~`2LX}J83ZygzyOhma|9!w
f1z?f?^%gZWH83|WG&MLkGBh>+;TC7=zi;@V@$wvQ

delta 88
zcmV-e0H^=w1BwKYFc?{na9R2Yb#rB8Ep26O!Z@1|0R8~`2mz6+84xlszyJaXaB^>B
uWpi_7a{-az7m;Oi1j)~^Uy<DP7Bo0HG&wFaH8M0YH8}s0N2$W7KSi&|nIaMZ