diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 0f2767c5..8c9cccb6 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -1,158 +1,173 @@ -
- + + -| <%= 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.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") %> | -<%= 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.discount") %>) | -<%= t("views.right_panel.detail.grand_total") %> + <%= t("views.right_panel.detail.rnd_adj_sh") %> |
- <%= t("views.right_panel.detail.rnd_adj_sh") %> | -<%= t("views.right_panel.detail.grand_total") %> | -
| <%= 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.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") %> | +<%= 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.discount") %>) | + +<%= t("views.right_panel.detail.grand_total") %> | +<%= t("views.right_panel.detail.rnd_adj_sh") %> | -|
| <%= 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 '-'%> | -<%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :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[:total_discount]), :delimiter => ',') rescue '-'%>) | -<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%> | -<%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%> | -<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%> | -
| 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",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",discount), :delimiter => ',') rescue '-'%>) | -<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%> | -<%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%> | -<%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%> | -|||||||
| <%= 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 '-'%> | +<%= 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[:total_discount]), delimiter => ',') rescue '-'%>) | + +<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]),delimiter => ',') rescue '-'%> | +<%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f),delimiter => ',') rescue '-'%> | - <% total_tax = 0 %> - <% net = 0 %> - <% unless @tax.empty? %> - <% @tax.each do |tax| %> - <% total_tax += tax.tax_amount.to_f %> -|
| <%= 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 '-'%> | -- | |||||||||||||||||