From e7ef645200be2c95066b28f6e7e8be675b583a23 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 19 Sep 2018 10:40:45 +0630 Subject: [PATCH] change query for credit payment report --- app/models/sale.rb | 1 - app/views/reports/credit_payment/index.html.erb | 8 +++++++- app/views/reports/credit_payment/index.xls.erb | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index d4880929..6c55c7b7 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1219,7 +1219,6 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter, sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0 THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p')) - WHEN shift_started_at IS NOT NULL AND shift_closed_at IS NULL AND credit_payment > 0 THEN DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') ELSE '-' END) FROM shift_sales WHERE shift_sales.id = s.shift_sale_id" diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index d7926361..53a101d4 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -83,7 +83,13 @@ <%= credit.cashier_name rescue '-' %> <%= credit.sale.customer.name rescue '-' %> <%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <%= credit.credit_payment_shift_name rescue '-' %> + + <%if credit.credit_payment_shift_name == '-' %> + <%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%> + <% else %> + <%= credit.credit_payment_shift_name rescue '-' %> + <% end %> + <%= credit.credit_payment_receipt_date rescue '-' %> <%= credit.credit_payment_cashier_name rescue '-' %> <%= number_with_precision(credit.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 d2d9f5cb..41d4620f 100755 --- a/app/views/reports/credit_payment/index.xls.erb +++ b/app/views/reports/credit_payment/index.xls.erb @@ -55,7 +55,13 @@ <%= credit.cashier_name rescue '-' %> <%= credit.sale.customer.name rescue '-' %> <%= credit.payment_amount rescue '-' %> - <%= credit.credit_payment_shift_name rescue '-' %> + + <%if credit.credit_payment_shift_name == '-' %> + <%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%> + <% else %> + <%= credit.credit_payment_shift_name rescue '-' %> + <% end %> + <%= credit.credit_payment_receipt_date rescue '-' %> <%= credit.credit_payment_cashier_name rescue '-' %> <%= credit.credit_payment rescue '-' %>