From 7ac83ccf01d48216347d2695b299d2407d005823 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 13:18:15 +0800
Subject: [PATCH] rpay

---
 .../ui/static/analysis/templates/customer_analysis.html     | 2 +-
 .../static/analysis/templates/manage_customers_orders.html  | 4 +++-
 src/main/ui/static/analysis/templates/trans_analysis.html   | 4 +++-
 .../static/analysis/templates/trans_analysis_monthly.html   | 4 +++-
 .../analysis/templates/transaction_amount_Analysis.html     | 2 ++
 src/main/ui/static/commons/templates/order_detail.html      | 2 +-
 src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +-
 src/main/ui/static/payment/custom/templates/custom.html     | 2 +-
 src/main/ui/static/payment/invoice/templates/invoice.html   | 2 +-
 .../static/payment/partner/templates/partner_pay_logs.html  | 6 ++++--
 .../static/payment/tradelog/templates/balance_report.html   | 6 +++---
 .../payment/tradelog/templates/partner_trade_logs.html      | 4 +++-
 .../ui/static/payment/tradelog/templates/trade_logs.html    | 4 +++-
 13 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index 1c54efb22..d28281419 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -180,7 +180,7 @@
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                 <img src="/static/images/rpayplus.png"
-                                     uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                     uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index a8531b7d3..735431137 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -90,7 +90,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 57fd8db3f..67db5f858 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -97,7 +97,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index be580aa13..0cae44777 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -67,7 +67,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index b23530dd5..f5fd6e838 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,6 +32,8 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 7b25d1a59..3184f16b2 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -46,7 +46,7 @@
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                             <img src="/static/images/rpayplus.png"
-                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 136a5bdd0..a477b413a 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -207,7 +207,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 0bf23ead3..c4b3299e2 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -102,7 +102,7 @@
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                             <img src="/static/images/rpayplus.png"
-                                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 266e8d661..6a49339c8 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -201,7 +201,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 6bcad5c56..dd8618334 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -85,7 +85,9 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a>
+                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
@@ -185,7 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                        <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 352936b65..2ab2afc98 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -95,9 +95,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a><!--|
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='ZNYOO'}"
-                                                   ng-click="params.channel='ZNYOO';loadTradeLogs(1)">Znyoo</a>-->
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b31e11469..b63e52165 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -96,6 +96,8 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
@@ -322,7 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                     <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 6b33eb04a..4a1d0ab54 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -133,7 +133,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>