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 e469de03d..eb3072085 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 @@ -3298,10 +3298,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new BadRequestException("Please check the information is uploaded completely"); } String[] fileKeys = {"client_bank_file", "client_company_file", "client_id_file", "client_agree_file"}; - for (String fileKey : fileKeys) { + String[] fileNames = {"bank statement", "Certificate of Registration", "ID", "Agreement"}; + for (int i = 0; i < fileKeys.length; i++) { + String fileKey = fileKeys[i]; if (clientAllAuthFiles.stream().noneMatch(fileJson -> fileKey.equals(fileJson.getString("file_name")))) { - throw new BadRequestException("Please check the information is uploaded completely"); + if ("client_agree_file".equals(fileKey)) { + throw new BadRequestException("Please check that the agreement has been signed"); + }else { + throw new BadRequestException("Please check the " + fileNames[i] + " is uploaded completely"); + } } + } if ("app".equals(source.toLowerCase())) { sourceEnum = 1; diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index fdbd35fca..ca2c9e3cc 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -37,13 +37,16 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo return $http.get('/client/partner_info/compliance/files'); }] } - }).state('basic.compliance_to_perfect', { + }).state('compliance_to_perfect', { url: '/compliance_to_perfect', templateUrl: '/static/payment/partner/templates/client_compliance_to_perfect.html', controller: 'clientCommitToComplianceFilesCtrl', resolve: { file: ['$http', function ($http) { return $http.get('/client/partner_info/compliance/clientViewFiles'); + }], + partner: ['$http', function ($http) { + return $http.get('/client/partner_info'); }] } }).state('compliance_contract', { @@ -763,9 +766,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo } }; }]); - app.controller('clientCommitToComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file) { - + app.controller('clientCommitToComplianceFilesCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', 'file','partner', function ($scope, $http, $rootScope, commonDialog, $state, Upload, file, partner) { $scope.file = file.data || {}; + $scope.partner = partner.data || {}; //audit files $scope.uploadBankFile = function (file) { if (file != null) { @@ -1041,7 +1044,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo content: "错误原因:" + resp.data.message + ",请联系BD或客服", type: 'error' }); - var url = $state.href('basic.compliance_to_perfect'); + var url = $state.href('compliance_to_perfect'); window.open(url); }) }; @@ -1095,7 +1098,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo document.getElementById('loading').style.display = "none"; document.getElementById('loading_logo').style.display = "none"; delete $scope.logoProgress; - $state.go('basic.compliance_to_perfect', {reload: true}); + $state.go('compliance_to_perfect', {reload: true}); window.open(resp.data.file_value, '_blank'); }, function (resp) { delete $scope.logoProgress; diff --git a/src/main/ui/static/payment/partner/partner_compliance.js b/src/main/ui/static/payment/partner/partner_compliance.js index 16cad4f56..f60cd70f7 100644 --- a/src/main/ui/static/payment/partner/partner_compliance.js +++ b/src/main/ui/static/payment/partner/partner_compliance.js @@ -60,10 +60,15 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.partner = $scope.file.client; $scope.passPartnerComplianceFiles = function () { - $http.put('/compliance/audit/'+$scope.file.client.client_id+'/pass/complianceFile',{}).then(function (resp) { - $state.reload(); - }, function (resp) { - commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + commonDialog.confirm({ + title: 'Confirm!', + content: '确认是否通过商户合规文件？' + }).then(function () { + $http.put('/compliance/audit/'+$scope.file.client.client_id+'/pass/complianceFile',{}).then(function (resp) { + $state.reload(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) }) } 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 7afc97bed..784dc06fb 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 @@ -3,176 +3,198 @@ width: 100%; } -
-
Audit Files     - -

Under Review -

Review The Success -

-

{{file.client_refuse_reason}}

-
-
-
-
- -
-
- -
- - - - - - - - - -
1 - - - -
+ --> + + + + + + + +
1 + + + +
-
-
-
-

Example：请保证图片信息清晰可见,如下图

+
+
+
+

Example：请保证图片信息清晰可见,如示例 -

+

+
-
- -
-
- -
- - - +
+ +
+
+ +
+ + +
+ -
1 - + - +
-
-
-
-
-

Example：公司请提供以下文件图片

+ + +
+
+
+
+

Example：公司请提供以下文件图片,如示例 - -

-
-

sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传

+

+ +

sole trade（个体户),partnership（合伙）,trust（信托）请在http://abr.business.gov.au，将查询结果截图上传 -

+

+
-
- -
-
- -
- - - - - - - - -
1 - - - -
+
+ +
+
+
-
-
-
-

Example：请保证图片(护照或驾照)信息清晰可见,如下图

- + + + + + + + + +
1 + + + +
+
+
+
+
+

Example：请保证图片(护照或驾照)信息清晰可见,如示例 + -

-
-
-
- -
+

+
-
-
- -
-
- Resign The Contract - - Sign The Contract - - - - - - - -
1 - - - -
-
- -
-
-
-

Example：请保证图片信息清晰可见,如下图

- -
+
+
+ +
+
+ Resign The Contract + + Sign The Contract + + + + + + + + +
1 + + + +
- +
+
+
+
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 2854f7867..5752a88ec 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -53,10 +53,6 @@ Compliance files -
  • - Compliance Files -
    • -
    diff --git a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html index 1a6fe8ba3..aae5610bc 100644 --- a/src/main/ui/static/payment/partner/templates/compliance_files_advice.html +++ b/src/main/ui/static/payment/partner/templates/compliance_files_advice.html @@ -23,7 +23,7 @@

    Dear RoyalPay Merchants:

    RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. To ensure - your business is fully compliant, we require certain documents from you by the 1st of October. If you believe + your business is fully compliant, we require certain documents from you by the 30st of September. If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible.


    RoyalPay皇家支付商户合规文件补充通知

    尊敬的RoyalPay商户：

    -

    应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月01日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。

    +

    应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年9月30日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。


    RoyalPay客服与技术支持在此期间将竭诚为您服务，如有疑问或需帮助，请拨打我们的客服电话：1300 107 750或添加RoyalPay官方客服号：royalpay_1

    - 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 fe9e61f81..5f6e94a85 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 @@ -130,7 +130,7 @@
    - +
    diff --git a/src/main/ui/static/payment/partner/templates/refuse_reason.html b/src/main/ui/static/payment/partner/templates/refuse_reason.html index 73806221f..88e379158 100644 --- a/src/main/ui/static/payment/partner/templates/refuse_reason.html +++ b/src/main/ui/static/payment/partner/templates/refuse_reason.html @@ -7,8 +7,8 @@
    - -
    + +