fixed report xls format

app/views/reports/dailysale/index.xls.erb

@@ -42,29 +42,18 @@
 								<th style='text-align:center;'><%= t("views.right_panel.detail.total_sales") %></th>
 								<% if @tax.blank? %>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.tax") %></th>
-								<% end %>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.net_sales") %></th>
+								<% end %>
+
 							</tr>
 						</thead>
 						<% unless @sale_data.blank? %>
 						<tbody>
 							<% void   = 0 %>
-							<% mpu    = 0 %>
-							<% master = 0 %>
-							<% visa   = 0 %>
-							<% jcb    = 0 %>
-							<% unionpay    	= 0 %>
-							<% alipay    	= 0 %>
-							<% paymal    	= 0 %>
-							<% dinga    	= 0 %>
-							<% junctionpay  = 0 %>
-							<% giftvoucher  = 0 %>
-							<% paypar = 0 %>
 							<% cash   = 0 %>
 							<% credit = 0 %>
 							<% foc    = 0 %>
 							<% discount = 0 %>
-							<% kbzpay = 0 %>
 							<% total    = 0 %>
 							<% grand_total = 0 %>
 							<% old_grand_total = 0 %>
@@ -105,8 +94,8 @@
 								<td style='text-align:right;'><%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<% if @tax.blank? %>
 								<td style='text-align:right;'><%= number_format(sale[:tax], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								<% end %>
 								<td style='text-align:right;'><%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% end %>
 
 							</tr>
 							<% count = count + 1 %>
@@ -127,8 +116,10 @@
 								<td style='text-align:right;'><%= number_format(rounding_adj, 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>
+								<% if @tax.blank? %>
 								<td style='text-align:right;'><%= number_format(tax, 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>
+								<% end %>
 
 							</tr>
 							<tr style="font-weight:600;">
@@ -140,21 +131,21 @@
 								<% @tax.each do |tax|
 									total_tax += tax.tax_amount.to_f %>
 									<tr style="font-weight:600;">
-										<td colspan="<%= colspan %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
+										<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-										<td colspan="2" style='text-align:right;'><%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td colspan="1" style='text-align:right;'><%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 								<% end %>
 								<% net = grand_total %>
 								<% net = net - rounding_adj%>
 								<% net = net - total_tax %>
 								<tr style="font-weight:600;">
-									<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+									<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td colspan="2" style='text-align:right;'><%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td colspan="1" style='text-align:right;'><%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 							<% else %>
 							<tr style="font-weight:600;">
-								<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+								<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-								<td colspan="2" style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<td colspan="1" style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 							</tr>
 							<% end %>
 							</tbody>

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

@@ -123,7 +123,7 @@
 						</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><b><%= number_format(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_format(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
@@ -139,7 +139,7 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 

app/views/reports/receipt_no/index.xls.erb

@@ -91,7 +91,7 @@
 						</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><b><%= number_format(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_format(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
@@ -106,7 +106,7 @@
 							<td><b><%= number_format(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 						</tr>
 						<tr>
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 

app/views/reports/void_sale/index.xls.erb

@@ -19,19 +19,19 @@
 						<% end %>
 						<% if @shift_from %>
 						<tr>
-							<% if @shift %>		
+							<% if @shift %>
 							<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
-							<% end %>	
+							<% end %>
 							<th colspan="3"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
 						</tr>
-						<% end %>		  
+						<% end %>
 						<tr>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t("views.right_panel.detail.sale_date") %></th>
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
 							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>			
+							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
 							<!-- <th>Sale Status</th> -->
 						</tr>
 					</thead>
@@ -48,7 +48,7 @@
 							<td><%= item.total_amount.to_f  rescue '-'%> </td>
 							<td><%= item.grand_total.to_f  rescue '-'%> </td>
 							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>
 							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
 							<!-- <td><%= item.remarks rescue '-' %> </td> -->
 						</tr>
@@ -63,7 +63,7 @@
 							<td><%= total_amount rescue '-' %></td>
 							<td><%= grand_total rescue '-' %></td>
 							<td><%= rounding_adjustment  rescue '-'%></td>
-							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+							<td colspan="1"><%= grand_rounding_adjustment  rescue '-'%></td>
 						</tr>
 					</tbody>
 				</table>
@@ -71,4 +71,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</html>