From d94dde63fef45e40087721ca913fcb20fe9d0436 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Fri, 15 Nov 2019 17:12:50 +0630 Subject: [PATCH] fix report for receipt, daily sales and credit sales. --- .../reports/credit_payment/index.html.erb | 5 +- .../reports/credit_payment/index.xls.erb | 5 +- app/views/reports/dailysale/index.html.erb | 13 ++- app/views/reports/dailysale/index.xls.erb | 63 ++++++------- app/views/reports/receipt_no/index.html.erb | 90 ++++--------------- app/views/reports/receipt_no/index.xls.erb | 80 ++++------------- 6 files changed, 81 insertions(+), 175 deletions(-) diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index d5621850..117100dc 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -97,7 +97,10 @@ <% end %> Total - <%= number_with_precision(total_credit_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> + <%= number_with_precision(total_credit_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> +   +   +   <%= number_with_precision(total_credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb index 6568e086..e765af67 100755 --- a/app/views/reports/credit_payment/index.xls.erb +++ b/app/views/reports/credit_payment/index.xls.erb @@ -69,7 +69,10 @@ <% end %> Total - <%= total_credit_amount rescue '-' %> + <%= total_credit_amount rescue '-' %> +   +   +   <%= total_credit_payment rescue '-' %> diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 592a8cca..58679bab 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -24,7 +24,7 @@ - + <% @payment_methods.each_slice(10) do |slice| %> @@ -45,7 +45,6 @@ - + + + <% total_tax = 0 %> <% net = 0 %> <% unless @tax.blank? %> @@ -326,8 +327,7 @@ total_tax += tax.tax_amount.to_f %> - - + <% end %> <% end %> @@ -337,8 +337,7 @@ <% net = net - total_tax %> - - + <% end %> diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 1e3871cf..bc50f903 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -12,12 +12,11 @@
<%= 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 '-'%> <%= 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 '-'%>
<%= alph = alph.ord.next.chr %> <%= alph = alph.ord.next.chr %> <%= alph = alph.ord.next.chr %><%= alph = alph.ord.next.chr %>
<%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%>
 
<%= tax.tax_name rescue '-'%><%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>
<%= t("views.right_panel.detail.net_amount") %><%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%>
- + - <% if @payment_methods.include? ("MPU") %> <% end %> @@ -53,14 +52,15 @@ <% end %> + <% if @payment_methods.include? ("GiftVoucher") %> <% end %> - + @@ -125,7 +125,6 @@ - <% if @payment_methods.include? ("MPU") %> <% end %> @@ -161,87 +160,90 @@ <% end %> + <% if @payment_methods.include? ("GiftVoucher") %> <% end %> + - <% count = count + 1 %> <% end %> <% colspan = 7 %> - + <% if @payment_methods.include? ("MPU") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("Master") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("VISA") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("JCB") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("UNIONPAY") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("Alipay") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("KBZPay") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("PAYMAL") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("DINGA") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("JunctionPay") %> <% colspan += 1 %> - + <% end %> <% if @payment_methods.include? ("Redeem") %> <% colspan += 1 %> - + <% end %> - - - + + + + <% if @payment_methods.include? ("GiftVoucher") %> <% colspan += 1 %> - + <% end %> - - - - + + + + + + <% total_tax = 0 %> <% net = 0 %> <% unless @tax.blank? %> <% @tax.each do |tax| total_tax += tax.tax_amount.to_f %> - - - + + <% end %> <% end %> @@ -250,9 +252,8 @@ <% net = net - rounding_adj%> <% net = net - total_tax %> - - - + + <% end %> diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 419a5b10..7733ab0d 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -81,40 +81,21 @@ <% discount_amt = 0 %> <% other_amt = 0 %> <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <% tax_profile_count = @tax_profiles.length %> + <% rounding_adj = 0%> + <% gov_tax = 0 %> + <% service_charge = 0 %> - <% - ttax_count = tax_profile_count - @sale_taxes.length - ttax_flag = true - @sale_taxes.each do |tax| - if tax.tax_name.downcase.include?("service") - ttax_flag = false - end - end - %> + <% if !@sale_data.nil? %> - - <%if !@sale_data.nil? %> <% @sale_data.each do |result| %> - <% grand_total += result.grand_total.to_f %> <% old_grand_total += result.grand_total.to_f - result.rounding_adjustment.to_f %> <% total_tax += result.total_tax.to_f %> <% total_sum += result.total_amount.to_f %> <% discount_amt += result.total_discount.to_f %> <% rounding_adj += result.rounding_adjustment.to_f %> - <% sale_tax_count = result.sale_taxes.length %> - <% tax_count = tax_profile_count - sale_tax_count %> - <% tax_flag = true %> - <% result.sale_taxes.each do |tax| - if tax.tax_name.downcase.include?("service") - tax_flag = false - end - end %> - - - <% if !result.sale_taxes.empty? %> - <% num = 1 %> - <% if tax_flag && tax_count > 0 %> - <% while num <= tax_count %> - - <% num += 1 %> - <% end %> - <% end %> - <% result.sale_taxes.each do |tax| %> - - <%end%> - <% num = 1 %> - <% if !tax_flag && tax_count > 0 %> - <% while num <= tax_count %> - - <% num += 1 %> - <% end %> - <% end %> - <% else %> - <% @tax_profiles.each do |tax| %> - - <% end %> - <%end%> + + <% @tax_profiles.each do |tax| %> + <% if sale_tax = result.sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %> + + <% else %> + + <% end %> + <% end %> @@ -172,29 +136,13 @@ - <% if !@sale_taxes.empty? %> - <% num = 1 - if ttax_flag && ttax_count > 0 %> - <% while num <= ttax_count %> - - <% num += 1 - end %> - <% end %> - <% @sale_taxes.each do |tax| %> - - <%end%> - <% num = 1 - if ttax_flag==false && ttax_count > 0 %> - <% while num <= ttax_count %> - - <% num += 1 - end %> - <% end %> - <% else %> - <% @tax_profiles.each do |tax| %> - - <% end %> - <%end%> + <% @tax_profiles.each do |tax| %> + <% if sale_tax = @sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %> + + <% else %> + + <% end %> + <% end %> diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index 29d8abe4..7cf1f14d 100755 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -61,20 +61,11 @@ <% discount_amt = 0 %> <% other_amt = 0 %> <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <% tax_profile_count = @tax_profiles.length %> + <% rounding_adj = 0%> + <% gov_tax = 0 %> + <% service_charge = 0 %> - <% - ttax_count = tax_profile_count - @sale_taxes.length - ttax_flag = true - @sale_taxes.each do |tax| - if tax.tax_name.downcase.include?("service") - ttax_flag = false - end - end - %> - - <%if @sale_data %> + <% if @sale_data %> <% @sale_data.each do |result| %> <% grand_total += result.grand_total.to_f %> @@ -83,14 +74,7 @@ <% total_sum += result.total_amount.to_f %> <% discount_amt += result.total_discount.to_f %> <% rounding_adj += result.rounding_adjustment.to_f %> - <% sale_tax_count = result.sale_taxes.length %> - <% tax_count = tax_profile_count - sale_tax_count %> - <% tax_flag = true %> - <% result.sale_taxes.each do |tax| - if tax.tax_name.downcase.include?("service") - tax_flag = false - end - end %> + - <% if !result.sale_taxes.empty? %> - <% num = 1 %> - <% if tax_flag && tax_count > 0 %> - <% while num <= tax_count %> + <% @tax_profiles.each do |tax| %> + <% if sale_tax = result.sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %> + + <% else %> - <% num += 1 %> - <% end %> - <% end %> - <% result.sale_taxes.each do |tax| %> - <% end %> - <% num = 1 - if tax_flag==false && tax_count > 0 %> - <% while num <= tax_count %> - - <% num += 1 - end %> - <% end %> - <% else %> - <% @tax_profiles.each do |tax| %> - - <% end %> - <%end%> + <% end %> @@ -135,29 +103,13 @@ - <% if !@sale_taxes.empty? %> - <% num = 1 - if ttax_flag && ttax_count > 0 %> - <% while num <= ttax_count %> + <% @tax_profiles.each do |tax| %> + <% if sale_tax = @sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %> + + <% else %> - <% num += 1 - end %> - <% end %> - <% @sale_taxes.each do |tax| %> - - <%end%> - <% num = 1 - if ttax_flag==false && ttax_count > 0 %> - <% while num <= ttax_count %> - - <% num += 1 - end %> - <% end %> - <% else %> - <% @tax_profiles.each do |tax| %> - - <% end %> - <%end%> + <% end %> + <% end %>
<%= 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 '-'%> <%= 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 '-'%>
<%= t("views.right_panel.detail.sr") %> <%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.void_amount") %><%= t("views.right_panel.detail.mpu_sales") %><%= 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") %><%= t("views.right_panel.detail.giftvoucher_sales") %>(<%= t("views.right_panel.detail.discount") %>) <%= t("views.right_panel.detail.grand_total") %> <%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %>
<%= count %> <%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), delimiter: delimiter) rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:giftvoucher_amount]),delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f),delimiter => ',') rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f),delimiter => ',') rescue '-'%>
TotalTotal<%= number_with_delimiter(sprintf("%.2f",mpu),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",mpu),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",unionpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",unionpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",alipay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",alipay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",kbzpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",kbzpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paymal),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paymal),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",dinga),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",dinga),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",junctionpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",junctionpay),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",void),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",giftvoucher), delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",giftvoucher), delimiter => ',') rescue '-'%>(<%= number_with_delimiter(discount,delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",grand_total),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj),delimiter => ',') rescue '-'%>(<%= number_with_delimiter(discount,delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",rounding_adj),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total),delimiter => ',') rescue '-'%>
 
<%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount),delimiter => ',') rescue '-'%> <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount),delimiter => ',') rescue '-'%>
<%= t("views.right_panel.detail.net_amount") %><%= number_with_delimiter(sprintf("%.2f",net),delimiter => ',') rescue '-'%> <%= t("views.right_panel.detail.net_amount") %><%= number_with_delimiter(sprintf("%.2f",net),delimiter => ',') rescue '-'%>
<%if result.type %> <%= result.type %> - <%= result.name %> @@ -125,31 +106,14 @@ <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %> <%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) %><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '0' %> - <%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '0' %><%= number_with_precision(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %>  <%= number_with_precision(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) %><%= number_with_precision(tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0' %> <%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %>
<%if result.type %> @@ -103,29 +87,13 @@ <%= result.cashier_name rescue '-' %> <%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %>  <%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %><%= number_with_precision(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0' %> <%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %>