git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit in report

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-06 14:44:26 +06:30
parent 10d93a658c
commit 7b74de9b3a
12 changed files with 66 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/reports/card_sale_tran_controller.rb
View File

@@ -5,7 +5,7 @@ class Reports::CardSaleTranController < BaseReportController
# GET /transactions/sales.json # GET /transactions/sales.json
def index def index
@payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"],
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","cup"],
["Alipay Payment","alipay"]] ["Alipay Payment","alipay"]]
@sales = Sale.all @sales = Sale.all

4
app/controllers/reports/card_settle_tran_controller.rb
View File

@@ -4,8 +4,8 @@ class Reports::CardSettleTranController < BaseReportController
# GET /transactions/sales # GET /transactions/sales
# GET /transactions/sales.json # GET /transactions/sales.json
def index def index
@payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa & Master Payment","vmj"],
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], ["JCB Payment","jcb"],["UnionPay Payment","cup"],
["Alipay Payment","alipay"]] ["Alipay Payment","alipay"]]
@sales = Sale.all @sales = Sale.all
payment_type = params[:payment_type] payment_type = params[:payment_type]

2
app/controllers/transactions/card_sale_trans_controller.rb
View File

@@ -6,7 +6,7 @@ class Transactions::CardSaleTransController < ApplicationController
def index def index
@status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]] @status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]]
@payment_method =[["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], @payment_method =[["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"],
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","cup"],
["Alipay Payment","alipay"]] ["Alipay Payment","alipay"]]
@sales = Sale.all @sales = Sale.all

4
app/controllers/transactions/card_settle_trans_controller.rb
View File

@@ -5,8 +5,8 @@ class Transactions::CardSettleTransController < ApplicationController
# GET /transactions/sales.json # GET /transactions/sales.json
def index def index
@status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]] @status = [["All Status",''], ["Approved","Approved"], ["Declined","Declined"]]
@payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa Payment","visa"], @payment_method = [["All Payments",''],["MPU Payment","mpu"], ["Visa & Master Payment","vmj"],
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], ["JCB Payment","jcb"],["UnionPay Payment","cup"],
["Alipay Payment","alipay"]] ["Alipay Payment","alipay"]]
@sales = Sale.all @sales = Sale.all

8
app/models/card_sale_tran.rb
View File

@@ -11,13 +11,9 @@ class CardSaleTran < ApplicationRecord
if payment_type.blank? if payment_type.blank?
payment = '' payment = ''
else
if payment_type == 'unionpay'
payment = " app LIKE 'cup'"
else else
payment = " app LIKE '#{payment_type}'" payment = " app LIKE '#{payment_type}'"
end end
end
if status_type.blank? if status_type.blank?
status = '' status = ''
@@ -44,13 +40,9 @@ class CardSaleTran < ApplicationRecord
if payment_type.blank? if payment_type.blank?
payment = '' payment = ''
else
if payment_type == 'unionpay'
payment = " app LIKE 'cup'"
else else
payment = " app LIKE '#{payment_type}'" payment = " app LIKE '#{payment_type}'"
end end
end
if from.present? && to.present? if from.present? && to.present?

8
app/models/card_settle_tran.rb
View File

@@ -11,13 +11,9 @@ class CardSettleTran < ApplicationRecord
if payment_type.blank? if payment_type.blank?
payment = '' payment = ''
else
if payment_type == 'unionpay'
payment = " req_type LIKE 'cup'"
else else
payment = " req_type LIKE '#{payment_type}'" payment = " req_type LIKE '#{payment_type}'"
end end
end
if status_type.blank? if status_type.blank?
status = '' status = ''
@@ -43,13 +39,9 @@ class CardSettleTran < ApplicationRecord
if payment_type.blank? if payment_type.blank?
payment = '' payment = ''
else
if payment_type == 'unionpay'
payment = " req_type LIKE 'cup'"
else else
payment = " req_type LIKE '#{payment_type}'" payment = " req_type LIKE '#{payment_type}'"
end end
end
if from.present? && to.present? if from.present? && to.present?

8
app/views/reports/card_sale_tran/index.html.erb
View File

@@ -59,13 +59,7 @@
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td> <td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td><%= cardSale.app %></td>
<% if cardSale.app == 'cup' %>
UNION
<% else %>
<%= cardSale.app %>
<% end %>
</td>
<td><%= cardSale.sale.customer.name rescue '-' %></td> <td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>TID : <%= cardSale.terminal_id %>

8
app/views/reports/card_sale_tran/index.xls.erb
View File

@@ -47,13 +47,7 @@
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td> <td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td><%= cardSale.app %></td>
<% if cardSale.app == 'cup' %>
UNION
<% else %>
<%= cardSale.app %>
<% end %>
</td>
<td><%= cardSale.sale.customer.name rescue '-' %></td> <td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>TID : <%= cardSale.terminal_id %>

19
app/views/reports/card_settle_tran/index.html.erb
View File

@@ -19,7 +19,7 @@
</div> </div>
<div class="margin-top-20"> <div class="margin-top-20">
<div class="card" style="width:115%;"> <div class="card">
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">
<thead> <thead>
@@ -46,7 +46,6 @@
<th><%= t("views.right_panel.detail.sale_amount") %></th> <th><%= t("views.right_panel.detail.sale_amount") %></th>
<th><%= t("views.right_panel.detail.void_cnt") %></th> <th><%= t("views.right_panel.detail.void_cnt") %></th>
<th><%= t("views.right_panel.detail.void_amount") %></th> <th><%= t("views.right_panel.detail.void_amount") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -55,27 +54,15 @@
<tr> <tr>
<td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td> <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td>
<td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.req_type %>
<% if cardSettle.req_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.req_type %>
<% end %>
</td> </td>
<td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.res_type %></td>
<% if cardSettle.res_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.res_type %>
<% end %>
</td>
<td><%= cardSettle.shift_sale.employee.name %></td> <td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td> <td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td> <td><%= cardSettle.sale_amt %></td>
<td><%= cardSettle.void_cnt %></td> <td><%= cardSettle.void_cnt %></td>
<td><%= cardSettle.void_amt %></td> <td><%= cardSettle.void_amt %></td>
<td><%= cardSettle.status %></td>
</tr> </tr>
<% end %> <% end %>
<% else %> <% else %>

16
app/views/reports/card_settle_tran/index.xls.erb
View File

@@ -43,21 +43,9 @@
<tr> <tr>
<td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td> <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td>
<td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.req_type %></td>
<% if cardSettle.req_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.req_type %>
<% end %>
</td>
<td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.res_type %></td>
<% if cardSettle.res_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.res_type %>
<% end %>
</td>
<td><%= cardSettle.shift_sale.employee.name %></td> <td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td> <td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td> <td><%= cardSettle.sale_amt %></td>

10
app/views/transactions/card_sale_trans/index.html.erb
View File

@@ -89,23 +89,15 @@
<% if @cardSales != 0 %> <% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %> <% @cardSales.each do |cardSale| %>
<tr> <tr>
<td><%= link_to cardSale.sale_id, transactions_sale_path(cardSale.sale_id) rescue '-' %></td>
<td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td> <td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td> <td><%= cardSale.req_amt %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td> <td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td><%= cardSale.app %></td>
<% if cardSale.app == 'cup' %>
UNION
<% else %>
<%= cardSale.app %>
<% end %>
</td>
<td><%= cardSale.sale.customer.name rescue '-' %></td> <td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>TID : <%= cardSale.terminal_id %>
<br> <br>
MID : <%= cardSale.trace %> MID : <%= cardSale.trace %>

16
app/views/transactions/card_settle_trans/index.html.erb
View File

@@ -90,21 +90,9 @@
<tr> <tr>
<td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td> <td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td>
<td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.req_type %></td>
<% if cardSettle.req_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.req_type %>
<% end %>
</td>
<td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td> <td><%= cardSettle.res_type %></td>
<% if cardSettle.res_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.res_type %>
<% end %>
</td>
<td><%= cardSettle.shift_sale.employee.name %></td> <td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td> <td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td> <td><%= cardSettle.sale_amt %></td>