From 02bd167fe33402cb84751c2b3366b235d5bd0ab7 Mon Sep 17 00:00:00 2001
From: yarzar_code <yarzarminwai97@gmail.com>
Date: Fri, 18 Sep 2020 08:51:54 +0630
Subject: [PATCH] changed daily sales report column

---
 app/views/reports/dailysale/index.html.erb | 76 +++++-----------------
 app/views/reports/dailysale/index.xls.erb  | 73 ++++++++++-----------
 lib/tasks/shift_sales.rake                 |  2 +-
 3 files changed, 54 insertions(+), 97 deletions(-)

diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 310783b9..9a13e2a9 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -25,76 +25,35 @@
 								<tr>
 									<th colspan="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 								</tr>
-								<% @count = 1 %>
-								<% @payment_methods.each_slice(10) do |slice| %>
-									<!-- <tr>
-										<th></th>
-										<th></th>
-										<% alph = "A" %>
-
-										<% slice.each do |payment_method| %>
-											<th style="text-align:center;">
-												<%= alph %>
-											</th>
-											<% alph = alph.ord.next.chr %>
-											<% @count += 1 %>
-										<% end %>
-										<th style="text-align:center;" ><%= alph %></th>
-										<th style="text-align:center;"><%= alph = alph.ord.next.chr %></th>
-										<th style="text-align:center;"><%= alph = alph.ord.next.chr %></th>
-										<th style="text-align:center;"><%= alph = alph.ord.next.chr %></th>
-										<th style="text-align:center;"><%= alph = alph.ord.next.chr %></th>
-										<th style="text-align:center;"><%= alph = alph.ord.next.chr %></th>
-									</tr> -->
-									<!-- <tr>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
-										<% slice.each do |payment_method| %>
-											<th style="text-align:center;">
-												<%= payment_method %>
-											</th>
-										<% end %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
-										<% if @payment_methods.include? ("GiftVoucher") %>
-											<th style='text-align:center;'><%= t("views.right_panel.detail.giftvoucher_sales") %></th>
-										<% end %>
-										<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
-										<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th>    -->
-										<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>
-									</tr> -->
-								<% end %>
-									<tr>
-										<th></th>
-										<th></th>
-										<th colspan="<%= @count + 1 %>" style='text-align:center;'>Income</th>
-										<th colspan='4' style='text-align:center;'>Outgoing</th>
-										<th colspan='<%= @tax_profiles.size %>' style='text-align:center;'>Tax</th>
-										<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Net Sales = Income - Tax"><i class="material-icons md-18">live_help</i></th>
-										<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Gross Sales = Income + Discount"><i class="material-icons md-18">live_help</i></th>
-										<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Total Sales = Gross Sales - Discount"><i class="material-icons md-18">live_help</i></th>
-									</tr>
-								 <tr>
+								<% @count = @payment_methods.size %>
+								<tr>
+									<th></th>
+									<th></th>
+									<th colspan="<%= @count + 2 %>" style='text-align:center;'>Income</th>
+									<th colspan='3' style='text-align:center;'>Outgoing</th>
+									<th colspan='<%= @tax_profiles.size %>' style='text-align:center;'>Tax</th>
+                  <th></th>
+									<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Net Sales = Income - Tax"><i class="material-icons md-18">live_help</i></th>
+									<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Gross Sales = Income + Discount"><i class="material-icons md-18">live_help</i></th>
+									<th style='text-align:center; cursor: help;' data-toggle="tooltip" data-placement="top" title="Total Sales = Gross Sales - Discount"><i class="material-icons md-18">live_help</i></th>
+								</tr>
+								<tr>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
 									<th style='text-align:center;'><%= t("views.righ_panel.detail.date") %></th>
 									<% @payment_methods.each do |method| %>
-										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.#{method.parameterize == 'paymal' ? 'card_sales' : method.parameterize}") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.#{method}") %></th>
 									<% end %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
 									<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
-									<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th> -->
-									<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
 									<% if @tax_profiles.present? %>
 									<% @tax_profiles.each do |name| %>
 									<th style='text-align:center;'><%= t name %></th>
 									<% end %>
 									<% end %>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.net_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.gross_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.total_sales") %></th>
@@ -143,7 +102,6 @@
 
 									<td style='text-align:right;'>(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
 									<!-- <td style='text-align:right;'><%= number_format(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   -->
-									<td style='text-align:right;'><%= number_format(sale[:rounding_adj], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 									<% if @tax_profiles.present? %>
 									<% @tax_profiles.each do |name| %>
@@ -151,6 +109,7 @@
 									<% end %>
 									<% end %>
 
+                  <td style='text-align:right;'><%= number_format(sale[:rounding_adj], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(sale[:gross_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
@@ -169,9 +128,7 @@
 									<td style='text-align:right;'><%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='color:red;text-align:right;'><%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-
 									<td style='text-align:right;'>(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 									<% if @tax_profiles.present? %>
 									<% @tax_profiles.each do |name| %>
@@ -179,6 +136,7 @@
 									<% end %>
 									<% end %>
 
+                  <td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(gross_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(total_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index 2f5a526d..3d81d14f 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -12,41 +12,40 @@
 					<table class="table table-bordered">
 						<thead>
 							<tr>
-								<th colspan="<%= column_count = @payment_methods.length + 12 %>"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+								<th colspan="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 							</tr>
-							<% @count = 1 %>
-							<% @payment_methods.each_slice(10) do |slice| %>
-							<% end %>
-								<tr>
-									<th></th>
-									<th></th>
-									<th colspan="<%= @count + 1 %>" style='text-align:center;'>Income</th>
-									<th colspan=4 style='text-align:center;'>Outgoing</th>
-									<th colspan='<%= @tax_profiles.size %>' style='text-align:center;'>Tax</th>
-								</tr>
-							 <tr>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
-
-								<% @payment_methods.each do |method| %>
-									<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.#{method.parameterize == 'paymal' ? 'card_sales' : method.parameterize}") %></th>
-								<% end %>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
-
-								<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
-								<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th> -->
-								<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-								<% if @tax_profiles.present? %>
-								<% @tax_profiles.each do |name| %>
-								<th style='text-align:center;'><%= t name %></th>
-								<% end %>
-								<% end %>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.net_sales") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.gross_sales") %></th>
-								<th style='text-align:center;'><%= t("views.right_panel.detail.total_sales") %></th>
+							<% @count = @payment_methods.size %>
+							<tr>
+                <th></th>
+                <th></th>
+                <th colspan="<%= @count + 2 %>" style='text-align:center;'>Income</th>
+                <th colspan='3' style='text-align:center;'>Outgoing</th>
+                <th colspan='<%= @tax_profiles.size %>' style='text-align:center;'>Tax</th>
+                <th></th>
+                <th style='text-align:center;'>Net Sales = Income - Tax</th>
+                <th style='text-align:center;'>Gross Sales = Income + Discount</th>
+                <th style='text-align:center;'>Gross Sales - Discount</th>
+							</tr>
+							<tr>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
+                 <th style='text-align:center;'><%= t("views.righ_panel.detail.date") %></th>
+                 <% @payment_methods.each do |method| %>
+                   <th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.#{method}") %></th>
+                 <% end %>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
+                 <th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
+                 <% if @tax_profiles.present? %>
+                 <% @tax_profiles.each do |name| %>
+                 <th style='text-align:center;'><%= t name %></th>
+                 <% end %>
+                 <% end %>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.net_sales") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.gross_sales") %></th>
+                 <th style='text-align:center;'><%= t("views.right_panel.detail.total_sales") %></th>
 							</tr>
 						</thead>
 						<% unless @sale_data.blank? %>
@@ -91,7 +90,6 @@
 
 								<td style='text-align:right;'>(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
 								<!-- <td style='text-align:right;'><%= number_format(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   -->
-								<td style='text-align:right;'><%= number_format(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 								<% if @tax_profiles.present? %>
 								<% @tax_profiles.each do |name| %>
@@ -99,6 +97,7 @@
 								<% end %>
 								<% end %>
 
+                <td style='text-align:right;'><%= number_format(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(sale[:gross_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
@@ -117,15 +116,15 @@
 								<td style='text-align:right;'><%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='color:red;text-align:right;'><%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-
 								<td style='text-align:right;'>(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
-								<td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+
 								<% if @tax_profiles.present? %>
 								<% @tax_profiles.each do |name| %>
 								<td style='text-align:right;'><%= number_format(@sale_data.inject(0.0.to_d) { |sum, sale| sum + sale[name.parameterize.to_sym] }, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<% end %>
 								<% end %>
 
+                <td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(gross_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(total_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
diff --git a/lib/tasks/shift_sales.rake b/lib/tasks/shift_sales.rake
index 9ccb059e..f129769f 100644
--- a/lib/tasks/shift_sales.rake
+++ b/lib/tasks/shift_sales.rake
@@ -122,7 +122,7 @@ namespace :shift_sales do
             else
               takeaway_count  += 1
             end
-          else
+          elsif sale.sale_status == 'void'
             total_receipt     += 1
             total_void        += sale.grand_total
           end