Merge branch 'mail' into develop

7 years ago · 5779c9c1d6
parent 8d08151728 2e4bf7f332
commit 5779c9c1d6
2 changed files with 12 additions and 3 deletions
--- 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
@ -734,6 +734,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
        ctx.setVariable("client_moniker", client.getString("client_moniker"));
        ctx.setVariable("contact_person", client.getString("contact_person"));
        ctx.setVariable("credential_code", client.getString("credential_code"));
+        ctx.setVariable("short_name", client.getString("short_name"));
        final String content = thymeleaf.process("mail/new_client_notice", ctx);
        // final String content = VelocityEngineUtils.mergeTemplateIntoString(null, "mail/new_client_notice.vm",
        // "utf-8", model);
--- a/src/main/resources/templates/mail/new_client_notice.html
+++ b/src/main/resources/templates/mail/new_client_notice.html
@ -1,5 +1,5 @@
 <html xmlns:th="http://www.thymeleaf.org" lang="zh">
-<h4>Dear Merchant :</h4>
+<h4>Dear <span th:text="${short_name}"></span> :</h4>
 <p>I'm happy to let you know that your RoyalPay Cross-border Payment account has been set up.<br>
    很高兴通知您，贵司RoyalPay跨境全支付已经开通</p>

@ -33,9 +33,17 @@
 </ul>
 <p>Please find the User Guide here :<a
        href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf" target="_blank">User
-    Guide</a></p>
+    Guide for PC</a> or
+    <a
+            href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf" target="_blank">User
+        Guide for APP</a>
+</p>
 <p>您可以点击链接下载用户手册:<a href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf"
-                    target="_blank">用户手册</a></p>
+                    target="_blank">PC用户手册</a> 、
+    <a href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf"
+       target="_blank">APP用户手册</a>
+</p>
+
 <p>(If you cannot open the link above, you can copy and paste this url to your browser.
    如果您无法点击上面的链接，可以复制当前url到浏览器地址栏
    <b>https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf</b>)</p>