From 7b487bd1ee3c67fce0a46fefaa3ed97d2d5c17f7 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 28 Aug 2019 11:21:15 +0800 Subject: [PATCH 1/8] ui error --- .../manage/analysis/core/impls/ATOReportServiceImpl.java | 6 +++--- src/main/ui/static/payment/partner/partner-manage.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java index 5ecb72367..ecc98a8cd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java @@ -90,13 +90,13 @@ public class ATOReportServiceImpl implements ATOReportService { DateTime startOfMon = new DateTime(fromDateTime); DateTime endOfMon = new DateTime(fromDateTime.plusMonths(1).withDayOfMonth(1)); while (endOfMon.isBefore(toDateTime)) { - logger.debug("Exporting date range:" + startOfMon.toString("yyyy-MM-dd") + " ~ " + endOfMon.toString("yyyy-MM-dd")); + logger.debug("Exporting date range:{} ~ {}", startOfMon.toString("yyyy-MM-dd"), endOfMon.toString("yyyy-MM-dd")); loadMonthTransactions(reportingParty, startOfMon, endOfMon); startOfMon = new DateTime(endOfMon); endOfMon = new DateTime(endOfMon.plusMonths(1)); } endOfMon = new DateTime(toDateTime); - logger.debug("Exporting date range:" + startOfMon.toString("yyyy-MM-dd") + " ~ " + endOfMon.toString("yyyy-MM-dd")); + logger.debug("Exporting date range:{} ~ {}", startOfMon.toString("yyyy-MM-dd"), endOfMon.toString("yyyy-MM-dd")); loadMonthTransactions(reportingParty, startOfMon, endOfMon); logger.info("output BTTPS file"); return data.outputBTTPS(); @@ -109,7 +109,7 @@ public class ATOReportServiceImpl implements ATOReportService { private void loadClientMonthTransactions(ReportingPartyData reportingParty, Integer clientId, DateTime startOfMon, DateTime endOfMon) { BusinessData biz = reportingParty.findBusiness(clientId); - logger.debug("Exporting date range for client[" + clientId + "]:" + startOfMon.toString("yyyy-MM-dd") + " ~ " + endOfMon.toString("yyyy-MM-dd")); + logger.debug("Exporting date range for client[{}]:{} ~ {}",clientId,startOfMon.toString("yyyy-MM-dd"), endOfMon.toString("yyyy-MM-dd")); if (biz == null) { JSONObject cli = clientMapper.findClientIgnoreInvalid(clientId); AddressInfo addr = new AddressInfo(cli.getString("address"), cli.getString("suburb"), cli.getString("state"), cli.getString("postcode"), cli.getString("country")); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 9e5dae172..76a48b1b5 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -227,7 +227,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.exportPartnersExcel = function () { var params = angular.copy($scope.params); - var param_str = keys(params).map(function (key) { + var param_str = Object.keys(params).map(function (key) { var value = params[key]; if (angular.isDate(value)) { value = $filter('date')(value, 'yyyy-MM-ddTHH:mm:ssZ') From 5cc0811af7cfc32a233b85926989b1ad4e34db62 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 28 Aug 2019 11:58:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix=20=E4=B8=8B=E8=BD=BD=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/merchants/web/PartnerManageController.java | 5 +++++ src/main/ui/static/payment/partner/partner-manage.js | 2 +- src/main/ui/static/payment/partner/partner.js | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5c1f37ed2..52ef28161 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.31 + 1.1.32 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index 360bef468..579209cda 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -534,6 +534,11 @@ public class PartnerManageController { return clientManager.getAllAuthFiles(manager, clientMoniker); } + @ManagerMapping(value = "/{clientMoniker}/file/source_agree_file", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER, ManagerRole.SERVANT}) + public JSONObject getSourceAgreeAuthFiles(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + return clientManager.getAuthFiles(manager, clientMoniker); + } + @ManagerMapping(value = "/auth_file/{fileId}/delete", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER}) public void deleteAuthFiles(@PathVariable String fileId, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { clientManager.deleteAuthFilesByAdmin(fileId); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 5b2dffe90..c4ef0d3db 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -795,7 +795,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.showDBUsers(); $scope.showFile = function () { - $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file').then(function (resp) { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/file/source_agree_file').then(function (resp) { $scope.fileManager = resp.data; }); }; diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index a6e84e3fd..6cbee8215 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -977,7 +977,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo ; commonDialog.confirm({ title: 'Warning', - content: 'Are you sure commit for compliance audit?' + content: 'Are you sure to submit files?' }).then(function () { $http.post('/client/partner_info/clientCompliance/' + $scope.partner.client_moniker + '/viewCommit', $scope.file).then(function () { commonDialog.alert({ From f8963a18ba92c3ae81b1b8f958a6da59887f6d4b Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 28 Aug 2019 12:59:22 +0800 Subject: [PATCH 3/8] fix notify bd --- pom.xml | 2 +- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52ef28161..df0aa14dc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.32 + 1.1.33 UTF-8 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 4ff99a7c9..0e71b2642 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 @@ -2887,6 +2887,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid file.put("file_value", sourceFile); file.put("client_id", client.getIntValue("client_id")); file.put("last_update_date", now); + file.put("status", 1); + file.put("is_valid", 1); if (manager == null) { file.put("last_update_by", "System Import"); } else { From 2c85268ca621d96ea83557e36236e5a7cd6dc377 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 28 Aug 2019 13:09:47 +0800 Subject: [PATCH 4/8] fix pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df0aa14dc..eaaa2bb0f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.33 + 1.1.34 UTF-8 From a116631a343a9d55b6809007176bb55aef6221cf Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 29 Aug 2019 10:12:34 +0800 Subject: [PATCH 5/8] =?UTF-8?q?add=20=E5=95=86=E6=88=B7=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0ip=E3=80=81id=E3=80=81=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E6=AD=A3=E5=BC=8F=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/appclient/core/RetailAppService.java | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 5 ++++- .../payment/manage/appclient/web/RetailAppController.java | 4 ++-- .../manage/merchants/core/impls/ClientManagerImpl.java | 7 ++++++- .../manage/merchants/web/PartnerViewController.java | 6 +++++- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 4 ++-- .../partner/templates/client_compliance_to_perfect.html | 4 ++-- .../payment/partner/templates/contract_for_compliance.html | 2 +- 9 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index eaaa2bb0f..862604f78 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.34 + 1.1.35 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java index 310c063d1..774d9ddba 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java @@ -202,7 +202,7 @@ public interface RetailAppService { JSONObject getSourceAggregateFile(JSONObject device); - JSONObject getClientAggregateFile(JSONObject device, MultipartFile file) throws IOException; + JSONObject getClientAggregateFile(JSONObject device, MultipartFile file, String ua) throws IOException; List uploadGreenChannelAuthFiles(JSONObject device, ClientAuthFilesInfo filesInfo); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index ba640eac3..f4d161634 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -48,6 +48,7 @@ import au.com.royalpay.payment.tools.device.message.AppMessage; import au.com.royalpay.payment.tools.device.message.AppMsgSender; import au.com.royalpay.payment.tools.device.support.DeviceRegister; import au.com.royalpay.payment.tools.env.PlatformEnvironment; +import au.com.royalpay.payment.tools.env.RequestEnvironment; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; @@ -2315,7 +2316,7 @@ public class RetailAppServiceImp implements RetailAppService { } @Override - public JSONObject getClientAggregateFile(JSONObject device,MultipartFile file) throws IOException{ + public JSONObject getClientAggregateFile(JSONObject device,MultipartFile file, String userAgent) throws IOException{ String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); @@ -2323,6 +2324,8 @@ public class RetailAppServiceImp implements RetailAppService { throw new BadRequestException("Please Enter Full Name"); } JSONObject account = clientAccountMapper.findById(device.getString("account_id")); + account.put("signature_ip", RequestEnvironment.getClientIp()); + account.put("user_agent", userAgent); return clientManager.getClientAggregateFile(account, file); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index ca677b3b1..d48aa3b5b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -750,8 +750,8 @@ public class RetailAppController { * @param file 签名的url图片 */ @RequestMapping(value = "/client/aggregate_file", method = RequestMethod.POST) - public JSONObject getClientAggregateFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam MultipartFile file) throws IOException { - return retailAppService.getClientAggregateFile(device, file); + public JSONObject getClientAggregateFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam MultipartFile file, @RequestHeader("User-Agent") String ua) throws IOException { + return retailAppService.getClientAggregateFile(device, file, ua); } /** 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 0e71b2642..71aa9360e 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 @@ -3500,16 +3500,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (aggregateFiles != null && aggregateFiles.size() > 0) { clientFilesMapper.deleteAggreeByClientId(clientId); } + String signatureAccountId = StringUtils.isNotBlank("account_id")?manager.getString("account_id"):manager.getString("manager_id"); JSONObject fileJson = new JSONObject(); fileJson.put("client_id", clientId); fileJson.put("last_update_date", new Date()); fileJson.put("last_update_by", manager.getString("display_name")); fileJson.put("file_name", fileType); fileJson.put("file_value", fileValue); + fileJson.put("signature_time", new Date()); + fileJson.put("signature_ip", manager.getString("signature_ip")); + fileJson.put("user_agent", manager.getString("user_agent")); + fileJson.put("signature_account_id", signatureAccountId); fileJson.put("status", 0); fileJson.put("is_valid", 1); clientFilesMapper.save(fileJson); - logger.info(clientId + "的合同文件上传成功" + fileJson.getString("file_id")); + logger.info("{}合同文件上传成功，IP:{},us-agent:{},signature_id:{}",clientId,manager.getString("signature_ip"),manager.getString("user_agent"),signatureAccountId); JSONObject file = new JSONObject(); file.put("file_id", fileJson.getString("file_id")); file.put("file_value", fileJson.getString("file_value")); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java index cb7c3f9a3..ee208bf27 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java @@ -20,6 +20,7 @@ import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; import au.com.royalpay.payment.manage.tradelog.core.TradeLogService; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType; +import au.com.royalpay.payment.tools.env.RequestEnvironment; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.http.HttpUtils; @@ -38,6 +39,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -587,7 +589,9 @@ public class PartnerViewController { @PartnerMapping(value = "/clientCompliance/{clientMoniker}/commit_aggregate_file", method = RequestMethod.POST) @ResponseBody - public JSONObject getClientArregateFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestParam MultipartFile file) throws IOException { + public JSONObject getClientArregateFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestParam MultipartFile file, @RequestHeader("User-Agent") String userAgent, HttpServletRequest request) throws IOException { + account.put("signature_ip", RequestEnvironment.getClientIp()); + account.put("user_agent", userAgent); return clientManager.getClientAggregateFile(account, file); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index f8bfb61df..46ed185f5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -166,7 +166,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati client.putAll(clientConfigService.find(client_id)); client = clientInfoWithNoSecretInfo(client); client.put("client_less_file", false); - if (client.getIntValue("client_id") == 9 &&(client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { + if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id")); if (clientFiles != null && clientFiles.size() > 0) { clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList()); @@ -644,7 +644,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati JSONObject result = new JSONObject(); result.put("client_less_file", false); result.put("put_fail_pdf", "https://file.royalpay.com.au/open/2019/08/28/1566959635986_P1GuvCkuWINPhUJUqUQnz8E0u6Lgpx.pdf"); - if (client.getIntValue("client_id") == 9 &&(client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { + if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id")); boolean clientFilesIsLess = false; for (int i = 0; i < FILE_KEYS.length; i++) { diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html b/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html index 784dc06fb..a574160f2 100644 --- a/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html +++ b/src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html @@ -157,11 +157,11 @@
Resign The Contract + ui-sref="compliance_contract">Resign The Agreement Sign The Contract + ui-sref="compliance_contract">Sign The Agreement diff --git a/src/main/ui/static/payment/partner/templates/contract_for_compliance.html b/src/main/ui/static/payment/partner/templates/contract_for_compliance.html index 5f6e94a85..df5b90f7f 100644 --- a/src/main/ui/static/payment/partner/templates/contract_for_compliance.html +++ b/src/main/ui/static/payment/partner/templates/contract_for_compliance.html @@ -111,7 +111,7 @@
From 5650fe1a7f22c1ece2345f7e73ee988d9fe0c254 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 29 Aug 2019 14:51:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=20=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=B5=84=E6=96=99=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 862604f78..9c56b3ed5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.1.35 + 1.1.36 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index f4d161634..40bb081e4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2296,7 +2296,7 @@ public class RetailAppServiceImp implements RetailAppService { client.put("cbbank_rate", cbBankPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN)); } } catch (Exception ignored) { - throw new BadRequestException("Merchant Rate Not Configure"); + throw new BadRequestException("Merchant Rate Not Configure,Please Contact Customer Service"); } JSONObject bankAccount = getBankAccountByClientId(client.getIntValue("client_id")); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index 46ed185f5..77ad492e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -166,7 +166,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati client.putAll(clientConfigService.find(client_id)); client = clientInfoWithNoSecretInfo(client); client.put("client_less_file", false); - if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { + if (client.getIntValue("client_id")==9 && (client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id")); if (clientFiles != null && clientFiles.size() > 0) { clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList()); @@ -644,7 +644,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati JSONObject result = new JSONObject(); result.put("client_less_file", false); result.put("put_fail_pdf", "https://file.royalpay.com.au/open/2019/08/28/1566959635986_P1GuvCkuWINPhUJUqUQnz8E0u6Lgpx.pdf"); - if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { + if (client.getIntValue("client_id")==9 && (client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) { List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id")); boolean clientFilesIsLess = false; for (int i = 0; i < FILE_KEYS.length; i++) { From 0c5d3da7e14af699954d9aa0454ce602a1f6673b Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 30 Aug 2019 17:43:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[RoyalPay]=20=E9=9C=80=E6=B1=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysClientLegalPersonMapper.java | 20 ++ .../merchants/beans/ClientRegisterInfo.java | 80 +++++++ .../core/impls/ClientManagerImpl.java | 40 +++- .../static/payment/partner/partner-manage.js | 116 ++++++++++ .../partner/templates/add_partner.html | 204 ++++++++++++++++++ .../templates/add_sub_partner_dialog.html | 201 +++++++++++++++++ .../partner/templates/partner_detail.html | 83 +++++++ .../partner/templates/partner_edit.html | 173 +++++++++++++++ .../partner/templates/partner_new_rate.html | 2 +- 9 files changed, 917 insertions(+), 2 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java new file mode 100644 index 000000000..3119f082b --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysClientLegalPersonMapper.java @@ -0,0 +1,20 @@ +package au.com.royalpay.payment.manage.mappers.system; + +import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect; +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 com.alibaba.fastjson.JSONObject; +import org.apache.ibatis.annotations.Param; + +@AutoMapper(tablename = "sys_client_legal_person", pkName = "client_id") +public interface SysClientLegalPersonMapper{ + @AutoSql(type = SqlType.INSERT) + void save(JSONObject representativeInfo); + + @AutoSql(type = SqlType.UPDATE) + void update(JSONObject representativeInfo); + + @AutoSql(type = SqlType.SELECT) + JSONObject findRepresentativeInfo(@Param("client_id") int clientId); +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 67bf76bc9..0ce7454c9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -57,6 +57,22 @@ public class ClientRegisterInfo { private String suburb; private String postcode; private String state; + @JSONField(name = "legal_representative_person") + private String representativePerson ; + @JSONField(name = "legal_representative_phone") + private String representativePhone; + @JSONField(name = "legal_representative_email") + private String representativeEmail; + @JSONField(name = "legal_representative_job") + private String representativeJobTitle; + @JSONField(name = "registered_address") + private String registeredAddress; + @JSONField(name = "registered_suburb") + private String registeredSuburb; + @JSONField(name = "registered_postcode") + private String registeredPostcode; + @JSONField(name = "registered_state") + private String registeredState; @NotEmpty(message = "error.payment.valid.param_missing") private String country; @Pattern(regexp = "^((Australia/West)|(Australia/Eucla)|(Australia/North)|(Australia/South)|(Australia/Brisbane)|(Australia/Melbourne)|(Australia/LHI))$", message = "error.payment.valid.invalid_timezone") @@ -433,4 +449,68 @@ public class ClientRegisterInfo { public void setLakalapaysettle(String lakalapaysettle) { this.lakalapaysettle = lakalapaysettle; } + + public String getRepresentativePerson() { + return representativePerson; + } + + public void setRepresentativePerson(String representativePerson) { + this.representativePerson = representativePerson; + } + + public String getRepresentativePhone() { + return representativePhone; + } + + public void setRepresentativePhone(String representativePhone) { + this.representativePhone = representativePhone; + } + + public String getRepresentativeEmail() { + return representativeEmail; + } + + public void setRepresentativeEmail(String representativeEmail) { + this.representativeEmail = representativeEmail; + } + + public String getRegisteredAddress() { + return registeredAddress; + } + + public void setRegisteredAddress(String registeredAddress) { + this.registeredAddress = registeredAddress; + } + + public String getRegisteredSuburb() { + return registeredSuburb; + } + + public void setRegisteredSuburb(String registeredSuburb) { + this.registeredSuburb = registeredSuburb; + } + + public String getRegisteredPostcode() { + return registeredPostcode; + } + + public void setRegisteredPostcode(String registeredPostcode) { + this.registeredPostcode = registeredPostcode; + } + + public String getRegisteredState() { + return registeredState; + } + + public void setRegisteredState(String registeredState) { + this.registeredState = registeredState; + } + + public String getRepresentativeJobTitle() { + return representativeJobTitle; + } + + public void setRepresentativeJobTitle(String representativeJobTitle) { + this.representativeJobTitle = representativeJobTitle; + } } 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 71aa9360e..ce72db820 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 @@ -144,6 +144,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private ClientConfigService clientConfigService; @Resource + private SysClientLegalPersonMapper sysClientLegalPersonMapper; + @Resource private ClientDeviceMapper clientDeviceMapper; @Resource private ClientAccountMapper clientAccountMapper; @@ -469,7 +471,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("enable_gateway_version2", partnerGatewaySign.getBooleanValue("is_valid")); client.put("gateway_sign", partnerGatewaySign); } - + if (sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id")) != null) { + client.put("representativeInfo", sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id"))); + } return client; } @@ -761,6 +765,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new BadRequestException("error.partner.valid.dumplicate_client_moniker"); } + try { + JSONObject representativeInfo = new JSONObject(); + representativeInfo.put("client_id",partner.getIntValue("client_id")); + representativeInfo.put("representative_person",partner.getString("legal_representative_person")); + representativeInfo.put("phone",partner.getString("legal_representative_phone")); + representativeInfo.put("email",partner.getString("legal_representative_email")); + representativeInfo.put("job_title",partner.getString("legal_representative_job")); + representativeInfo.put("address",partner.getString("registered_address")); + representativeInfo.put("suburb",partner.getString("registered_suburb")); + representativeInfo.put("postcode",partner.getString("registered_postcode")); + representativeInfo.put("state",partner.getString("registered_state")); + sysClientLegalPersonMapper.save(representativeInfo); + System.out.println("aaaa"); + } catch (Exception e) { + throw new BadRequestException("error.partner.valid.dumplicate_client_moniker"); + } + if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) { JSONObject client_bd = new JSONObject(); client_bd.put("client_id", partner.getIntValue("client_id")); @@ -811,6 +832,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } updateInfo.put("client_id", clientId); + JSONObject representativeInfo = new JSONObject(); + representativeInfo.put("client_id",clientId); + representativeInfo.put("representative_person",info.getRepresentativePerson()); + representativeInfo.put("phone",info.getRepresentativePhone()); + representativeInfo.put("email",info.getRepresentativeEmail()); + representativeInfo.put("job_title",info.getRepresentativeJobTitle()); + representativeInfo.put("address",info.getRegisteredAddress()); + representativeInfo.put("suburb",info.getRegisteredSuburb()); + representativeInfo.put("postcode",info.getRegisteredPostcode()); + representativeInfo.put("state",info.getRegisteredState()); + + if(sysClientLegalPersonMapper.findRepresentativeInfo(clientId) != null){ + sysClientLegalPersonMapper.update(representativeInfo); + }else{ + sysClientLegalPersonMapper.save(representativeInfo); + } + int originReferrerId = client.getIntValue("referrer_id"); int updateReferrerId = Integer.parseInt(info.getReferrer_id() == null ? "0" : info.getReferrer_id()); if (originReferrerId == 0 && updateReferrerId != 0) { diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index c4ef0d3db..5ae63e109 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -414,6 +414,37 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter removeClientPayDesc($scope.partner.client_pay_desc, '20'); } }; + $scope.partner.sameAsContactPerson = false; + $scope.checkboxOnclick = function (){ + $scope.partner.sameAsContactPerson = !($scope.partner.sameAsContactPerson); + if($scope.partner.sameAsContactPerson) + { + $scope.partner.legal_representative_person = $scope.partner.contact_person; + + $scope.partner.legal_representative_phone_a = $scope.partner.contact_phone_a; + + $scope.partner.legal_representative_phone_c = $scope.partner.contact_phone_c; + + $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p; + + $scope.partner.legal_representative_email = $scope.partner.contact_email; + } + } + + $scope.partner.sameAsAddress=false; + $scope.sameAddress = function (){ + $scope.partner.sameAsAddress = !($scope.partner.sameAsAddress); + if($scope.partner.sameAsAddress) + { + $scope.partner.registered_address = $scope.partner.address; + + $scope.partner.registered_suburb = $scope.partner.suburb; + + $scope.partner.registered_postcode = $scope.partner.postcode; + + $scope.partner.registered_state = $scope.partner.state; + } + } var compare = function (x, y) { x = parseInt(x); @@ -593,6 +624,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p; $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p; + $scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p; if ($scope.partner.company_phone.indexOf(' ') != -1) { alert('Company Phone can not contain space character'); @@ -602,14 +634,26 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('Contact Phone can not contain space character'); return; } + if ($scope.partner.legal_representative_phone.indexOf(' ') != -1) { + alert('Representative phone can not contain space character'); + return; + } if ($scope.partner.contact_email.indexOf(' ') != -1) { alert('Contact email Phone can not contain space character'); return; } + if ($scope.partner.legal_representative_email.indexOf(' ') != -1) { + alert('Representative email Phone can not contain space character'); + return; + } if ($scope.partner.suburb.indexOf(' ') != -1) { alert('suburb can not contain two and more continuous space characters'); return; } + if ($scope.partner.registered_suburb.indexOf(' ') != -1) { + alert('Registered suburb can not contain two and more continuous space characters'); + return; + } if ($scope.partner.acn && $scope.partner.business_structure == 'Company') { if ($scope.partner.acn.length != 9) { alert('Acn is not valid'); @@ -1231,6 +1275,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter function ($scope, $http, $state, Upload, commonDialog, timezone, partner) { $scope.timezones = timezone.configs(); $scope.partner = partner.data; + if($scope.partner.representativeInfo != null) + { + $scope.partner.registered_address = $scope.partner.representativeInfo.address; + $scope.partner.registered_suburb = $scope.partner.representativeInfo.suburb; + $scope.partner.registered_postcode = $scope.partner.representativeInfo.postcode; + $scope.partner.registered_state = $scope.partner.representativeInfo.state; + $scope.partner.legal_representative_person = $scope.partner.representativeInfo.representative_person; + $scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone; + $scope.partner.legal_representative_email = $scope.partner.representativeInfo.email; + $scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title; + } var origin_referrer_id = angular.copy($scope.partner.referrer_id); var resetClientPayDescByTpey = function (type) { type = parseInt(type); @@ -1281,6 +1336,34 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } }; + $scope.partner.sameAsContactPerson = false; + $scope.checkboxOnclick = function (){ + $scope.partner.sameAsContactPerson = !($scope.partner.sameAsContactPerson); + if($scope.partner.sameAsContactPerson) + { + $scope.partner.legal_representative_person = $scope.partner.contact_person; + + $scope.partner.legal_representative_phone = $scope.partner.contact_phone; + + $scope.partner.legal_representative_email = $scope.partner.contact_email; + } + } + + $scope.partner.sameAsAddress=false; + $scope.sameAddress = function (){ + $scope.partner.sameAsAddress=!($scope.partner.sameAsAddress); + if($scope.partner.sameAsAddress) + { + $scope.partner.registered_address = $scope.partner.address; + + $scope.partner.registered_suburb = $scope.partner.suburb; + + $scope.partner.registered_postcode = $scope.partner.postcode; + + $scope.partner.registered_state = $scope.partner.state; + } + } + $scope.listReferrers = function () { $http.get('/sys/orgs/referrer').then(function (resp) { $scope.referrers = resp.data; @@ -2964,6 +3047,38 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // $scope.t2city_map = angular.copy(t2city_map); + $scope.partner.sameAsContactPerson = false; + $scope.checkboxOnclick = function (){ + $scope.partner.sameAsContactPerson = !($scope.partner.sameAsContactPerson); + if($scope.partner.sameAsContactPerson) + { + $scope.partner.legal_representative_person = $scope.partner.contact_person; + + $scope.partner.legal_representative_phone_a = $scope.partner.contact_phone_a; + + $scope.partner.legal_representative_phone_c = $scope.partner.contact_phone_c; + + $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p; + + $scope.partner.legal_representative_email = $scope.partner.contact_email; + } + } + + $scope.partner.sameAsAddress=false; + $scope.sameAddress = function (){ + $scope.partner.sameAsAddress=!($scope.partner.sameAsAddress); + if($scope.partner.sameAsAddress) + { + $scope.partner.registered_address = $scope.partner.address; + + $scope.partner.registered_suburb = $scope.partner.suburb; + + $scope.partner.registered_postcode = $scope.partner.postcode; + + $scope.partner.registered_state = $scope.partner.state; + } + } + $scope.timezones = timezone.configs(); $scope.states = stateMap.configs(); $scope.countries = countryMap.configs(); @@ -3007,6 +3122,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p; $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p; + $scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p; if ($scope.partner.company_phone.indexOf(' ') != -1) { alert('Company Phone can not contain space character'); diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index c7849f0c9..59013a5ea 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -669,6 +669,121 @@ Characters(including symbols and spaces)

+
+
+ +
+
+
+ +
  Legal Representative
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 20 Characters

+
+
+
+ +
+

Less + Than 2 Characters

+
+
+
+ +
+

Required + Field

+

Less + Than 11 Characters

+
+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
@@ -794,6 +909,94 @@ +
+ +
+ + +
+
  Registered Office Address
+
+
+
+ +
+ +
+

Less + Than 200 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 50 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 10 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Required + Field

+
+ +
+
+
+
+ +
+
+
@@ -807,6 +1010,7 @@
+
Location diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index 36e4cda01..51c5ecb14 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -575,6 +575,120 @@
+
+ +
+ +
+
  Legal Representative
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 20 Characters

+
+
+
+ +
+

Less + Than 2 Characters

+
+
+
+ +
+

Required + Field

+

Less + Than 11 Characters

+
+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
@@ -668,6 +782,93 @@ +
+ +
+ + +
+
  Registered Office Address
+
+
+
+ +
+ +
+

Less + Than 200 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 50 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 10 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Required + Field

+
+ +
+
+
+
+
+
+
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 e1ad38dd5..f1b9c66d8 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -732,6 +732,46 @@
+ +
+
Legal Representative
+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+ +

+
+
+
+ + +
+

+ +

+
+
+
+
+
@@ -775,6 +815,49 @@

+ + + +
+
Registered Address Information
+
+
+ +
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+
+
+
+ +
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index af6482fb8..d9ea72365 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -579,6 +579,89 @@ Characters(including symbols and spaces)

+
+ +
+
+
+ +
+
  Legal Representative
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+ +
+
+

Required Field

+

Less Than 20 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
@@ -679,6 +762,93 @@ +
+ +
+ + +
+
  Registered Office Address
+
+
+
+ +
+ +
+

Less + Than 200 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 50 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Less + Than 10 + Characters(including symbols and spaces)

+

Required + Field

+
+
+
+
+ +
+ +
+

Required + Field

+
+ +
+
+
+
+
+
+
@@ -690,6 +860,9 @@
+ + +
Location diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html index 07eb1c0e4..1dab67e54 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html @@ -7,7 +7,7 @@
- +