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

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

@@ -113,6 +113,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             url: '/payment',
             templateUrl: '/static/payment/partner/templates/partner_payment_info.html',
             controller: 'partnerPaymentInfoCtrl'
+        }).state('partners.detail.payment_info_invalid', {
+            url: '/payment_invalid',
+            templateUrl: '/static/payment/partner/templates/partner_payment_info_invalid.html',
+            controller: 'partnerPaymentInfoCtrl'
         }).state('partners.detail.subpartners', {
             url: '/sub_partners',
             templateUrl: '/static/payment/partner/templates/sub_partners.html',

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

@@ -224,6 +224,9 @@
                     <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
                         <a ui-sref=".payment_info">Payment Config</a>
                     </li>
+                    <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==0">
+                        <a ui-sref=".payment_info_invalid">Payment Config</a>
+                    </li>
                     <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
                         <a ui-sref=".accounts">Partner Accounts</a>
                     </li>

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

@@ -0,0 +1,48 @@
+<!--<div class="panel panel-default" ng-if="!partner.parent_client_id || ('00010'|withRole)">-->
+<div class="panel panel-default">
+    <div class="panel-body">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-horizontal" ng-form="configForm">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">WeChat Sub Merchant Id</label>
+                        <div class="col-sm-9">
+                            <p ng-if="!ctrl.editSubMerchant" class="form-control-static">
+                                {{paymentInfo.sub_merchant_id||'Not Configure'}}
+                                <a role="button" ng-click="ctrl.editSubMerchant=true" ng-if="'011'|withRole"><i class="fa fa-edit"></i></a>
+                                <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="paymentInfo.temp_sub_merchant"></i>
+                                &nbsp;&nbsp;<span class="small" ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.merchant_id"><b>Merchant ID</b>:{{paymentInfo.merchant_id | choose_merchant_id}}</span>
+                                &nbsp;&nbsp;
+                                <span class="small"
+                                      ng-if="('10'|withRole) &&paymentInfo.sub_merchant_id&&paymentInfo.sub_merchant_id_log">
+                                    <a class="text-primary" role="button" title="modify logs"
+                                       ng-click="showSubMerchantLogs(sub_merchant_id_logs)">
+                                           <span class="pull-right-container">
+                                               <span class="label label-primary">history</span>
+                                           </span>
+                                   </a>
+                                 </span>
+                            </p>
+                            <div class="input-group" ng-if="ctrl.editSubMerchant">
+                                <input type="text" class="form-control" ng-model="paymentInfo.sub_merchant_id"
+                                       title="WeChat Sub Merchant Id">
+                                <div class="input-group-btn">
+                                    <button class="btn btn-success" ng-click="saveSubMerchantId()">
+                                        <i class="fa fa-check"></i>
+                                    </button>
+                                </div>
+                                <div class="input-group-btn">
+                                    <button class="btn btn-danger" ng-click="ctrl.editSubMerchant=false">
+                                        <i class="fa fa-remove"></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+