diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index 6fb7fe3f..b821f9a5 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -8,6 +8,9 @@ class Reports::DailysaleController < BaseReportController
@from = from
@to = to
@payment_methods = PaymentMethodSetting.where("is_active='1'").pluck("payment_method")
+ count = @payment_methods.count
+ puts 'count+++++++++++++'
+ puts @payment_methods
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 5f7e35e0..3abcb369 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -26,10 +26,60 @@
| <%= 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 '-'%> |
-
+ <% @payment_methods.each_slice(10) do |slice| %>
+
+ |
+ |
+ <% alph = "A" %>
+ <% slice.each do |payment_method| %>
+
+ <%= alph %>
+ |
+ <% alph = alph.ord.next.chr %>
+ <% end %>
+
+
+ | <%= t("views.right_panel.detail.sr") %> |
+ <%= t("views.right_panel.detail.date") %> |
+ <% slice.each do |payment_method| %>
+
+ <%= payment_method %>
+ |
+ <% end %>
+ <%= t("views.right_panel.detail.cash_sales") %> |
+ <%= t("views.right_panel.detail.credit_sales") %> |
+ <%= t("views.right_panel.detail.void_amount") %> |
+ <%= t("views.right_panel.detail.foc_sales") %> |
+ <% if @payment_methods.include? ("GiftVoucher") %>
+ <%= t("views.right_panel.detail.giftvoucher_sales") %> |
+ <% end %>
+ (<%= t("views.right_panel.detail.discount") %>) |
+
+ <%= t("views.right_panel.detail.rnd_adj_sh") %> |
+ <%= t("views.right_panel.detail.grand_total") %> |
+
+ <% end %>
+
+
+
<% if @print_settings.precision.to_i > 0
precision = @print_settings.precision
@@ -137,7 +188,6 @@
| <%= count %> |
<%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %> |
- <%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% if @payment_methods.include? ("MPU") %>
<%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% end %>
@@ -173,21 +223,22 @@
<% end %>
<%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%> |
<%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% if @payment_methods.include? ("GiftVoucher") %>
<%= number_with_precision(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% end %>
(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>) |
- <%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% count = count + 1 %>
<% end %>
<% colspan = 7 %>
- | Total |
+ Total |
<% if @payment_methods.include? ("MPU") %>
<% if !request.user_agent.include? "Mobile" %>
<% colspan += 1 %>
@@ -256,6 +307,7 @@
<% end %>
<%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% if @payment_methods.include? ("GiftVoucher") %>
<% colspan += 1 %>
@@ -263,8 +315,8 @@
<% end %>
(<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) |
- <%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% total_tax = 0 %>