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

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

@@ -147,6 +147,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             controller: 'partnerDeviceCtrl'
         }).state('partners.detail.files', {
             url: '/files',
+            params:{commitType:"cross-border"},
             templateUrl: '/static/payment/partner/templates/partner_auth_files.html',
             controller: 'partnerAuthFileCtrl'
         }).state('partners.detail.files.CP_files', {
@@ -3532,7 +3533,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.listRedpackLogs(1);
     }]);
     app.controller('partnerAuthFileCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', function ($scope, $http, $rootScope, commonDialog, $state) {
-        if ($scope.partner.client_type=='card-payment'){
+        if ($state.params.commitType=='card-payment'){
             $state.go('partners.detail.files.MW_files');
         }else {
             $state.go('partners.detail.files.CP_files');
@@ -4148,7 +4149,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     content: 'Upload Successful',
                     type: 'success'
                 });
-                $state.go('partners.detail.files.MW_files', {reload: true});
+                $state.go('partners.detail.files',{clientMoniker:$scope.partner.client_moniker,
+                    commitType: "card-payment"}, {reload: true});
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             })