diff --git a/src/main/ui/static/payment/tradelog/tradelog.js b/src/main/ui/static/payment/tradelog/tradelog.js
index ff3dd0a0f..b5cc4b557 100644
--- a/src/main/ui/static/payment/tradelog/tradelog.js
+++ b/src/main/ui/static/payment/tradelog/tradelog.js
@@ -24,6 +24,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.isAll = true;
$scope.isLevel3All = true;
$scope.device_isAll = true;
+ $scope.order_device_isAll = true;
$scope.dev_params = {client_type:'sunmi',limit:100};
$scope.clients = [$scope.currentUser.client];
$scope.showLevel3Clients = false;
@@ -188,6 +189,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.dev_params.client_ids = angular.copy($scope.clientIds);
$scope.showLevel3Clients = false;
$scope.listDevices();
+ $scope.listDevicesIds();
} else if (client.level3Clients) {
$scope.chooseClientId = client.client_id;
$scope.showLevel3Clients = true;
@@ -207,6 +209,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.dev_params.client_ids = [client.client_id];
$scope.showLevel3Clients = false;
$scope.listDevices();
+ $scope.listDevicesIds();
}
$scope.loadTradeLogs();
};
@@ -218,12 +221,14 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseLevel3ClientId = '';
$scope.dev_params.client_ids = angular.copy($scope.level3ClientIds);
$scope.listDevices();
+ $scope.listDevicesIds();
} else {
$scope.chooseLevel3ClientId = client.client_id;
$scope.params.client_ids = [client.client_id];
$scope.isLevel3All = false;
$scope.dev_params.client_ids = [client.client_id];
$scope.listDevices();
+ $scope.listDevicesIds();
}
$scope.loadTradeLogs();
};
@@ -234,6 +239,12 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.devices = resp.data.data;
})
};
+ $scope.listDevicesIds = function () {
+ var params = angular.copy($scope.params)
+ $http.get('/client/partner_info/device_ids',{params: params}).then(function (resp) {
+ $scope.deviceIds = resp.data.data;
+ })
+ };
$scope.chooseDevices = function (dev_id) {
if(dev_id == 'all'){
$scope.chooseDevice_id = '';
@@ -244,10 +255,28 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseDevice_id = dev_id;
$scope.params.dev_id = dev_id;
$scope.device_isAll = false;
+ $scope.order_device_isAll = true;
+ $scope.choose_order_device_id = '';
+ $scope.loadTradeLogs(1);
+ }
+ };
+ $scope.chooseDeviceIds = function (dev_id) {
+ if(dev_id == 'all'){
+ $scope.choose_order_device_id = '';
+ $scope.params.dev_id = null;
+ $scope.order_device_isAll = true;
+ $scope.loadTradeLogs(1);
+ }else {
+ $scope.choose_order_device_id = dev_id;
+ $scope.params.dev_id = dev_id;
+ $scope.device_isAll = true;
+ $scope.order_device_isAll = false;
+ $scope.chooseDevice_id = '';
$scope.loadTradeLogs(1);
}
};
$scope.listDevices();
+ $scope.listDevicesIds();
if ($scope.currentUser.client.has_children) {
$http.get('/client/partner_info/sub_partners').then(function (resp) {
@@ -265,8 +294,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}
});
$scope.params.client_ids = angular.copy($scope.clientIds);
-
$scope.loadTradeLogs(1);
+ $scope.listDevicesIds();
//console.log($rootScope.currentUser.client.clientList);
})
}else{
diff --git a/src/main/ui/static/payment/tradelog/transflow.js b/src/main/ui/static/payment/tradelog/transflow.js
index 0d79ae790..3dc58f0c8 100644
--- a/src/main/ui/static/payment/tradelog/transflow.js
+++ b/src/main/ui/static/payment/tradelog/transflow.js
@@ -19,6 +19,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.params.channel = 'ALL'
$scope.dev_params = {client_type:'sunmi',limit:100};
$scope.device_isAll = true;
+ $scope.order_device_isAll = true;
$scope.params.trans_type = 0;
$scope.isAll = true;
$scope.clients = [$scope.currentUser.client];
@@ -66,6 +67,13 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.devices = resp.data.data;
})
};
+ $scope.listDevicesIds = function () {
+ var params = angular.copy($scope.params)
+ $http.get('/client/partner_info/device_ids',{params: params}).then(function (resp) {
+ $scope.deviceIds = resp.data.data;
+ })
+ };
+
$scope.chooseDevices = function (dev_id) {
if(dev_id == 'all'){
$scope.chooseDevice_id = '';
@@ -76,10 +84,26 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseDevice_id = dev_id;
$scope.params.dev_id = dev_id;
$scope.device_isAll = false;
+ $scope.order_device_isAll = true;
+ $scope.loadTradeLogs(1);
+ }
+ };
+ $scope.chooseDeviceIds = function (dev_id) {
+ if(dev_id == 'all'){
+ $scope.choose_order_device_id = '';
+ $scope.params.dev_id = null;
+ $scope.order_device_isAll = true;
+ $scope.loadTradeLogs(1);
+ }else {
+ $scope.choose_order_device_id = dev_id;
+ $scope.params.dev_id = dev_id;
+ $scope.device_isAll = true;
+ $scope.order_device_isAll = false;
$scope.loadTradeLogs(1);
}
};
$scope.listDevices();
+ $scope.listDevicesIds();
$scope.loadTradeLogs = function (page) {
var params = angular.copy($scope.params);
if (params.datefrom) {
@@ -96,6 +120,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.analysis = resp.data.analysis;
$scope.analysis.refund_fee = angular.copy(Math.abs($scope.analysis.refund_fee));
});
+
};
$scope.chooseClient = function (client) {
if (client == 'all') {
@@ -105,6 +130,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.dev_params.client_ids = angular.copy($scope.clientIds);
$scope.showLevel3Clients = false;
$scope.listDevices();
+ $scope.listDevicesIds();
} else if (client.level3Clients) {
$scope.chooseClientId = client.client_id;
$scope.showLevel3Clients = true;
@@ -124,6 +150,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.dev_params.client_ids = [client.client_id];
$scope.showLevel3Clients = false;
$scope.listDevices();
+ $scope.listDevicesIds();
}
$scope.loadTradeLogs();
};
@@ -134,12 +161,14 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.chooseLevel3ClientId = '';
$scope.dev_params.client_ids = angular.copy($scope.level3ClientIds);
$scope.listDevices();
+ $scope.listDevicesIds();
} else {
$scope.chooseLevel3ClientId = client.client_id;
$scope.params.client_ids = [client.client_id];
$scope.isLevel3All = false;
$scope.dev_params.client_ids = [client.client_id];
$scope.listDevices();
+ $scope.listDevicesIds();
}
$scope.loadTradeLogs();
};
From 28e6bcc2f1726ba8993182bc051bc55b12fe5176 Mon Sep 17 00:00:00 2001
From: liuxinxin
Date: Wed, 4 Dec 2019 15:22:25 +0800
Subject: [PATCH 2/3] [R] R Services fix
---
src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +-
.../ui/static/payment/tradelog/templates/balance_report.html | 2 +-
.../static/payment/tradelog/templates/partner_trade_logs.html | 2 +-
src/main/ui/static/payment/tradelog/templates/trade_logs.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index ce19512fe..db2d8efe6 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -212,7 +212,7 @@
uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
- {{trade.order_id2}}
+ {{trade.order_id2}}
|
|
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index a7068a157..1c788a8e1 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -335,7 +335,7 @@
uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
- {{trade.order_id2}}
+ {{trade.order_id2}}
|
|
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b1c4aa8ad..3c423f3d9 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -431,7 +431,7 @@
- {{trade.order_id}}
+ {{trade.order_id}}
{{trade.total_amount|currency:trade.currency+' '}}
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 61f08ded5..f9c13b131 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -486,7 +486,7 @@
uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
- {{trade.order_id}}
+ {{trade.order_id}}
|
{{trade.total_amount|currency:trade.currency}}
From e12419d3b83ceecacf941bb0096e554338ce2047 Mon Sep 17 00:00:00 2001
From: duLingLing
Date: Wed, 4 Dec 2019 15:32:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c8b6882fa..ef51f8c0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.3.1
+ 1.3.2
UTF-8
1.4.0
|