From 1645f75fa3b70ae13ed144d4485247297dc37eec Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 7 Dec 2017 14:05:39 +0630
Subject: [PATCH] update report excel

---
 .../reports/receipt_no_controller.rb          |  3 +-
 app/views/reports/receipt_no/index.html.erb   |  4 +-
 app/views/reports/shiftsale/index.xls.erb     | 62 ++++++++++---------
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 9564bfe1..1b449f4c 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -41,7 +41,8 @@ authorize_resource :class => false
 
 	def show
 		from, to  = get_date_range_from_params
-
+puts from 
+puts to
 	    @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
 
 	    date_arr = Array.new
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 1d613fdf..99330ae9 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -165,7 +165,8 @@
 	        var to        = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear();
 	        var from_date = new Date($('#from').val()); 
 	        var from      = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear();
-
+	        $('#from').val(from)
+			$('#to').val(to)
 			var period = 0;
 			var period_type = 1;	   
 
@@ -174,7 +175,6 @@
 
 				check_arr.push(to);
 				
-				console.log(check_arr.length)
 				if(check_arr.length == 1){
 					show_shift_name(period,period_type,from,to,'shift_item');	   	
 				}
diff --git a/app/views/reports/shiftsale/index.xls.erb b/app/views/reports/shiftsale/index.xls.erb
index 2730b901..aa1d0231 100755
--- a/app/views/reports/shiftsale/index.xls.erb
+++ b/app/views/reports/shiftsale/index.xls.erb
@@ -1,6 +1,6 @@
-
 <div class="row">
 	<div class="col-md-12">
+
 		<div class="margin-top-20">
     <!-- <div class="span11">
 		<div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
@@ -31,8 +31,8 @@
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
 						<!-- <th>Credit Charges</th> -->
 						<th><%= t("views.right_panel.detail.credit_payment") %></th>
-						<!-- <th>FOC Payment</th> -->
 						<th><%= t("views.btn.other_payment") %></th>
+						<th><%= t("views.btn.foc") %> <%= t :payment %></th>
 					<!-- <th>Grand Total 
 					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
@@ -51,37 +51,42 @@
 				<% g_total = 0 %>
 
 				<% @sale_data.each do |result|%>
-				<tr>
-					<td>
-						<%= result.cashier_terminal.name  rescue '-'%>
-					</td>
-					<td>
-						<%= result.employee.name  rescue '-'%>
-					</td>
-					<td><%= result.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> -  
-						<%= result.shift_closed_at.strftime("%e %b %I:%M%p") rescue '-'  %>
-					</td>
-					<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-					<td><%= sprintf "%.2f",result.cash_sales.to_f.to_d  rescue '-'%></td>
-					<td><%= sprintf "%.2f",result.credit_sales.to_f.to_d  rescue '-'%></td>
-					<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
-					  <!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
-					  <td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-					  <td><%= sprintf "%.2f",result.other_sales.to_f.to_d  rescue '-'%></td>	  		  
-					  <td><%= sprintf "%.2f",result.grand_total.to_f.to_d  rescue '-'%></td>	
+					
+					<tr>
+						<td>
+							<%= result[:cashier_terminal_name]  rescue '-'%>
+						</td>
+						<td>
+							<%= result[:employee_name]  rescue '-'%>
+						</td>
+						<td><%= result[:shift_started_at].strftime("%e %b %I:%M%p") rescue '-' %> -  
+							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
+						</td>
+						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
+						<td><%= sprintf "%.2f",result[:cash_sales].to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result[:credit_sales].to_f.to_d  rescue '-'%></td>
+						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
+						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
+						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
+						<td><%= sprintf "%.2f",result[:other_sales].to_f.to_d  rescue '-'%></td>	  		  
+						<td>
+						 	<%= sprintf "%.2f",result[:foc_sales].to_f.to_d  rescue '-'%>
+						</td>	  		  
+						<td><%= sprintf "%.2f",result[:grand_total].to_f.to_d  rescue '-'%></td>	
 
-					  <!--  <td><%= sprintf "%.2f",result.rounding_adj.to_f.to_d  rescue '-'%></td>	 -->
-					  <% grand_total = result.grand_total.to_f %>	  
-					  <!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
+						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
+						<% grand_total = result[:grand_total].to_f %>	  
+						<!--  <td><%= sprintf "%.2f",grand_tota.to_f.to_d  rescue '-'%></td> -->		  		  		  
 					</tr>
-					<% cash += result.cash_sales.to_f %>
-					<% credit += result.credit_sales.to_f %>
-					<% card += result.other_sales.to_f %>	
+					<% cash += result[:cash_sales].to_f %>
+					<% credit += result[:credit_sales].to_f %>
+					<% card += result[:other_sales].to_f %>	
+					<% foc += result[:foc_sales].to_f %>	
 
-					<% total += result.grand_total.to_f %>	
+					<% total += result[:grand_total].to_f %>	
 					<% g_total += grand_total.to_f %>
 
-					<% end %>
+				<% end %>
 
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
@@ -91,6 +96,7 @@
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
 						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
+						<td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
 						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>