Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java

@@ -32,6 +32,9 @@ public interface ClientMapper {
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     JSONObject findClientByMoniker(@Param("client_moniker") String clientMoniker);
 
+    @AutoSql(type = SqlType.SELECT)
+    JSONObject findClientByMonikerAll(@Param("client_moniker") String clientMoniker);
+
     PageList<JSONObject> listPartners(JSONObject params, PageBounds pagination);
 
     List<JSONObject> listClientsIdAndMoniker();

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

@@ -341,7 +341,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     @Cacheable(value = ":app_client_info_moniker:", key = "#clientMoniker")
     public JSONObject getClientInfoByMoniker(String clientMoniker) {
-        return clientMapper.findClientByMoniker(clientMoniker);
+        return clientMapper.findClientByMonikerAll(clientMoniker);
     }
 
     @Override

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

@@ -141,7 +141,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
             client.putAll(clientConfigService.find(client_id));
             client = clientInfoWithNoSecretInfo(client);
             if (client.getInteger("parent_client_id") != null) {
-                JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id"));
+                JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id"));
                 rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id")));
                 rootPartner = clientInfoWithNoSecretInfo(rootPartner);
                 account.put("parent_client", rootPartner);
@@ -253,7 +253,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         client.putAll(clientConfigService.find(client.getIntValue("client_id")));
         client = clientInfoWithNoSecretInfo(client);
         if (client.getInteger("parent_client_id") != null) {
-            JSONObject rootPartner = clientManager.getClientInfo(client.getIntValue("parent_client_id"));
+            JSONObject rootPartner = clientManager.getClientInfoIgnoreInvalid(client.getIntValue("parent_client_id"));
             rootPartner.putAll(clientConfigService.find(client.getIntValue("parent_client_id")));
             rootPartner = clientInfoWithNoSecretInfo(rootPartner);
             account.put("parent_client", rootPartner);

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

@@ -39,7 +39,7 @@
         <i ng-if="partner.parent_client_id" class="fa fa-sitemap" title="Sub Partner"></i>
         <a class="text-primary" ng-if="'00001'|withRole" title="Mock Login"
            ng-href="/global/userstatus/current_manager/clients/{{partner.client_moniker}}/auth" target="_blank"><i
-                class="fa fa-share"></i></a>
+                class="fa fa-share"></i></a><span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
     </h1>
     <ol class="breadcrumb">
         <li>
@@ -76,6 +76,7 @@
                 <span ng-if="partner.open_status==0">不通过</span>
                 <span ng-if="partner.open_status==10">绿色通道申请中</span>
                 </b>
+                <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
             </h3>
         </div>
         <div class="box-body">
@@ -284,6 +285,7 @@
                                                 <a ui-sref="partners.detail({clientMoniker:partner.parent_client.client_moniker})"
                                                    ng-bind="partner.parent_client.client_moniker"></a>)
                                             </span>
+                                            <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
                                         </p>
                                     </div>
                                 </div>
@@ -767,4 +769,4 @@
 <!--<span class="sr-only">Requesting...</span>-->
 <!--</div>-->
 <!--</div>-->
-<!--</div>-->
+<!--</div>-->

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

@@ -476,12 +476,12 @@
                                 </thead>
                                 <tbody>
                                 <tr ng-repeat="partner in partners"
-                                    ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole),del_client:partner.is_valid==0}">
+                                    ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}">
                                     <td>
                                         <a class="text-primary" role="button" title="Detail"
                                            ng-click="openClientBoard(partner)"
                                            ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))">
-                                            <span ng-bind="partner.client_moniker"></span></a>
+                                            <span ng-bind="partner.client_moniker"></span><span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span></a>
                                         <span ng-bind="partner.client_moniker" ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span>
 
                                         <i class="fa fa-sitemap" ng-if="partner.parent_client_id"
@@ -554,4 +554,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>