From ac7a0c66a0d0bf9ac7c3c16e93472ed9bbcfc8a5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 30 Apr 2020 14:21:56 +0800
Subject: [PATCH 1/2] fix bd

---
 pom.xml                                                       | 2 +-
 .../payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5a0a9a2e..d149ee9c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.23</version>
+    <version>2.2.24</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
index 24cb9145d..a138e9149 100644
--- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
@@ -501,8 +501,8 @@ public class BDPrizeServiceImpl implements BDPrizeService {
     @Override
     public void updateBdKpiConfig(List<JSONObject> configs, JSONObject manager) throws ParseException {
         for (JSONObject config : configs){
-            config.put("LAST_UPDATE_DATE", new Date());
-            config.put("LAST_UPDATE_BY", manager.getString("display_name"));
+            config.put("last_update_date", new Date());
+            config.put("last_update_by", manager.getString("display_name"));
             financialBDConfigMapper.updateBDConfig(config);
         }
     }

From a366651127be76207e039d33226ac57ba3b496fe Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 30 Apr 2020 14:23:15 +0800
Subject: [PATCH 2/2] fix bd

---
 .../templates/partner_cp_auth_files.html      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 dfadd53f3..10454f48d 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
@@ -15,7 +15,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                    <button class="btn btn-primary" type="button"
                             ngf-select="uploadBankFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -33,7 +33,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 ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                            <button 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>
@@ -53,7 +53,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                    <button class="btn btn-primary" type="button"
                             ngf-select="uploadCompanyFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -68,7 +68,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                        <button class="btn btn-danger" 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>
@@ -95,7 +95,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                    <button class="btn btn-primary" type="button"
                             ngf-select="uploadIDFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -112,7 +112,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                            <button class="btn btn-danger" 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>
@@ -236,7 +236,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                        <button class="btn btn-primary" type="button"
                                 ngf-select="uploadAgreementFile($file)">
                             <i class="fa fa-upload"></i> Upload
                         </button>
@@ -252,7 +252,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                                <button class="btn btn-danger" 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>
@@ -273,7 +273,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                        <button class="btn btn-primary" type="button"
                                 ngf-select="uploadApplyFile($file)">
                             <i class="fa fa-upload"></i> Upload
                         </button>
@@ -289,7 +289,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                                <button class="btn btn-danger" 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>
@@ -309,7 +309,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                    <button class="btn btn-primary" type="button"
                             ngf-select="uploadBillFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -328,7 +328,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" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==2 || partner.approve_result==5 || partner.approve_result==4))"
+                            <button class="btn btn-danger" type="button"
                                     ng-click="deleteComplianceFiles(file_src.file_id)">
                                 X
                             </button>