From f6e0e14383f48d2a5f668fe4f53c4710f934bdbb Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 28 Jun 2018 11:45:07 +0630 Subject: [PATCH] change some report format --- .../reports/dailysale_controller.rb | 11 +- app/views/reports/dailysale/index.html.erb | 150 ++++++++++++----- app/views/reports/dailysale/index.xls.erb | 151 +++++++++++++----- .../reports/order_reservation/index.html.erb | 2 +- .../reports/order_reservation/index.xls.erb | 2 +- .../order_reservations/index.html.erb | 5 +- 6 files changed, 240 insertions(+), 81 deletions(-) diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index 4f6d8e68..838536a7 100755 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -2,11 +2,12 @@ class Reports::DailysaleController < BaseReportController authorize_resource :class => false def index - from, to = get_date_range_from_params - @sale_data = Sale.daily_sales_list(from,to) - @tax = SaleTax.get_tax(from,to) - @from = from - @to = to + from, to = get_date_range_from_params + @sale_data = Sale.daily_sales_list(from,to) + @tax = SaleTax.get_tax(from,to) + @from = from + @to = to + @payment_methods = PaymentMethodSetting.where("is_active='1'").pluck("payment_method") # 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 10f73260..a6b57134 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -30,20 +30,42 @@ <%= 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.master_sales") %> - <%= t("views.right_panel.detail.visa_sales") %> - <%= t("views.right_panel.detail.jcb_sales") %> - <%= t("views.right_panel.detail.unionpay_sales") %> - <%= t("views.right_panel.detail.alipay_sales") %> - <%= t("views.right_panel.detail.paymal_sales") %> - <%= t("views.right_panel.detail.dinga_sales") %> - <%= t("views.right_panel.detail.junctionpay_sales") %> - <%= t("views.right_panel.detail.redeem_sales") %> + <% if @payment_methods.include? ("MPU") %> + <%= t("views.right_panel.detail.mpu_sales") %> + <% end %> + <% if @payment_methods.include? ("Master") %> + <%= t("views.right_panel.detail.master_sales") %> + <% end %> + <% if @payment_methods.include? ("VISA") %> + <%= t("views.right_panel.detail.visa_sales") %> + <% end %> + <% if @payment_methods.include? ("JCB") %> + <%= t("views.right_panel.detail.jcb_sales") %> + <% end %> + <% if @payment_methods.include? ("UNIONPAY") %> + <%= t("views.right_panel.detail.unionpay_sales") %> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <%= t("views.right_panel.detail.alipay_sales") %> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <%= t("views.right_panel.detail.paymal_sales") %> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <%= t("views.right_panel.detail.dinga_sales") %> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <%= t("views.right_panel.detail.junctionpay_sales") %> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <%= t("views.right_panel.detail.redeem_sales") %> + <% end %> <%= t("views.right_panel.detail.cash_sales") %> <%= t("views.right_panel.detail.credit_sales") %> <%= t("views.right_panel.detail.foc_sales") %> - <%= t("views.right_panel.detail.giftvoucher_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.grand_total") %> @@ -111,20 +133,42 @@ <%= 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 '-'%> - <%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:paypar_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 %> + <% if @payment_methods.include? ("Master") %> + <%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("VISA") %> + <%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JCB") %> + <%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("UNIONPAY") %> + <%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <%= number_with_precision(sale[:paypar_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[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(sale[:giftvoucher_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 '-'%> @@ -133,22 +177,56 @@ <% count = count + 1 %> <% end %> + <% colspan = 7 %> Total - <%= number_with_precision(mpu , precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% if @payment_methods.include? ("MPU") %> + <% colspan += 1 %> + <%= number_with_precision(mpu , precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end%> + <% if @payment_methods.include? ("Master") %> + <% colspan += 1 %> + <%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end%> + <% if @payment_methods.include? ("VISA") %> + <% colspan += 1 %> + <%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end%> + <% if @payment_methods.include? ("JCB") %> + <% colspan += 1 %> + <%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end%> + <% if @payment_methods.include? ("UNIONPAY") %> + <% colspan += 1 %> + <%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <% colspan += 1 %> + <%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <% colspan += 1 %> + <%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <% colspan += 1 %> + <%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <% colspan += 1 %> + <%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <% colspan += 1 %> + <%= 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(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_with_precision(giftvoucher, 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(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) <%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> @@ -161,7 +239,7 @@ <% @tax.each do |tax| total_tax += tax.tax_amount.to_f %> - <%= tax.tax_name rescue '-'%> + <%= tax.tax_name rescue '-'%> <%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>   @@ -172,7 +250,7 @@ <% net = net - rounding_adj%> <% net = net - total_tax %> - <%= t("views.right_panel.detail.net_amount") %> + <%= t("views.right_panel.detail.net_amount") %> <%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%>   diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 094e4c80..b8bf01b8 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -18,20 +18,42 @@ <%= 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.master_sales") %> - <%= t("views.right_panel.detail.visa_sales") %> - <%= t("views.right_panel.detail.jcb_sales") %> - <%= t("views.right_panel.detail.unionpay_sales") %> - <%= t("views.right_panel.detail.alipay_sales") %> - <%= t("views.right_panel.detail.paymal_sales") %> - <%= t("views.right_panel.detail.dinga_sales") %> - <%= t("views.right_panel.detail.junctionpay_sales") %> - <%= t("views.right_panel.detail.redeem_sales") %> + <% if @payment_methods.include? ("MPU") %> + <%= t("views.right_panel.detail.mpu_sales") %> + <% end %> + <% if @payment_methods.include? ("Master") %> + <%= t("views.right_panel.detail.master_sales") %> + <% end %> + <% if @payment_methods.include? ("VISA") %> + <%= t("views.right_panel.detail.visa_sales") %> + <% end %> + <% if @payment_methods.include? ("JCB") %> + <%= t("views.right_panel.detail.jcb_sales") %> + <% end %> + <% if @payment_methods.include? ("UNIONPAY") %> + <%= t("views.right_panel.detail.unionpay_sales") %> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <%= t("views.right_panel.detail.alipay_sales") %> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <%= t("views.right_panel.detail.paymal_sales") %> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <%= t("views.right_panel.detail.dinga_sales") %> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <%= t("views.right_panel.detail.junctionpay_sales") %> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <%= t("views.right_panel.detail.redeem_sales") %> + <% end %> <%= t("views.right_panel.detail.cash_sales") %> <%= t("views.right_panel.detail.credit_sales") %> <%= t("views.right_panel.detail.foc_sales") %> - <%= t("views.right_panel.detail.giftvoucher_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.grand_total") %> @@ -99,20 +121,42 @@ <%= 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[:master_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:unionpay_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]),delimiter => ',') rescue '-'%> + <% if @payment_methods.include? ("MPU") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Master") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("VISA") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JCB") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("UNIONPAY") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:unionpay_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_amount]),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]),delimiter => ',') rescue '-'%> + <% end %> <%= 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[:foc_amount]),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",sale[:giftvoucher_amount]),delimiter => ',') rescue '-'%> + <% if @payment_methods.include? ("GiftVoucher") %> + <%= number_with_delimiter(sprintf("%.2f",sale[:giftvoucher_amount]),delimiter => ',') rescue '-'%> + <% end %> (<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), delimiter => ',') rescue '-'%>) <%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]),delimiter => ',') rescue '-'%> @@ -121,23 +165,56 @@ <% count = count + 1 %> <% end %> - + <% colspan = 7 %> Total - <%= number_with_delimiter(sprintf("%.2f",mpu),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",master),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",visa), delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",jcb),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",unionpay),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",alipay),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",paymal),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",dinga),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",junctionpay),delimiter => ',') rescue '-'%> - <%= number_with_delimiter(sprintf("%.2f",paypar),delimiter => ',') rescue '-'%> + <% if @payment_methods.include? ("MPU") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",mpu),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Master") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",master),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("VISA") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",visa), delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JCB") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",jcb),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("UNIONPAY") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",unionpay),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Alipay") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",alipay),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("PAYMAL") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",paymal),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("DINGA") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",dinga),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("JunctionPay") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",junctionpay),delimiter => ',') rescue '-'%> + <% end %> + <% if @payment_methods.include? ("Redeem") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",paypar),delimiter => ',') rescue '-'%> + <% end %> <%= 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",giftvoucher), delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",foc), delimiter => ',') rescue '-'%> + <% if @payment_methods.include? ("GiftVoucher") %> + <% colspan += 1 %> + <%= number_with_delimiter(sprintf("%.2f",giftvoucher), delimiter => ',') rescue '-'%> + <% end %> (<%= number_with_delimiter(discount,delimiter => ',') rescue '-'%>) <%= number_with_delimiter(sprintf("%.2f",grand_total),delimiter => ',') rescue '-'%> @@ -150,7 +227,7 @@ <% @tax.each do |tax| total_tax += tax.tax_amount.to_f %> - <%= tax.tax_name rescue '-'%> + <%= tax.tax_name rescue '-'%> <%= number_with_delimiter(sprintf("%.2f",tax.tax_amount),delimiter => ',') rescue '-'%>   @@ -161,7 +238,7 @@ <% net = net - rounding_adj%> <% net = net - total_tax %> - <%= t("views.right_panel.detail.net_amount") %> + <%= t("views.right_panel.detail.net_amount") %> <%= number_with_delimiter(sprintf("%.2f",net),delimiter => ',') rescue '-'%>   diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb index 8384702f..e06d1dab 100755 --- a/app/views/reports/order_reservation/index.html.erb +++ b/app/views/reports/order_reservation/index.html.erb @@ -126,7 +126,7 @@ end %> - <%= order_reservation.email %> + <%= order_reservation.name %> <%= order_reservation.order_reservation_type %> <%= order_reservation.requested_time.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %> <%= provider%> diff --git a/app/views/reports/order_reservation/index.xls.erb b/app/views/reports/order_reservation/index.xls.erb index b33757e5..00f787f1 100755 --- a/app/views/reports/order_reservation/index.xls.erb +++ b/app/views/reports/order_reservation/index.xls.erb @@ -100,7 +100,7 @@ end %> - <%= order_reservation.email %> + <%= order_reservation.name %> <%= order_reservation.order_reservation_type %> <%= order_reservation.requested_time.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %> <%= provider%> diff --git a/app/views/transactions/order_reservations/index.html.erb b/app/views/transactions/order_reservations/index.html.erb index 0bd1c014..7709e402 100644 --- a/app/views/transactions/order_reservations/index.html.erb +++ b/app/views/transactions/order_reservations/index.html.erb @@ -70,8 +70,10 @@ <%= t("views.right_panel.detail.order_reservation_id") %> + <%= t("views.right_panel.detail.sale_id") %> <%= t("views.right_panel.detail.type") %> <%= t("views.right_panel.detail.requested_time") %> + <%= t("views.right_panel.detail.provider") %> <%= t("views.right_panel.detail.status") %> <%= t :payment_method %> <%= t :payment %> <%= t("views.right_panel.detail.status")%> @@ -137,10 +139,11 @@ <%= link_to order_reservation.order_reservation_id, transactions_order_reservation_path(order_reservation) %> + <%= link_to order_reservation.sale_id, transactions_sale_path(order_reservation.sale_id) rescue '-' %> <%= order_reservation.order_reservation_type %> <%= order_reservation.requested_time.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %> - <%= order_reservation.status %> <%= provider%> + <%= order_reservation.status %> <%= order_reservation.payment_type%> <%= order_reservation.payment_status%> <%= number_with_precision(order_reservation.total_amount, precision:precision.to_i, delimiter:delimiter) rescue '0.0'%>