diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index b821f9a5..6fb7fe3f 100755 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -8,9 +8,6 @@ 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 3abcb369..3347408a 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -31,14 +31,23 @@ <% alph = "A" %> + <% @count = 1 %> <% slice.each do |payment_method| %> <%= alph %> <% alph = alph.ord.next.chr %> + <% @count += 1 %> <% end %> + <%= alph %> + <%= alph = alph.ord.next.chr %> + <%= alph = alph.ord.next.chr %> + <%= alph = alph.ord.next.chr %> + <%= alph = alph.ord.next.chr %> + <%= alph = alph.ord.next.chr %> + <%= alph = alph.ord.next.chr %> - + - <%= t("views.right_panel.detail.rnd_adj_sh") %> + <% end %> - - - + <%= t("views.right_panel.detail.rnd_adj_sh") %> <%= t("views.right_panel.detail.grand_total") %> - --> + <% if @print_settings.precision.to_i > 0 precision = @print_settings.precision @@ -221,13 +220,14 @@ <% if @payment_methods.include? ("Redeem") %> <%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% end %> + <% if @payment_methods.include? ("GiftVoucher") %> + <%= number_with_precision(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% 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[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> @@ -305,14 +305,15 @@ <% end %> <%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% 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 %> <%= number_with_precision(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% 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 '-'%> + (<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) <%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%>