From e0a084b01e253cdd225a35a6626dd44404c3097f Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 20 Aug 2018 18:14:44 +0800 Subject: [PATCH 1/9] fix hf css --- src/main/ui/static/css/hf_gateway.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/css/hf_gateway.css b/src/main/ui/static/css/hf_gateway.css index 2f3bfbae9..d4a50aba9 100644 --- a/src/main/ui/static/css/hf_gateway.css +++ b/src/main/ui/static/css/hf_gateway.css @@ -1,7 +1,7 @@ .hf-gateway-background { width:100%; height:100%; - position: fixed; + /*position: fixed;*/ background: url("img/hf_bg.jpg"); top: 0; bottom: 0; From 0e58f61eb62bf2c11cad783c8a778d7d35bf6dbe Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 20 Aug 2018 19:55:44 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[Y]=20=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E8=A7=84=E6=8F=90=E9=86=92=20&=20dashboard?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/web/DashboardController.java | 14 +-- .../static/commons/services/commonDialog.js | 1 + .../static/payment/partner/partner-manage.js | 99 ++++++++++++++++++- .../partner/templates/partner_detail.html | 18 +++- 4 files changed, 117 insertions(+), 15 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java index 439a252e3..86cb29a46 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java @@ -38,28 +38,28 @@ public class DashboardController { @ManagerMapping("/common_analysis_3") public JSONObject commonAnalysis3(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getCommonAnalysis3(params); } @ManagerMapping("/common_analysis_4") public JSONObject commonAnalysis4(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getCommonAnalysis4(params); } @ManagerMapping("/common_analysis_2") public JSONObject commonAnalysis2(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getCommonAnalysis2(params); } @ManagerMapping("/trade_in_types") public List tradeInTypes(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getTradeInTypes(params); } @@ -67,7 +67,7 @@ public class DashboardController { @ManagerMapping("/top_trade_partners") public List topTradePartners(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestParam(defaultValue = "10") int limit) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getTopTradePartners(params, limit); } @@ -107,7 +107,7 @@ public class DashboardController { @ManagerMapping("/partners_in_types") public List partnersInTypes(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); if (analysis.isOnlyGroup() && ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) { params.put("bd_group", manager.getString("manager_id")); @@ -154,7 +154,7 @@ public class DashboardController { @ManagerMapping("/Total_platform_amount") public JSONObject getPlatformAmount(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager){ - JSONObject params = analysis.toParams(null); + JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); return dashboardService.getPlatformAmount(params); } diff --git a/src/main/ui/static/commons/services/commonDialog.js b/src/main/ui/static/commons/services/commonDialog.js index 74e834463..57aa93950 100644 --- a/src/main/ui/static/commons/services/commonDialog.js +++ b/src/main/ui/static/commons/services/commonDialog.js @@ -36,6 +36,7 @@ define(['../app', 'angular'], function (app, angular) { var config = { title: cfg.title, content: cfg.content, + contentHtml: cfg.contentHtml, backdrop: cfg.backdrop, size: cfg.size, choises: cfg.choises || choises diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 196e39946..318b68266 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -500,15 +500,37 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }]); - app.controller('partnerDetailCtrl', ['$scope', '$http', '$state', '$uibModal', '$rootScope', 'Upload', 'commonDialog', 'partner', function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner) { + app.controller('partnerDetailCtrl', ['$scope', '$http', '$state', '$uibModal', '$rootScope', 'Upload', 'commonDialog', 'partner', '$sce', function ($scope, $http, $state, $uibModal, $rootScope, Upload, commonDialog, partner, $sce) { $scope.init = {wechat_compliance: false, local_merchant: false}; $scope.partner = partner.data; + $scope.isComplianceOfCompanyName = false; + $scope.isComplianceOfShortName = false; + $scope.isComplianceOfBusinessStructure = false; var website = partner.data.company_website; if (website!=null){ if (website.indexOf('http')!=0){ $scope.partner.company_website= 'http://'+angular.copy(website); } } + $scope.decideCompliance = function (name) { + var keywords = ['education','financial' ,'train','immigrant','invest', + '律师咨询','会计事务所','移民留学','娱乐','金融','地产','投资']; + for(var i = 0; i < keywords.length; i++){ + if (name.indexOf(keywords[i]) != -1) { + return true; + } + } + return false; + }; + if (partner.data.company_name != null) { + $scope.isComplianceOfCompanyName = $scope.decideCompliance(partner.data.company_name); + } + if (partner.data.short_name != null) { + $scope.isComplianceOfShortName = $scope.decideCompliance(partner.data.short_name); + } + if (partner.data.business_structure != null) { + $scope.isComplianceOfBusinessStructure = $scope.decideCompliance(partner.data.business_structure); + } $scope.showDBUsers = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bd_user').then(function (resp) { $scope.partner.client_bds = resp.data; @@ -548,9 +570,33 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert("Bank Account not checked"); return; } + var title = 'Audit Partner'; + var content = 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？'; + var choises = ''; + var contentHtml = ''; + if ($scope.isComplianceOfCompanyName || $scope.isComplianceOfShortName + || $scope.isComplianceOfBusinessStructure) { + var info = []; + if ($scope.isComplianceOfCompanyName) { + info.push('Company Name'); + } + if ($scope.isComplianceOfShortName) { + info.push('Short Name'); + } + if ($scope.isComplianceOfBusinessStructure) { + info.push('Business Structure'); + } + title = 'Warning'; + contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],'+ info.toString() +'存在微信渠道不合规信息'); + choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true}, + {label: '确认提交', className: 'btn-success', key: '1'}]; + content = ''; + } commonDialog.confirm({ - title: 'Audit Partner', - content: 'Are you sure to mark partner ' + $scope.partner.company_name + ' audited？' + title: title, + content: content, + choises: choises, + contentHtml: contentHtml }).then(function () { $http.put('/sys/partners/' + $scope.partner.client_moniker + '/audit', {pass: 1}).then(function () { if ($scope.partner.approve_result == 2 && ($scope.partner.source == 1 || $scope.partner.source == 2)) { @@ -1115,7 +1161,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }]); - app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', function ($scope, $http, $state, commonDialog,$uibModal) { + app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) { $scope.refresh = false; $scope.loadPartnerPaymentInfo = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { @@ -1314,6 +1360,34 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }) }; + var info = []; + $scope.decideCompliance = function (name) { + var keywords = ['education','financial' ,'train','immigrant','invest', + '律师咨询','会计事务所','移民留学','娱乐','金融','地产','投资']; + for(var i = 0; i < keywords.length; i++){ + if (name.indexOf(keywords[i]) != -1) { + return true; + } + } + return false; + }; + $scope.getComplianceInfo = function () { + if ($scope.paymentInfo.company_name != null) { + if($scope.decideCompliance($scope.paymentInfo.company_name)) { + info.push('Company Name'); + } + } + if ($scope.paymentInfo.short_name != null) { + if($scope.decideCompliance($scope.paymentInfo.short_name)) { + info.push('Short Name'); + } + } + if ($scope.paymentInfo.business_structure != null) { + if($scope.decideCompliance($scope.paymentInfo.business_structure)) { + info.push('Business Structure'); + } + } + }; $scope.toggleChannel = function (channel) { if (!channel) { return; @@ -1325,6 +1399,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.init.channel[channel] = true; return; } + $scope.getComplianceInfo(); + if ($scope.paymentInfo['enable_wechat'] && channel == 'wechat' + && $scope.paymentInfo.open_status == 5 && info.length > 0) { + commonDialog.confirm({ + title: "Warning", + contentHtml: $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],'+ info.toString() +'存在微信渠道不合规信息') + }).then(function () { + $scope.saveChannel(channel); + }) + } else { + $scope.saveChannel(channel); + } + info = []; + }; + $scope.saveChannel = function (channel) { $http.put('/sys/partners/' + $scope.partner.client_moniker + '/channels/' + channel + '/permission', {allow: $scope.paymentInfo['enable_' + channel]}).then(function () { $scope.loadPartnerPaymentInfo(); }, function (resp) { @@ -1334,7 +1423,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter type: 'error' }) }) - }; + } $scope.toggleHfLink = function (channel) { if (!channel) { return; diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 4e218de2d..35cde22f8 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -291,14 +291,22 @@
-

+

+

+ 注意:（微信渠道可能不合规） +

-

+

+

+ 注意:（微信渠道可能不合规） +

@@ -312,8 +320,12 @@
-

+

+ 注意:（微信渠道可能不合规） +

From 4a78ddac9adb6b9c5daff00e54a1d04021e1c4d4 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 20 Aug 2018 20:37:06 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E8=A7=84=E8=A1=8C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner-manage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 318b68266..9571def61 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -514,7 +514,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } $scope.decideCompliance = function (name) { var keywords = ['education','financial' ,'train','immigrant','invest', - '律师咨询','会计事务所','移民留学','娱乐','金融','地产','投资']; + '律师咨询','会计事务所', '移民', '留学','娱乐','金融','地产','投资']; for(var i = 0; i < keywords.length; i++){ if (name.indexOf(keywords[i]) != -1) { return true; @@ -1363,7 +1363,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter var info = []; $scope.decideCompliance = function (name) { var keywords = ['education','financial' ,'train','immigrant','invest', - '律师咨询','会计事务所','移民留学','娱乐','金融','地产','投资']; + '律师咨询','会计事务所', '移民', '留学','娱乐','金融','地产','投资']; for(var i = 0; i < keywords.length; i++){ if (name.indexOf(keywords[i]) != -1) { return true; From c23689c578fbfd84b95c444d175c6d7552d80801 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 21 Aug 2018 08:41:30 +0800 Subject: [PATCH 4/9] settle date display --- .../ui/static/payment/partner/templates/partner_settlement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_settlement.html b/src/main/ui/static/payment/partner/templates/partner_settlement.html index dc3fe5cb8..78760700c 100644 --- a/src/main/ui/static/payment/partner/templates/partner_settlement.html +++ b/src/main/ui/static/payment/partner/templates/partner_settlement.html @@ -77,7 +77,7 @@ - {{log.clearing_time|limitTo:10}} + {{log.report_date|limitTo:10}}   From fb9d6da733bbbbd60d9e53b36b7aef6022bd64c2 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Tue, 21 Aug 2018 08:58:01 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[Y]=20=E9=80=9A=E7=94=A8=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/CommonSubMerchantIdMapper.java | 6 +-- .../web/MerchantIdManageController.java | 9 ++++- .../payment/merchantid/merchant_id_manager.js | 10 +++-- .../templates/temp_sub_merchant_id.html | 40 ++++++++++++++++--- 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java index 0e98c9127..7f7c3c111 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java @@ -10,15 +10,13 @@ import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; import cn.yixblog.support.mybatis.autosql.annotations.SqlType; -import java.util.List; - /** * Create by yixian at 2017-12-05 23:13 */ @AutoMapper(tablename = "pmt_sub_merchant_id", pkName = "sub_merchant_id") public interface CommonSubMerchantIdMapper { @AutoSql(type = SqlType.SELECT) - List list(@Param("is_valid") boolean is_valid, @Param("sub_merchant_id") String sub_merchant_id,PageBounds pageBounds); + PageList list(@Param("is_valid") boolean isValid, @Param("sub_merchant_id") String subMerchantId, PageBounds pageBounds); @AutoSql(type = SqlType.INSERT) void save(JSONObject record); @@ -27,6 +25,6 @@ public interface CommonSubMerchantIdMapper { void update(JSONObject record); @AutoSql(type = SqlType.SELECT) - JSONObject find(@Param("sub_merchant_id")String sub_merchant_id); + JSONObject find(@Param("sub_merchant_id") String subMerchantId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java index 27a6a44d8..5e0fc4fc9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java @@ -6,9 +6,12 @@ import au.com.royalpay.payment.manage.merchantid.core.MerchantIdManageService; import au.com.royalpay.payment.manage.permission.manager.RequireManager; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; +import au.com.royalpay.payment.tools.utils.PageListUtils; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -54,8 +57,10 @@ public class MerchantIdManageController { @RequestMapping(value = "/common_sub_merchant_id", method = RequestMethod.GET) @RequireManager(role = {ManagerRole.OPERATOR}) - public List listCommonSubMerchantId(@RequestParam(required = false) String sub_merchant_id, @RequestParam(defaultValue = "true") boolean is_valid) { - return commonSubMerchantIdMapper.list(is_valid,sub_merchant_id,new PageBounds(Order.formString("create_time.desc"))); + public JSONObject listCommonSubMerchantId(@RequestParam(required = false) String sub_merchant_id, + @RequestParam int page, @RequestParam(defaultValue = "true") boolean is_valid) { + PageList list = commonSubMerchantIdMapper.list(is_valid,sub_merchant_id,new PageBounds(page, 20, Order.formString("create_time.desc"))); + return PageListUtils.buildPageListResult(list); } @RequestMapping(value = "/common_sub_merchant_id/{sub_merchant_id}", method = RequestMethod.POST) 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 e78dddfcd..b184544da 100644 --- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js +++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js @@ -81,16 +81,18 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.pagination = {}; $scope.params = {}; - $scope.loadTempSubMerchantId = function () { - var params = angular.copy($scope.params); + $scope.loadTempSubMerchantId = function (page) { + var params = angular.copy($scope.params) || {}; + params.page = page || $scope.pagination.page || 1; if(!params.sub_merchant_id){ delete params.sub_merchant_id; } $http.get('/sys/merchant_id/common_sub_merchant_id',{params: params}).then(function (resp) { - $scope.subMerchantIdList= resp.data; + $scope.subMerchantIdList= resp.data.data; + $scope.pagination = resp.data.pagination; }); }; - $scope.loadTempSubMerchantId(); + $scope.loadTempSubMerchantId(1); $scope.save = function () { $uibModal.open({ templateUrl: '/static/payment/merchantid/templates/new_common_sub_merchant_id.html', 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 c9acf4d2c..da6a4bbb7 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 @@ -1,11 +1,23 @@
-
- - - Add - +
+
+ + + Add + +
+
+
+ +
+
+ +
+
@@ -35,4 +47,20 @@
+
+ +
+
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
+
From d6589d29176b4f6e3ca3946dc2a3d9907de79d38 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 21 Aug 2018 09:25:36 +0800 Subject: [PATCH 6/9] fix clearing date display --- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 3 ++- .../payment/manage/mappers/payment/TransactionMapper.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 98ca78c70..aa9b9984c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -834,10 +834,11 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject result = PageListUtils.buildPageListResult(logs); result.put("analysis", transactionMapper.getClientAmountAnalysis(params)); if (query.getPage() == 1) { - if (!logs.isEmpty() && logs.size() > 0) { + if (!logs.isEmpty()) { JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clear_detail_id")); if (clearingDetail!=null){ JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); + if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); logs.get(0).put("padding",true); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 4b4b0063e..8e7dd2698 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -280,7 +280,9 @@