diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 120dc8340..08e66c96c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -387,7 +387,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("contact_email", "******"); } } else { - client.put("rate_editable", ManagerRole.ADMIN.hasRole(role) || ManagerRole.OPERATOR.hasRole(role)); + client.put("rate_editable",ManagerRole.OPERATOR.hasRole(role)); } } List children = clientMapper.listChildClients(client.getIntValue("client_id")); diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 3078d41ac..957904ca6 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -274,178 +274,6 @@ margin-bottom: 10%;"/> diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html index 6ef6c9323..b635ded1f 100644 --- a/src/main/ui/managev2.html +++ b/src/main/ui/managev2.html @@ -283,11 +283,11 @@ margin-bottom: 10%;"/> ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"> - + + - @@ -295,8 +295,13 @@ margin-bottom: 10%;"/> ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"> - + + + + + +

diff --git a/src/main/ui/static/config/logview/templates/root.html b/src/main/ui/static/config/logview/templates/root.html index de841b8e5..de620c483 100644 --- a/src/main/ui/static/config/logview/templates/root.html +++ b/src/main/ui/static/config/logview/templates/root.html @@ -23,10 +23,10 @@ WeChat Messages - - - Config Operation - + + + + diff --git a/src/main/ui/static/config/organizations/templates/orgs.html b/src/main/ui/static/config/organizations/templates/orgs.html index 02662ec4e..9bf9d5a08 100644 --- a/src/main/ui/static/config/organizations/templates/orgs.html +++ b/src/main/ui/static/config/organizations/templates/orgs.html @@ -114,7 +114,7 @@
- Add Organization
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html index 274afa648..057ac1568 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html @@ -59,7 +59,7 @@ Developer - + Risk Manager diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html index 8b0598370..3e998489a 100644 --- a/src/main/ui/static/menu/templates/home.html +++ b/src/main/ui/static/menu/templates/home.html @@ -78,7 +78,7 @@ -
+
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 39d334eba..326518c69 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -29,7 +29,7 @@
--> -
+
-
+
@@ -88,7 +88,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
-
+
@@ -129,7 +129,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
@@ -180,7 +180,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
@@ -200,7 +200,7 @@
-
+
@@ -210,7 +210,7 @@
-
+
@@ -220,7 +220,7 @@
-
+
@@ -373,13 +373,13 @@
- +
- +
@@ -389,7 +389,7 @@
- +
@@ -398,7 +398,7 @@
-
+
@@ -408,7 +408,7 @@
-
+
@@ -418,7 +418,7 @@
-
+
@@ -612,7 +612,7 @@
-
+
@@ -651,7 +651,7 @@
-
+
@@ -681,8 +681,8 @@
-
- +
+
@@ -726,7 +726,7 @@
-
+
@@ -773,7 +773,7 @@
-
+
@@ -803,7 +803,7 @@
-
+
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 922eeafdb..269e64bca 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -352,7 +352,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; }]); - app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) { + app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone','businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { if ($scope.partner_application) { $scope.partner = angular.copy($scope.partner_application); delete $rootScope.partner_application; @@ -362,6 +362,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.company_phone_c = 61; $scope.partner.contact_phone_c = 61; + + $scope.pagination = {}; + $scope.industries = industryMap.configs(); + $scope.states = stateMap.configs(); + $scope.countries = countryMap.configs(); + $scope.sectors = sectorMap.configs(); + $scope.business_structures = businessStructuresMap.configs(); + $scope.clean_days = angular.copy(clean_days_map); + $scope.bd_citys = angular.copy(bd_city_map); + $scope.params = {textType: 'all', org_name: 'ALL'}; + function remove(arr, val) { if (angular.isArray(arr)) { for (var i = arr.length; i--;) {