From d3ccf5f984f458c20dfadc80e5c36840df8f7823 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 28 Apr 2020 17:54:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add=20=E5=90=88=E8=A7=84=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/partner_cp_auth_files.html      | 24 +++++++++----------
 .../templates/partner_mw_auth_files.html      | 22 ++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html b/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
index 2c927ce0e..25b334899 100644
--- a/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
+++ b/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
@@ -112,7 +112,7 @@
             <label class="control-label col-sm-2">* bank statement</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -130,7 +130,7 @@
                         <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'">
                         </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>
                         </td>
                     </tr>
@@ -152,7 +152,7 @@
             <label class="control-label col-sm-2">* Certificate of Registration</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -167,7 +167,7 @@
                     <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'">
                     </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>
                     </td>
                 </tr>
@@ -194,7 +194,7 @@
             <label class="control-label col-sm-2">* ID </label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -210,7 +210,7 @@
                         <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'">
                         </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>
                         </td>
                     </tr>
@@ -238,7 +238,7 @@
                 <label class="control-label col-sm-2">* Agreement</label>
                 <div class="col-sm-4">
                     <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)">
                             <i class="fa fa-upload"></i> Upload
                         </button>
@@ -254,7 +254,7 @@
                             <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'">
                             </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>
                             </td>
                         </tr>
@@ -275,7 +275,7 @@
                 <label class="control-label col-sm-2">Application Form(optional)</label>
                 <div class="col-sm-4">
                     <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)">
                             <i class="fa fa-upload"></i> Upload
                         </button>
@@ -291,7 +291,7 @@
                             <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'">
                             </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>
                             </td>
                         </tr>
@@ -311,7 +311,7 @@
             <label class="control-label col-sm-2"> Utility Bill Files</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -330,7 +330,7 @@
                             <img ng-src="{{file_src.file_value}}" class="col-sm-8"
                                  onerror="this.src='/static/images/file_close.png'">
                         </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)">
                                 X
                             </button>
diff --git a/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html b/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
index d5f0666a5..f522ad69f 100644
--- a/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
+++ b/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
@@ -69,7 +69,7 @@
             <label class="control-label col-sm-2">* Application Form | 商户申请表</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -86,7 +86,7 @@
             <label class="control-label col-sm-2">* Six Months Bank Statement | 六个月银行对账单</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -103,7 +103,7 @@
             <label class="control-label col-sm-2">* ASIC Current Company Extract | ASIC 当前公司信息摘录</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -120,7 +120,7 @@
             <label class="control-label col-sm-2">* ID of Legal Representative ｜ 法人身份证明</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -137,7 +137,7 @@
             <label class="control-label col-sm-2">* Proof of Residential Address (One Utilities Bill) | 家庭住址证明 （一个水电煤网账单）</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -154,7 +154,7 @@
             <label class="control-label col-sm-2">* Refund and Exchange Policy | 退款和换货政策</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -171,7 +171,7 @@
             <label class="control-label col-sm-2">* Privacy Policy | 隐私政策</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -188,7 +188,7 @@
             <label class="control-label col-sm-2">* Card information Security Policy | 卡信息安全政策</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -205,7 +205,7 @@
             <label class="control-label col-sm-2">* Letter of Offer | 邀约信 </label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -222,7 +222,7 @@
             <label class="control-label col-sm-2">* Promotional Offer | 优惠费率信 </label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -239,7 +239,7 @@
             <label class="control-label col-sm-2">* Terms and Conditions | 条款</label>
             <div class="col-sm-4">
                 <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)">
                         <i class="fa fa-upload"></i> Upload
                     </button>

From 0984e606e29549cc81fd1db1cddb2f1dc690703e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 28 Apr 2020 17:55:30 +0800
Subject: [PATCH 2/2] fix common

---
 src/main/resources/application-common.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application-common.yml b/src/main/resources/application-common.yml
index f508af2eb..238e4f272 100644
--- a/src/main/resources/application-common.yml
+++ b/src/main/resources/application-common.yml
@@ -64,7 +64,7 @@ spring:
     time-between-eviction-runs-millis: 500
     validation-query: select 1
   mail:
-    host: smtp.o11ffice365.com
+    host: smtp.office365.com
     port: 587
   thymeleaf:
     mode: HTML