Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerCardDashboardController.java

@@ -74,8 +74,8 @@ public class PartnerCardDashboardController {
     }
 
     @RequestMapping("/{client_id}/settlement_logs/{detailId}")
-    public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable String detailId) {
-        return cleanService.getCleanLogTransactions(client_id, detailId);
+    public JSONObject listClearingTransactions(@PathVariable int client_id, @PathVariable int detailId,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        return cleanService.getCleanLogTransactions(detailId, manager);
     }
 
 

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -257,6 +257,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             channelsObj.put(channel.getString("channel"), channel);
         }
         cleanLog.put("channels", channelsObj);
+        cleanLog.put("client_moniker", client.getString("client_moniker"));
         return cleanLog;
     }
 

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

@@ -784,6 +784,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.partner) {
                 return;
             }
+            if(!$state.is('partners.detail')){
+                $scope.init.wechat_compliance = false;
+                return;
+            }
             if (!$scope.init.wechat_compliance) {
                 $scope.init.wechat_compliance = true;
                 return;
@@ -802,6 +806,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.partner) {
                 return;
             }
+            if(!$state.is('partners.detail')){
+                $scope.init.local_merchant = false;
+                return;
+            }
             if (!$scope.init.local_merchant) {
                 $scope.init.local_merchant = true;
                 return;