Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.10</version>
+    <version>2.3.15</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -7059,7 +7059,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject legalInfo = sysClientLegalPersonMapper.findRepresentativeInfo(clientId);
         JSONObject upayProfileInfo = sysClientUpayProfileMapper.findInfo(clientId);
         JSONObject info = new JSONObject();
-        info.put("down_date", formatter.print(new DateTime()));//下载文件日期
+        info.put("down_date", formatter.print(new DateTime()));//下载文件日
+        info.put("letter_offer_sub_time",currentRate.getDate("active_time"));
         info.put("bussiness_name", (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " " + client.getString("abn"));//商圈类型
         info.put("partner_address", client.getString("address"));//商家店铺地址
         info.put("partner_country", client.getString("country"));//国家

src/main/ui/static/payment/partner/templates/partner_bankaccounts.html

@@ -297,11 +297,12 @@
                     <td style="text-align: center">
                         <a role="button" ng-click="editRate(rate)" style="padding-right: 10px;"
                            ng-if="'011'|withRole"><i class="fa fa-edit"></i></a>
-                        <span ng-if="rate.active=='1' && rate.current=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')">
-                        <span style="color: orange">(Promotional Offer)</span>
-                        <a class="fa fa-cloud-download" target="_blank"
-                           ng-href="/sys/partners/{{partner.client_moniker}}/export/aggregate/card_promotion_agree_pdf?rateid={{rate.client_rate_id}}"></a>
-                              </span>
+                        <span ng-if="rate.active=='1' && rate.current=='1' && (bankCtrl.rate_name=='rpaypmt_card' ||bankCtrl.rate_name=='rpaypmt_dd')
+                        && partner.upay_approve_result!=1 && partner.upay_approve_result">
+                            <span style="color: orange">(Promotional Offer)</span>
+                            <a class="fa fa-cloud-download" target="_blank"
+                               ng-href="/sys/partners/{{partner.client_moniker}}/export/aggregate/card_promotion_agree_pdf?rateid={{rate.client_rate_id}}"></a>
+                        </span>
                     </td>
                 </tr>
                 </tbody>

src/main/ui/static/templates/payment/v1/card_pay.js

@@ -16,7 +16,7 @@ $(function () {
                     let form = $('<form></form>').attr('action', threeDsParams.acs_url).attr('method', 'post').css('display', 'none');
                     $('<input>').attr('name', 'paReq').val(threeDsParams.pa_req).attr('type', 'hidden').appendTo(form);
                     $('<input>').attr('name', 'TermURL').val(threeDsParams.term_url).attr('type', 'hidden').appendTo(form);
-                    $(body).append(form);
+                    $('body').append(form);
                     form.commit();
                     return;
                 }