msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 开通邮件、子商户chose改为more

Browse Source
master
luoyang 5 years ago
parent 3eee11c204
commit 40d044aca9
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.3.100</version> <version>1.4.1</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -1289,6 +1289,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
// todo Velocity // todo Velocity
Context ctx = new Context(); Context ctx = new Context();
ctx.setVariable("bds", bds); ctx.setVariable("bds", bds);
ctx.setVariable("short_name", client.getString("short_name"));
ctx.setVariable("password", pwd); ctx.setVariable("password", pwd);
ctx.setVariable("username", username); ctx.setVariable("username", username);
ctx.setVariable("client_moniker", client.getString("client_moniker")); ctx.setVariable("client_moniker", client.getString("client_moniker"));
@ -1354,6 +1355,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
// todo Velocity // todo Velocity
Context ctx = new Context(); Context ctx = new Context();
ctx.setVariable("bds", bds); ctx.setVariable("bds", bds);
ctx.setVariable("short_name", client.getString("short_name"));
ctx.setVariable("password", pwd); ctx.setVariable("password", pwd);
ctx.setVariable("username", username); ctx.setVariable("username", username);
ctx.setVariable("client_moniker", client.getString("client_moniker")); ctx.setVariable("client_moniker", client.getString("client_moniker"));

8
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -3388,7 +3388,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.showLevel3Clients = false; $scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.partner]; $scope.subClientTable1 = [$scope.partner];
$scope.subClientTable2 = []; $scope.subClientTable2 = [];
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.more20ChoseSubClient = false; $scope.more20ChoseSubClient = false;
$scope.subSearchText = ''; $scope.subSearchText = '';
@ -3495,7 +3495,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}); });
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';
@ -4387,7 +4387,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.clinet = {}; $scope.clinet = {};
$scope.isAll = true; $scope.isAll = true;
$scope.more20ChoseSubClient = false; $scope.more20ChoseSubClient = false;
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.searchSubClients = function (subSearchText,page) { $scope.searchSubClients = function (subSearchText,page) {
$scope.subClientTable1 = [$scope.partner]; $scope.subClientTable1 = [$scope.partner];
@ -4457,7 +4457,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';

4
src/main/ui/static/payment/tradelog/partner-settlement-log.js
Unescape View File

@ -27,7 +27,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.isLevel3All = true; $scope.isLevel3All = true;
$scope.subClientTable1 = [$scope.currentUser.client]; $scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = []; $scope.subClientTable2 = [];
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.subSearchText = ''; $scope.subSearchText = '';
$scope.searchSubClients = function (subSearchText,page) { $scope.searchSubClients = function (subSearchText,page) {
@ -165,7 +165,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';

6
src/main/ui/static/payment/tradelog/tradelog.js
Unescape View File

@ -30,7 +30,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.showLevel3Clients = false; $scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.currentUser.client]; $scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = []; $scope.subClientTable2 = [];
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.subSearchText = ''; $scope.subSearchText = '';
@ -190,7 +190,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}); });
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';
@ -467,7 +467,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}); });
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';

4
src/main/ui/static/payment/tradelog/transflow.js
Unescape View File

@ -29,7 +29,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.showLevel3Clients = false; $scope.showLevel3Clients = false;
$scope.subClientTable1 = [$scope.currentUser.client]; $scope.subClientTable1 = [$scope.currentUser.client];
$scope.subClientTable2 = []; $scope.subClientTable2 = [];
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.subSearchText = ''; $scope.subSearchText = '';
$scope.today = new Date(); $scope.today = new Date();
@ -164,7 +164,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}; };
$scope.chooseClient = function (client) { $scope.chooseClient = function (client) {
if (client == 'all') { if (client == 'all') {
$scope.choseSubClientNow = 'chose'; $scope.choseSubClientNow = 'More';
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.isAll = true; $scope.isAll = true;
$scope.chooseClientId = ''; $scope.chooseClientId = '';

Write Preview
Loading…
Cancel
Save