From 67a6e7cb1681348f8347098ca0449870c3802aca Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 18 Dec 2018 22:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8Ahf=E3=80=81yeepay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchants/core/impls/ClientManagerImpl.java      |  8 ++++----
 .../partner/templates/partner_bankaccounts.html      |  4 ++--
 .../payment/partner/templates/partner_new_rate.html  | 12 ++++++------
 .../partner/templates/partner_payment_info.html      |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 393c7587e..4f2179824 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1613,9 +1613,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         checkAddRate(config, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate");
         checkAddRate(config, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate");
         checkAddRate(config, "jd", "jd_rate_value", org, "min_jd_rate");
-        checkAddRate(config, "hf", "hf_rate_value", org, "min_hf_rate");
+//        checkAddRate(config, "hf", "hf_rate_value", org, "min_hf_rate");
         checkAddRate(config, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-        checkAddRate(config, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
+//        checkAddRate(config, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
         checkAddRate(config, "CB_BankPay", "min_cb_bankpay_value", org, "min_cb_bankpay_rate");
 
         configNewClientRate(config, clientId, "Wechat", "wechat_rate_value", org, "min_wechat_rate");
@@ -1623,9 +1623,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate");
         configNewClientRate(config, clientId, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate");
         configNewClientRate(config, clientId, "jd", "jd_rate_value", org, "min_jd_rate");
-        configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
+//        configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-        configNewClientRate(config, clientId, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
+//        configNewClientRate(config, clientId, "Yeepay", "yeepay_rate_value", org, "min_yeepay_rate");
         configNewClientRate(config, clientId, "CB_BankPay", "cb_bankpay_rate_value", org, "min_cb_bankpay_rate");
         //todo 暂不更新Rpay+ 费率信息
         //rpayApi.modifySurchargeConfig(client);
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 7ebdd521d..2f51eed68 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -170,9 +170,9 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='AlipayOnline'}"><a role="button" ng-click="bankCtrl.rate_name='AlipayOnline'">Alipay(Online)</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Bestpay'}"><a role="button" ng-click="bankCtrl.rate_name='Bestpay'">Bestpay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='jd'}"><a role="button" ng-click="bankCtrl.rate_name='jd'">JDpay</a></li>
-            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>
+            <!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>-->
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Rpay'}"><a role="button" ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a></li>
-            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Yeepay'}"><a role="button" ng-click="bankCtrl.rate_name='Yeepay'">Yeepay</a></li>
+            <!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='Yeepay'}"><a role="button" ng-click="bankCtrl.rate_name='Yeepay'">Yeepay</a></li>-->
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='CB_BankPay'}"><a role="button" ng-click="bankCtrl.rate_name='CB_BankPay'" ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a></li>
         </ul>
         <div class="table-responsive">
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 3402bd481..0fbebc5f0 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -112,7 +112,7 @@
                     </div>
                 </div>
 
-                <div class="form-group"
+                <!--<div class="form-group"
                      ng-class="{'has-error':rate_form.hf_rate_value.$invalid && rate_form.hf_rate_value.$dirty}">
                     <label class="control-label col-sm-4" for="hf_rate_value_input">HF Rate Value</label>
                     <div class="col-sm-6">
@@ -134,7 +134,7 @@
                         </div>
 
                     </div>
-                </div>
+                </div>-->
 
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.Rpay_rate_value.$invalid && rate_form.Rpay_rate_value.$dirty}">
@@ -160,7 +160,7 @@
                     </div>
                 </div>
 
-                <div class="form-group"
+                <!--<div class="form-group"
                      ng-class="{'has-error':rate_form.yeepay_rate_value.$invalid && rate_form.yeepay_rate_value.$dirty}">
                     <label class="control-label col-sm-4" for="yeepay_rate_value_input">Yeepay Rate Value</label>
                     <div class="col-sm-6">
@@ -182,18 +182,18 @@
                         </div>
 
                     </div>
-                </div>
+                </div>-->
                 <!--快捷支付费率-->
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.cb_bankpay_rate_value.$invalid && rate_form.cb_bankpay_rate_value.$dirty}">
-                    <label class="control-label col-sm-4" for="yeepay_rate_value_input">CB BankPay Rate Value</label>
+                    <label class="control-label col-sm-4" for="cb_bankpay_rate_value_input">CB BankPay Rate Value</label>
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="cb_bankpay_rate_value" stringToNumber2 class="form-control" ng-model="rate.cb_bankpay_rate_value"
                                    min="0.6" max="5.0" step="0.1" id="cb_bankpay_rate_value_input" required>
                             <div class="input-group-addon">%</div>
                         </div>
-                        <div ng-messages="rate_form.yeepay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty">
+                        <div ng-messages="rate_form.cb_bankpay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty">
                             <div class="small text-danger" ng-message="max">
                                 <i class="glyphicon glyphicon-alert"></i> No more than 5.0%
                             </div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index d4a73fa01..164a898f3 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -211,7 +211,7 @@
                     <input type="checkbox" ng-model="paymentInfo.enable_jd" bs-switch switch-change="toggleChannel('jd')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
+            <!--<div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">HF|汇付</label>
                 <div class="col-xs-6">
                     <input type="checkbox" ng-model="paymentInfo.enable_hf" bs-switch switch-change="toggleChannel('hf')">
@@ -222,7 +222,7 @@
                 <div class="col-xs-6">
                     <input type="checkbox" ng-model="paymentInfo.enable_yeepay" bs-switch switch-change="toggleChannel('yeepay')">
                 </div>
-            </div>
+            </div>-->
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">CB BankPay|快捷支付</label>
                 <div class="col-xs-6">
@@ -351,7 +351,7 @@
                     </p>
                 </div>
             </div>
-            <hr>
+            <!--<hr>
             <div class="form-group">
                 <label class="col-sm-2 control-label">HF Pay Link</label>
                 <div class="col-sm-10">
@@ -396,7 +396,7 @@
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_yeepay_email_notice" bs-switch switch-change="toggleGatewayEmailNotice('yeepay')">
                 </div>
-            </div>
+            </div>-->
         </div>
     </div>
 </div>