Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java

@@ -498,7 +498,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                 "company_phone", "suburb", "postcode", "state", "contact_person", "contact_phone", "contact_email", "short_name", "logo_url", "enable_refund",
                 "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark", "logo_thumbnail", "creator", "create_time", "approver",
                 "approve_result", "approve_time", "open_status", "timezone", "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat",
-                "enable_bestpay", "manual_settle", "skip_clearing", "mail_confirm", "surcharge_mode", "company_photo", "store_photo", "company_website", "contact_job", "sub_manage"};
+                "enable_bestpay", "manual_settle", "skip_clearing", "mail_confirm", "surcharge_mode", "company_photo", "store_photo", "company_website", "contact_job", "sub_manage","enable_rpaypmt_card","enable_rpaypmt_dd"};
         for (String col : columns) {
             simpleClient.put(col, client.get(col));
         }

src/main/ui/static/payment/partner/templates/client_bankaccounts.html

@@ -108,26 +108,38 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='CB_BankPay'}" ng-if="currentUser.client.enable_cb_bankpay">
                 <a role="button" ng-click="bankCtrl.rate_name='CB_BankPay'">CB BankPay</a>
             </li>
+            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_card'}" ng-if="currentUser.client.enable_rpaypmt_card">
+                <a role="button" ng-click="bankCtrl.rate_name='rpaypmt_card'">Card Payment</a>
+            </li>
+            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_dd'}" ng-if="currentUser.client.enable_rpaypmt_dd">
+                <a role="button" ng-click="bankCtrl.rate_name='rpaypmt_dd'">Direct Debit</a>
+            </li>
         </ul>
         <div class="table-responsive">
             <table class="table table-bordered">
                 <thead>
                 <tr>
                     <th>Rate Name</th>
-                    <th>Rate Value</th>
+                    <th ng-if="bankCtrl.rate_name!='rpaypmt_card'">Rate Value</th>
+                    <th ng-if="bankCtrl.rate_name=='rpaypmt_card'">Domestic Rate Value</th>
+                    <th ng-if="bankCtrl.rate_name=='rpaypmt_card'">International Rate Value</th>
+                    <th>Transaction Fee</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
-                    <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>
+                    <th ng-if="bankCtrl.rate_name=='Wechat' || bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd'">Clean Days</th>
                     <th>Remark</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr ng-repeat="rate in rates|filter:{rate_name:bankCtrl.rate_name}:true" ng-class="{'text-bold':rate.current,'success':rate.active}">
                     <td ng-bind="rate.rate_name"></td>
-                    <td ng-bind="rate.rate_value"></td>
+                    <td ng-if="bankCtrl.rate_name!='rpaypmt_card'" ng-bind="rate.rate_value + ' %'"></td>
+                    <td ng-if="bankCtrl.rate_name=='rpaypmt_card'" ng-bind="rate.rate_value + ' %'"></td>
+                    <td ng-if="bankCtrl.rate_name=='rpaypmt_card'" ng-bind="rate.ext_rates.overseas_rate_value + ' %'"></td>
+                    <td ng-bind="'$ '+rate.transaction_fee"></td>
                     <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                     <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
-                    <td ng-if="bankCtrl.rate_name=='Wechat'">T+{{rate.clean_days}}</td>
+                    <td ng-if="bankCtrl.rate_name=='Wechat' || bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd'">T+{{rate.clean_days}}</td>
                     <td ng-bind="rate.remark|limitTo:20" title="{{rate.remark}}"></td>
                 </tr>
                 </tbody>

src/main/ui/static/payment/partner/templates/partner_payment_info.html

@@ -242,6 +242,19 @@
                 </div>
             </div>
 
+            <div class="form-group col-sm-4">
+                <label class="col-xs-6 control-label">Card Payment|银行卡支付</label>
+                <div class="col-xs-6">
+                    <input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_card" bs-switch switch-change="toggleChannel('rpaypmt_card')">
+                </div>
+            </div>
+            <div class="form-group col-sm-4">
+                <label class="col-xs-6 control-label">Direct Debit|银行账户支付</label>
+                <div class="col-xs-6">
+                    <input type="checkbox" ng-model="paymentInfo.enable_rpaypmt_dd" bs-switch switch-change="toggleChannel('rpaypmt_dd')">
+                </div>
+            </div>
+
         </div>
     </div>
 </div>