Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -344,8 +344,10 @@
                     oo.channel = #{chan}
                 </foreach>
             </if>
+            <if test="source != 'ALL'">
                 AND
-                oo.source != 'system'
+                oo.source = #{source}
+            </if>
         </where>
         ) o
         INNER JOIN sys_clients p

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');