diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml index 5d053be8f..624cd0323 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.xml @@ -2,10 +2,12 @@ \ No newline at end of file diff --git a/src/main/ui/static/payment/merchantid/merchant_id_manager.js b/src/main/ui/static/payment/merchantid/merchant_id_manager.js index a882aa33e..e8605865b 100644 --- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js +++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js @@ -195,7 +195,16 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS },function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }); - } + }; + $scope.showClient = function (sub_merchant_id) { + if($scope.sub_merchant_id == sub_merchant_id){ + return; + } + $http.get('/sys/merchant_id/'+sub_merchant_id).then(function (resp) { + $scope.client_monikers= resp.data; + $scope.sub_merchant_id = sub_merchant_id; + }); + }; }]); app.controller('newCommonSubMerchantIdCtrl', ['$scope', '$http','commonDialog', function ($scope, $http,commonDialog) { $scope.params = {}; diff --git a/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html index da6a4bbb7..b21a2ef28 100644 --- a/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html +++ b/src/main/ui/static/payment/merchantid/templates/temp_sub_merchant_id.html @@ -33,9 +33,34 @@ - {{client.sub_merchant_id}} - + + {{client.sub_merchant_id}} + + + {{client.client_count}} + + +