add 增加卡支付报备信息展示

src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java

@@ -571,4 +571,6 @@ public interface ClientManager {
     RPayMerchantEntity applyMWMerchantId(String clientMoniker, JSONObject manager);
 
     RPayMerchantEntity queryMWMerchantIdStatus(String clientMoniker, JSONObject manager);
+
+    RPayMerchantEntity queryMWMerchantInfo(String clientMoniker, JSONObject manager);
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2063,7 +2063,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             if (StringUtils.equalsIgnoreCase("rpaypmt_card", config.getString("type"))) {
                 JSONObject extRateParams = new JSONObject(){{
                     put("domestic_rate_value", config.getBigDecimal("rate_value"));
-                    put("overseas_rate_value", config.getBigDecimal("international_rate_value"));
+                    put("overseas_rate_value", config.getJSONObject("ext_rates").getBigDecimal("international_rate_value"));
                 }};
                 newConfig.put("ext_rates", extRateParams.toJSONString());
             }
@@ -6862,6 +6862,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return rPayPaymentCardSvcApi.findMerchant(client);
     }
 
+    @Override
+    public RPayMerchantEntity queryMWMerchantInfo(String clientMoniker, JSONObject manager) {
+        JSONObject client = getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        JSONObject bankAccount = getBankAccountByClientId(client.getIntValue("client_id"));
+        return (new RPayMerchantEntity()).applyClientInfo(client).applyBankAccount(bankAccount);
+    }
+
     private boolean isAddCardPaymentRate(JSONObject config, int clientId) {
         if (!StringUtils.equalsIgnoreCase("rpaypmt_card", config.getString("type"))
                 && !StringUtils.equalsIgnoreCase("rpaypmt_dd", config.getString("type"))) {

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -898,4 +898,9 @@ public class PartnerManageController {
                                                       @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager){
         return clientManager.queryMWMerchantIdStatus(clientMoniker,manager);
     }
+
+    @ManagerMapping(value = "/{clientMoniker}/query/mw_info", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
+    public RPayMerchantEntity queryMWMerchantInfo(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        return clientManager.queryMWMerchantInfo(clientMoniker, manager);
+    }
 }

src/main/ui/static/commons/templates/order_detail.html

@@ -175,9 +175,9 @@
                         <p class="form-control-static" ng-bind="order.order_detail"></p>
                     </div>
                 </div>
-                <div class="form-group" ng-if="order.channel=='rpaypmt_card' || order.channel=='rpaypmt_dd'">
+                <div class="form-group" ng-if="order.channel=='rpaypmt_card' || order.channel=='rpaypmt_dd'" style="margin: 15px 6%;border: 1px dashed gray;">
-                    <div style="text-align: center;">
+                    <div style="text-align: center;cursor: pointer;color: grey" ng-click="hidePayerCardInfo()">
-                        <p ng-click="hidePayerCardInfo()"><label class="control-label" style="cursor: pointer;padding-right: 0;color: gray;">—————————— Payer Card Information ——————————</label></p>
+                        <p><label class="control-label" style="cursor: pointer">Payer Card Information</label></p>
                     </div>
                     <div ng-if="showPayerCardInfo">
                         <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Bank:   </label> {{order.card_bank}}</p>

src/main/ui/static/dashboard/templates/partner_dashboard.html

@@ -361,7 +361,7 @@
                     </span>
                     <div ng-if="showUnSettleDetail">
                         <span class="counter text-white" style="font-size: 1px">
-                         System : {{transcommon.sys_not_settled|currency:'AUD '}}
+                         Cross-border Payment : {{transcommon.sys_not_settled|currency:'AUD '}}
                     </span>
                         <span class="counter text-white" style="font-size: 1px">
                          Card Payment : {{transcommon.rpaypmt_card_not_settled|currency:'AUD '}}

src/main/ui/static/payment/partner/partner-manage.js

@@ -4964,9 +4964,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         };
         $scope.applyMWSubMerchantId = function () {
-            commonDialog.confirm({
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/query/mw_info').then(function (resp) {
+                commonDialog.confirm({
                 title: 'Apply Merchant Warrior Sub Merchant Id',
-                contentHtml: $sce.trustAsHtml('Are you sure to apply merchant Warrior sub merchant id for <span style="color: red">[' + $scope.partner.company_name + ']</span>?')
+                contentHtml: $sce.trustAsHtml('Are you sure to apply merchant Warrior sub merchant id for <span style="color: red">[' + $scope.partner.company_name + ']</span>?'),
+                json: resp.data
             }).then(function () {
                 $http.put('/sys/partners/' + $scope.partner.client_moniker + '/applyMWMerchantId').then(function (res) {
                     commonDialog.alert({
@@ -4979,6 +4981,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
                 })
             })
+            });
         };
         $scope.applyRpaySubMerchantId = function () {
             $uibModal.open({

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

@@ -48,7 +48,7 @@
                     <label class="control-label col-sm-4" for="international_rate_value_input">International Rate Value</label>
                     <div class="col-sm-6">
                         <div class="input-group">
-                            <input type="number" name="international_rate_value" stringToNumber2 class="form-control" ng-model="rate.ext_rates.overseas_rate_value"
+                            <input type="number" name="international_rate_value" stringToNumber2 class="form-control" ng-model="rate.ext_rates.international_rate_value"
                                    min="0" max="5" step="0.1" id="international_rate_value_input" required>
                             <div class="input-group-addon">%</div>
                         </div>
@@ -91,13 +91,13 @@
                 </div>
 
                 <!-- 新增transaction_fee -->
-                <div class="form-group" ng-if="cardRateConfig.type=='rpaypmt_card'"
+                <div class="form-group"
                      ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">
                     <label class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
-                                   min="0" step="0.1" max="1" id="transaction_fee_input" required>
+                                   min="0" step="0.1" id="transaction_fee_input" required>
                             <div class="input-group-addon">$</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">

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

@@ -183,7 +183,7 @@
                                 </li>
                                 <li class="list-group-item list-group-item-success" ng-if="showMoreMerchantInfo">
                                     Category
-                                    <span style="float: right" ng-bind="partner.cardInfo.category"></span>
+                                    <span style="float: right" ng-bind="partner.cardInfo.category|partner_royalpay_industry"></span>
                                 </li>
                                 <li class="list-group-item list-group-item-success" style="text-align: center" ng-if="showMoreMerchantInfo" ng-click="hideMerchantInfo()">
                                     <span> Hide.....</span>

src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html

@@ -148,9 +148,9 @@
                             </div>
                         </div>
                     </div>
-                    <div class="form-group" ng-if="order.channel=='rpaypmt_card' || order.channel=='rpaypmt_dd'">
+                    <div class="form-group" ng-if="order.channel=='rpaypmt_card' || order.channel=='rpaypmt_dd'" style="margin: 15px 6%;border: 1px dashed gray;">
-                        <div style="text-align: center;">
+                        <div style="text-align: center;cursor: pointer;color: grey" ng-click="hidePayerCardInfo()">
-                            <p ng-click="hidePayerCardInfo()"><label class="control-label" style="cursor: pointer;padding-right: 0;color: gray;">—————————— Payer Card Information ——————————</label></p>
+                            <p><label class="control-label" style="cursor: pointer">Payer Card Information</label></p>
                         </div>
                         <div ng-if="showPayerCardInfo">
                             <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Bank:   </label> {{order.card_bank}}</p>