diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index cc0eced9..98cfe853 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -42,29 +42,18 @@ <%= t("views.right_panel.detail.total_sales") %> <% if @tax.blank? %> <%= t("views.right_panel.detail.tax") %> - <% end %> <%= t("views.right_panel.detail.net_sales") %> + <% end %> + <% unless @sale_data.blank? %> <% void = 0 %> - <% mpu = 0 %> - <% master = 0 %> - <% visa = 0 %> - <% jcb = 0 %> - <% unionpay = 0 %> - <% alipay = 0 %> - <% paymal = 0 %> - <% dinga = 0 %> - <% junctionpay = 0 %> - <% giftvoucher = 0 %> - <% paypar = 0 %> <% cash = 0 %> <% credit = 0 %> <% foc = 0 %> <% discount = 0 %> - <% kbzpay = 0 %> <% total = 0 %> <% grand_total = 0 %> <% old_grand_total = 0 %> @@ -105,8 +94,8 @@ <%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% if @tax.blank? %> <%= number_format(sale[:tax], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <% end %> <%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> <% count = count + 1 %> @@ -127,8 +116,10 @@ <%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_format(gross_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_format(total_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% if @tax.blank? %> <%= number_format(tax, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> @@ -140,21 +131,21 @@ <% @tax.each do |tax| total_tax += tax.tax_amount.to_f %> - <%= tax.tax_name rescue '-'%> - <%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <%= tax.tax_name rescue '-'%> + <%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% end %> <% net = grand_total %> <% net = net - rounding_adj%> <% net = net - total_tax %> - <%= t("views.right_panel.detail.net_amount") %> - <%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <%= t("views.right_panel.detail.net_amount") %> + <%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% else %> - <%= t("views.right_panel.detail.net_amount") %> - <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <%= t("views.right_panel.detail.net_amount") %> + <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% end %> diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 7c3f3668..f3cbe471 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -123,7 +123,7 @@ <% end %> -   +   <%= number_format(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <%= number_format(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %> <% @tax_profiles.each do |tax| %> @@ -139,7 +139,7 @@ -   +   <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index c88c57a9..715baa9b 100755 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -91,7 +91,7 @@ <% end %> -   +   <%= number_format(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_format(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <% @tax_profiles.each do |tax| %> @@ -106,7 +106,7 @@ <%= number_format(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %> -   +   <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb index 587ca509..25806ff8 100755 --- a/app/views/reports/void_sale/index.xls.erb +++ b/app/views/reports/void_sale/index.xls.erb @@ -19,19 +19,19 @@ <% end %> <% if @shift_from %> - <% if @shift %> + <% if @shift %> <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> - <% end %> + <% end %> <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> ) - <% end %> + <% end %> <%= t("views.right_panel.detail.receipt_no") %> <%= t("views.right_panel.detail.sale_date") %> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= t("views.right_panel.detail.grand_total") %> <%= t("views.right_panel.detail.rnd_adj_sh") %> - <%= t("views.right_panel.detail.grand_total") %> +
<%= t("views.right_panel.detail.rnd_adj_sh") %> + <%= t("views.right_panel.detail.grand_total") %> +
<%= t("views.right_panel.detail.rnd_adj_sh") %> @@ -48,7 +48,7 @@ <%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %> - <%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%> + <%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%> @@ -63,7 +63,7 @@ <%= total_amount rescue '-' %> <%= grand_total rescue '-' %> <%= rounding_adjustment rescue '-'%> - <%= grand_rounding_adjustment rescue '-'%> + <%= grand_rounding_adjustment rescue '-'%> @@ -71,4 +71,4 @@ - \ No newline at end of file +