From 0c0ba0858aed42803a0fe570a2fc249fb901b72f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 4 Dec 2017 15:57:23 +0630
Subject: [PATCH] add taxes in sale item

---
 .../reports/receipt_no_controller.rb          |  3 --
 .../reports/saleitem_controller.rb            |  2 +
 app/views/reports/saleitem/index.html.erb     | 41 +++++++++++++++----
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 254bb423..9564bfe1 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -22,9 +22,6 @@ authorize_resource :class => false
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
         @tax_profiles = TaxProfile.order('order_by asc')
 
-puts @sale_data.count
-puts "sssssss"
-puts @tax_profiles.to_json
         @from       = from
         @to         = to
 
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 428bf9d7..18c86d92 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -17,6 +17,8 @@ class Reports::SaleitemController < BaseReportController
     end
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
 
+    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+puts @sale_taxes.to_json
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
 
 
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 8a36d9e9..2999a0cf 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -60,7 +60,8 @@
 							<% total_amount = 0 %>
 							<% discount = 0 %>
 							<% total_item_foc = 0 %>
-							<% total_item_dis = 0 %>
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
 
 							<% @sale_data.each do |sale| %>
 
@@ -153,7 +154,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span class="underline"><%= other_sub_total %></span></td>
+									<td ><span><%= other_sub_total %></span></td>
 								</tr>
 						
 							<!-- End Other Charges -->
@@ -161,8 +162,8 @@
 								<td colspan="3">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
-								<td><%= t("views.right_panel.detail.net_amount") %></td>
-								<td><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= grand_total%></span></td> 
 							</tr>
 							<% end %>
 
@@ -173,8 +174,8 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_dis %></span></td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= total_item_dis %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
@@ -183,9 +184,31 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= @discount_data %></span></td>
-							</tr>		
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= @discount_data %></span></td>
+							</tr>	
+							
+								<% @sale_taxes.each do |tax| %>
+								<tr>
+								    <td colspan="5">&nbsp;</td>
+									<td><%= tax.tax_name %></td>
+									<td><%= tax.st_amount.round(2) %>
+										<%total_tax += tax.st_amount%>
+									</td>
+								</tr>
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-top:2px solid grey;">Net Amount</td>
+								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
+								<td style="border-top:2px solid grey;"><%= grand_total + total_tax%></td> 
+							</tr>
+							<!-- <tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Grand Total</td>
+							
+								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+							</tr>	 -->
 						</tbody>
 					</table>
 				</div>