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

Merge branch 'develop-card-compliance' of https://pms.globalfreepay.com/source/royalpay.manage into develop-card-compliance

Browse Source
master
dulingling 5 years ago
parent 3b84cf18b6 0984e606e2
commit 884f05fa51
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
src/main/resources/application-common.yml
Unescape View File

@ -64,7 +64,7 @@ spring:
time-between-eviction-runs-millis: 500 time-between-eviction-runs-millis: 500
validation-query: select 1 validation-query: select 1
mail: mail:
host: smtp.o11ffice365.com host: smtp.office365.com
port: 587 port: 587
thymeleaf: thymeleaf:
mode: HTML mode: HTML

24
src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
Unescape View File

@ -112,7 +112,7 @@
<label class="control-label col-sm-2">* bank statement</label> <label class="control-label col-sm-2">* bank statement</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadBankFile($file)"> ngf-select="uploadBankFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -130,7 +130,7 @@
<td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}"> <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'"> <img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button> <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
<a role="button" download="" target="_blank" class="btn-group btn btn-warning" type="button" href="{{file_src.file_value}}" ><i class="fa fa-download"></i></a> <a role="button" download="" target="_blank" class="btn-group btn btn-warning" type="button" href="{{file_src.file_value}}" ><i class="fa fa-download"></i></a>
</td> </td>
</tr> </tr>
@ -152,7 +152,7 @@
<label class="control-label col-sm-2">* Certificate of Registration</label> <label class="control-label col-sm-2">* Certificate of Registration</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadCompanyFile($file)"> ngf-select="uploadCompanyFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -167,7 +167,7 @@
<td><a ng-if="companyIsImage" target="_blank" ng-href="{{file_src.file_value}}"> <td><a ng-if="companyIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'"> <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button> <button class="btn btn-danger" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank" ><i class="fa fa-download"></i></a> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank" ><i class="fa fa-download"></i></a>
</td> </td>
</tr> </tr>
@ -194,7 +194,7 @@
<label class="control-label col-sm-2">* ID </label> <label class="control-label col-sm-2">* ID </label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadIDFile($file)"> ngf-select="uploadIDFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -210,7 +210,7 @@
<td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}"> <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'"> <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button> <button class="btn btn-danger" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a>
</td> </td>
</tr> </tr>
@ -238,7 +238,7 @@
<label class="control-label col-sm-2">* Agreement</label> <label class="control-label col-sm-2">* Agreement</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadAgreementFile($file)"> ngf-select="uploadAgreementFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -254,7 +254,7 @@
<td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}"> <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'"> <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button> <button class="btn btn-danger" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a>
</td> </td>
</tr> </tr>
@ -275,7 +275,7 @@
<label class="control-label col-sm-2">Application Form(optional)</label> <label class="control-label col-sm-2">Application Form(optional)</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadApplyFile($file)"> ngf-select="uploadApplyFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -291,7 +291,7 @@
<td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}"> <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
<img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'"> <img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button> <button class="btn btn-danger" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
<a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a>
</td> </td>
</tr> </tr>
@ -311,7 +311,7 @@
<label class="control-label col-sm-2"> Utility Bill Files</label> <label class="control-label col-sm-2"> Utility Bill Files</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ngf-select="uploadBillFile($file)"> ngf-select="uploadBillFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -330,7 +330,7 @@
<img ng-src="{{file_src.file_value}}" class="col-sm-8" <img ng-src="{{file_src.file_value}}" class="col-sm-8"
onerror="this.src='/static/images/file_close.png'"> onerror="this.src='/static/images/file_close.png'">
</a> </a>
<button class="btn btn-danger" type="button" <button class="btn btn-danger" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5))"
ng-click="deleteComplianceFiles(file_src.file_id)"> ng-click="deleteComplianceFiles(file_src.file_id)">
X X
</button> </button>

22
src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
Unescape View File

@ -69,7 +69,7 @@
<label class="control-label col-sm-2">* Application Form | 商户申请表</label> <label class="control-label col-sm-2">* Application Form | 商户申请表</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadApplicationFile($file)"> ngf-select="uploadApplicationFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -86,7 +86,7 @@
<label class="control-label col-sm-2">* Six Months Bank Statement | 六个月银行对账单</label> <label class="control-label col-sm-2">* Six Months Bank Statement | 六个月银行对账单</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadBankFile($file)"> ngf-select="uploadBankFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -103,7 +103,7 @@
<label class="control-label col-sm-2">* ASIC Current Company Extract | ASIC 当前公司信息摘录</label> <label class="control-label col-sm-2">* ASIC Current Company Extract | ASIC 当前公司信息摘录</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadASICFile($file)"> ngf-select="uploadASICFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -120,7 +120,7 @@
<label class="control-label col-sm-2">* ID of Legal Representative ｜ 法人身份证明</label> <label class="control-label col-sm-2">* ID of Legal Representative ｜ 法人身份证明</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadIdFile($file)"> ngf-select="uploadIdFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -137,7 +137,7 @@
<label class="control-label col-sm-2">* Proof of Residential Address (One Utilities Bill) | 家庭住址证明 （一个水电煤网账单）</label> <label class="control-label col-sm-2">* Proof of Residential Address (One Utilities Bill) | 家庭住址证明 （一个水电煤网账单）</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadResidenceFile($file)"> ngf-select="uploadResidenceFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -154,7 +154,7 @@
<label class="control-label col-sm-2">* Refund and Exchange Policy | 退款和换货政策</label> <label class="control-label col-sm-2">* Refund and Exchange Policy | 退款和换货政策</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadRefundPolicyFile($file)"> ngf-select="uploadRefundPolicyFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -171,7 +171,7 @@
<label class="control-label col-sm-2">* Privacy Policy | 隐私政策</label> <label class="control-label col-sm-2">* Privacy Policy | 隐私政策</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadPrivacyPolicyFile($file)"> ngf-select="uploadPrivacyPolicyFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -188,7 +188,7 @@
<label class="control-label col-sm-2">* Card information Security Policy | 卡信息安全政策</label> <label class="control-label col-sm-2">* Card information Security Policy | 卡信息安全政策</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadCardPolicyFile($file)"> ngf-select="uploadCardPolicyFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -205,7 +205,7 @@
<label class="control-label col-sm-2">* Letter of Offer | 邀约信 </label> <label class="control-label col-sm-2">* Letter of Offer | 邀约信 </label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadLetterOfOfferFile($file)"> ngf-select="uploadLetterOfOfferFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -222,7 +222,7 @@
<label class="control-label col-sm-2">* Promotional Offer | 优惠费率信 </label> <label class="control-label col-sm-2">* Promotional Offer | 优惠费率信 </label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadPromotionalFile($file)"> ngf-select="uploadPromotionalFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>
@ -239,7 +239,7 @@
<label class="control-label col-sm-2">* Terms and Conditions | 条款</label> <label class="control-label col-sm-2">* Terms and Conditions | 条款</label>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-control-static"> <div class="form-control-static">
<button class="btn btn-primary" type="button" <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5))"
ngf-select="uploadTermsFile($file)"> ngf-select="uploadTermsFile($file)">
<i class="fa fa-upload"></i> Upload <i class="fa fa-upload"></i> Upload
</button> </button>

Write Preview
Loading…
Cancel
Save