Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/views/reports/saleitem/index.html.erb

@@ -64,7 +64,7 @@
 
 							<% @sale_data.each do |sale| %>
 
-								<% if sale.total_item > 0
+								<% if sale.total_item > 0 && sale.status_type != "Discount" && sale.status_type != "foc"
 									total_qty += sale.total_item
 								end %>
 
@@ -125,7 +125,7 @@
 							<!-- end sub total -->
 							<% end %>
 							<!--Other Charges -->
-							<%if @otehr_charges.present?%>
+							
 							   <tr>
 									<td><b>Other Charges</b></td>
 									<td colspan="4">&nbsp;</td>
@@ -155,7 +155,7 @@
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
 									<td ><span class="underline"><%= other_sub_total %></span></td>
 								</tr>
-							<%end%>
+						
 							<!-- End Other Charges -->
 							<tr style="border-top:2px solid grey;">
 								<td colspan="3">&nbsp;</td>