From 0f14a02f2d80cfb569b058d2e3424471266fd5bd Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Mon, 6 Aug 2018 15:14:28 +0630 Subject: [PATCH] Edit Report --- .../reports/card_sale_tran/index.html.erb | 37 +++++++++++++------ .../reports/card_sale_tran/index.xls.erb | 36 ++++++++++++------ .../card_sale_trans/index.html.erb | 27 ++++++++++---- 3 files changed, 69 insertions(+), 31 deletions(-) diff --git a/app/views/reports/card_sale_tran/index.html.erb b/app/views/reports/card_sale_tran/index.html.erb index 673da3ae..9ac8550e 100644 --- a/app/views/reports/card_sale_tran/index.html.erb +++ b/app/views/reports/card_sale_tran/index.html.erb @@ -19,7 +19,7 @@
-
+
@@ -46,7 +46,6 @@ - @@ -59,18 +58,32 @@ - + - - + <% end %> <% else %> diff --git a/app/views/reports/card_sale_tran/index.xls.erb b/app/views/reports/card_sale_tran/index.xls.erb index 145dce33..decc2c43 100644 --- a/app/views/reports/card_sale_tran/index.xls.erb +++ b/app/views/reports/card_sale_tran/index.xls.erb @@ -47,25 +47,39 @@ - + - - + <% end %> <% else %> <% end %> -
<%= t("views.right_panel.detail.Customer_name") %> <%= t("views.right_panel.detail.Cashier_name") %> <%= t("views.right_panel.detail.detail") %><%= t("views.right_panel.detail.status") %>
<%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %> <%= cardSale.ref_no %> <%= cardSale.res_amt %><%= cardSale.app %> + <% if cardSale.app == 'cup' %> + UNION + <% else %> + <%= cardSale.app %> + <% end %> + <%= cardSale.sale.customer.name rescue '-' %> <%= cardSale.sale.cashier_name rescue '-' %>TID : <%= cardSale.terminal_id %> -
- MID : <%= cardSale.trace %> -
- Batch : <%= cardSale.batch_no %> -
- Trace : <%= cardSale.merchant_id %> - 		<%= cardSale.status %> + <% if cardSale.terminal_id != '' %> + TID : <%= cardSale.terminal_id %> +
+ <% end %> + <% if cardSale.merchant_id != '' %> + MID : <%= cardSale.merchant_id %> +
+ <% end %> + <% if cardSale.batch_no != '' %> + Batch : <%= cardSale.batch_no %> +
+ <% end %> + <% if cardSale.trace != '' %> + Trace : <%= cardSale.trace %> + <% end %> +
<%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %> <%= cardSale.ref_no %> <%= cardSale.res_amt %><%= cardSale.app %> + <% if cardSale.app == 'cup' %> + UNION + <% else %> + <%= cardSale.app %> + <% end %> + <%= cardSale.sale.customer.name rescue '-' %> <%= cardSale.sale.cashier_name rescue '-' %>TID : <%= cardSale.terminal_id %> -
- MID : <%= cardSale.trace %> -
- Batch : <%= cardSale.batch_no %> -
- Trace : <%= cardSale.merchant_id %> - 		<%= cardSale.status %> + <% if cardSale.terminal_id != '' %> + TID : <%= cardSale.terminal_id %> +
+ <% end %> + <% if cardSale.merchant_id != '' %> + MID : <%= cardSale.merchant_id %> +
+ <% end %> + <% if cardSale.batch_no != '' %> + Batch : <%= cardSale.batch_no %> +
+ <% end %> + <% if cardSale.trace != '' %> + Trace : <%= cardSale.trace %> + <% end %> +

There is no data for search....

+
diff --git a/app/views/transactions/card_sale_trans/index.html.erb b/app/views/transactions/card_sale_trans/index.html.erb index ce72f578..d7b24af5 100644 --- a/app/views/transactions/card_sale_trans/index.html.erb +++ b/app/views/transactions/card_sale_trans/index.html.erb @@ -89,6 +89,8 @@ <% if @cardSales != 0 %> <% @cardSales.each do |cardSale| %> + + <%= link_to cardSale.sale_id, transactions_sale_path(cardSale.sale_id) rescue '-' %> <%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %> <%= cardSale.req_inv_no %> <%= cardSale.req_amt %> @@ -98,14 +100,23 @@ <%= cardSale.app %> <%= cardSale.sale.customer.name rescue '-' %> <%= cardSale.sale.cashier_name rescue '-' %> - TID : <%= cardSale.terminal_id %> -
- MID : <%= cardSale.trace %> -
- Batch : <%= cardSale.batch_no %> -
- Trace : <%= cardSale.merchant_id %> - + + <% if cardSale.terminal_id != '' %> + TID : <%= cardSale.terminal_id %> +
+ <% end %> + <% if cardSale.merchant_id != '' %> + MID : <%= cardSale.merchant_id %> +
+ <% end %> + <% if cardSale.batch_no != '' %> + Batch : <%= cardSale.batch_no %> +
+ <% end %> + <% if cardSale.trace != '' %> + Trace : <%= cardSale.trace %> + <% end %> + <%= cardSale.status %> <% end %>