diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 200d5999a..a3d0af434 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -344,8 +344,10 @@ oo.channel = #{chan} + AND - oo.source != 'system' + oo.source = #{source} + ) o INNER JOIN sys_clients p diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js index 5780cdb59..ca95a3e3e 100644 --- a/src/main/ui/static/incrementalService/partner-incremental-service.js +++ b/src/main/ui/static/incrementalService/partner-incremental-service.js @@ -54,7 +54,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { }) } $scope.initDate(); - $scope.params = {source: $scope.serviceInfo.channel,status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; + $scope.params = {source: $stateParams.channel,status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; $scope.pagination = {}; $scope.today = new Date(); $scope.isAll = true; @@ -100,7 +100,6 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.loadTradeLogs(1); }; $scope.loadTradeLogs = function (page) { - $scope.params.source = $scope.serviceInfo.channel; var params = angular.copy($scope.params); if (params.datefrom) { params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd');