diff --git a/pom.xml b/pom.xml
index f9ca066e7..0cb5cad66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.3.100
+ 1.4.1
UTF-8
1.8.0
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 8814fd540..4fd1ec219 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
@@ -1289,6 +1289,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
// todo Velocity
Context ctx = new Context();
ctx.setVariable("bds", bds);
+ ctx.setVariable("short_name", client.getString("short_name"));
ctx.setVariable("password", pwd);
ctx.setVariable("username", username);
ctx.setVariable("client_moniker", client.getString("client_moniker"));
@@ -1354,6 +1355,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
// todo Velocity
Context ctx = new Context();
ctx.setVariable("bds", bds);
+ ctx.setVariable("short_name", client.getString("short_name"));
ctx.setVariable("password", pwd);
ctx.setVariable("username", username);
ctx.setVariable("client_moniker", client.getString("client_moniker"));
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 8711d58fb..f00a66158 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3388,7 +3388,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.partner];
$scope.subClientTable2 = [];
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.more20ChoseSubClient = false;
$scope.subSearchText = '';
@@ -3495,7 +3495,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
});
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';
@@ -4387,7 +4387,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.clinet = {};
$scope.isAll = true;
$scope.more20ChoseSubClient = false;
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.searchSubClients = function (subSearchText,page) {
$scope.subClientTable1 = [$scope.partner];
@@ -4457,7 +4457,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';
diff --git a/src/main/ui/static/payment/tradelog/partner-settlement-log.js b/src/main/ui/static/payment/tradelog/partner-settlement-log.js
index 5be99bcf7..9877d12b0 100644
--- a/src/main/ui/static/payment/tradelog/partner-settlement-log.js
+++ b/src/main/ui/static/payment/tradelog/partner-settlement-log.js
@@ -27,7 +27,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.isLevel3All = true;
$scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = [];
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.subSearchText = '';
$scope.searchSubClients = function (subSearchText,page) {
@@ -165,7 +165,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';
diff --git a/src/main/ui/static/payment/tradelog/tradelog.js b/src/main/ui/static/payment/tradelog/tradelog.js
index a0f188efa..172d80240 100644
--- a/src/main/ui/static/payment/tradelog/tradelog.js
+++ b/src/main/ui/static/payment/tradelog/tradelog.js
@@ -30,7 +30,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = [];
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.subSearchText = '';
@@ -190,7 +190,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
});
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';
@@ -467,7 +467,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
});
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';
diff --git a/src/main/ui/static/payment/tradelog/transflow.js b/src/main/ui/static/payment/tradelog/transflow.js
index 653d5748a..516c39feb 100644
--- a/src/main/ui/static/payment/tradelog/transflow.js
+++ b/src/main/ui/static/payment/tradelog/transflow.js
@@ -29,7 +29,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = [];
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.subSearchText = '';
$scope.today = new Date();
@@ -164,7 +164,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
};
$scope.chooseClient = function (client) {
if (client == 'all') {
- $scope.choseSubClientNow = 'chose';
+ $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true;
$scope.chooseClientId = '';