Merge remote-tracking branch 'origin/master'

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -842,10 +842,6 @@ public class CleanServiceImpl implements CleanService, ApplicationEventPublisher
             // 测试用地址
             // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
             // attachList);
-            // String mailId = mailService.sendEmail(title, "fazal.cader@flexewallet.com",
-            // "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com",
-            // content, attachList);
-            // todo 等fazal休假结算后恢复
             String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com",
                     "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,tommy.yang@royalpay.com.au",
                     content, attachList);

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

@@ -627,8 +627,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         // todo Velocity
         Context ctx = new Context();
         ctx.setVariable("bds", bds);
-        ctx.setVariable("credential_code", username);
         ctx.setVariable("password", pwd);
+        ctx.setVariable("username", username);
         ctx.setVariable("client_moniker", client.getString("client_moniker"));
         ctx.setVariable("contact_person", client.getString("contact_person"));
         ctx.setVariable("credential_code", client.getString("credential_code"));

src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java

@@ -183,7 +183,7 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
 
         BigDecimal realAmount = original ? fee : CurrencyAmountUtils.toAmount(fee, order.getString("currency"));
         JSONObject refundConfig = checkRefundAuditFlag();
-        if (refundConfig != null && refundConfig.size() > 0 && refundConfig.getBoolean("refundAudit")) {
+        if (partnerAccount!=null && refundConfig != null && refundConfig.size() > 0 && refundConfig.getBoolean("refundAudit")) {
             if (realAmount.compareTo(refundConfig.getBigDecimal("refundAuditAmount")) > 0) {
                 //订单需要审核
                 boolean casherRefund = reviewNewRefundOrder(orderId, realAmount, remark, partnerAccount, manager);

src/main/resources/templates/activity/one_dollar_day/merchant_detail.html

@@ -30,21 +30,21 @@
 <div class="weui_panel detail-panel">
     <div class="weui_panel_hd">
         <h3 class="title" th:text="${merchant.display_name}">
-            <a href="$merchant.pay_url" class="pay-btn">买单</a>
+            <a th:href="${merchant.pay_url}" class="pay-btn">买单</a>
         </h3>
     </div>
     <div class="weui_panel_bd">
-            <div class="address" th:if="${merchant.address!=null}" th:text="${merchant.address}"></div>
+            <div class="address" th:if="${merchant['address']!=null}" th:text="${merchant['address']}"></div>
 
-            <div class="worktime" th:if="${merchant.work_time!=null}" th:text="${merchant.work_time}"></div>
+            <div class="worktime" th:if="${merchant['work_time']!=null}" th:text="${merchant['work_time']}"></div>
             <div class="tel" th:if="${merchant.tel!=null}">
                 <span th:text="${merchant.tel}"></span>
-                <a class="tel-link" href="tel:$merchant.tel">
+                <a class="tel-link" th:href="'tel:'+${merchant.tel}">
                     <svg enable-background="new 0 0 139 139" version="1.1" viewBox="0 0 139 139" width="139px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M67.317,81.952c-9.284-7.634-15.483-17.054-18.742-22.414l-2.431-4.583c0.85-0.912,7.332-7.853,10.141-11.619  c3.53-4.729-1.588-9-1.588-9S40.296,19.933,37.014,17.076c-3.282-2.861-7.06-1.272-7.06-1.272  c-6.898,4.457-14.049,8.332-14.478,26.968C15.46,60.22,28.705,78.216,43.028,92.148c14.346,15.734,34.043,31.504,53.086,31.486  c18.634-0.425,22.508-7.575,26.965-14.473c0,0,1.59-3.775-1.268-7.06c-2.86-3.284-17.265-17.688-17.265-17.688  s-4.268-5.119-8.998-1.586c-3.525,2.635-9.855,8.496-11.38,9.917C84.171,92.749,73.582,87.104,67.317,81.952z"/></svg>
                 </a>
             </div>
     </div>
-        <div class="weui_panel_ft" th:if="${merchant.desc!=null}">
+        <div class="weui_panel_ft" th:if="${merchant['desc']!=null}">
             <span th:text="${merchant.desc}"></span>
         </div>
 </div>

src/main/resources/templates/mail/register_application.html

@@ -1,53 +0,0 @@
-<table cellpadding="0" cellspacing="0" class="email-container" align="center" width="550" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 15px; font-weight: normal; line-height: 22px; color: #444444; text-align: left; border: 1px solid rgb(177, 213, 245); border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; width: 550px;">
-    <tbody><tr>
-        <td>
-            <table cellpadding="0" cellspacing="0" class="padding" width="100%" style="padding-left: 40px; padding-right: 40px; padding-top: 30px; padding-bottom: 35px;">
-                <tbody>
-                <tr class="logo">
-                    <td align="center">
-                        <table class="logo" style="margin-bottom: 10px;">
-                            <tbody><tr>
-                                <td>
-                                    <img src="https://mpay.royalpay.com.au/static/images/logo640x640.jpg" height="100" width="100" border="0" style="display: block;">
-                                </td>
-                            </tr>
-                            </tbody></table>
-                    </td>
-                </tr>
-
-                <tr class="header">
-                    <td align="center">
-                        <h1 style="font-size: 24px; line-height: 1.3em; margin-bottom: 5px;">Register Invitation</h1>
-                    </td>
-                </tr>
-
-
-                <tr class="content">
-                    <td>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Dear Partner, </p>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Thank you for registering an account with us!</p>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">This is a system verification email from RoyalPay.  RoyalPay is an exciting platform that makes international payments as easy as local ones.
-                            To get started, click on the button below:</p>
-                    </td>
-                </tr>
-
-
-                <tr>
-                    <td align="center">
-                            <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;">
-                                <tbody><tr>
-                                    <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
-                                        <a href="$url" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Register your account right now!</strong></a>
-                                    </td>
-                                </tr>
-                                </tbody></table>
-
-                    </td>
-                </tr>
-
-
-                </tbody>
-            </table>
-        </td>
-    </tr>
-    </tbody></table>

src/main/resources/templates/mail/reset_password.html

@@ -34,11 +34,10 @@
 
                 <tr>
                     <td align="center">
-                        #foreach($item in $accounts)
                             <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;" th:each="item : ${accounts}">
                                 <tbody><tr>
                                     <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
-                                        <a href="$url" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><span th:text="${item.username}"></span><strong>, Reset Password</strong></a>
+                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><span th:text="${item.username}"></span><strong>, Reset Password</strong></a>
                                     </td>
                                 </tr>
                                 </tbody></table>

src/main/resources/templates/reports/week_report.html

@@ -123,7 +123,7 @@
                                   th:if="${report.transaction_report.melbourne.thisweek.compare.direction<0}"
                                   th:text="'↓'+${report.transaction_report.melbourne.thisweek.compare.value}"></span>
                             <span th:if="${report.transaction_report.melbourne.thisweek.compare.direction==0}"
-                                  th:text="${report.transaction_report.melbourne.thisweek.compare.value}">$report.transaction_report.melbourne.thisweek.compare.value</span>
+                                  th:text="${report.transaction_report.melbourne.thisweek.compare.value}"></span>
                         </div>
                     </div>
                 </div>
@@ -172,7 +172,7 @@
                                   th:if="${report.transaction_report.sydney.thisweek.compare.direction<0}"
                                   th:text="'↓'+${$report.transaction_report.sydney.thisweek.compare.value}"></span>
                             <span th:if="${report.transaction_report.sydney.thisweek.compare.direction==0}"
-                                  th:text="${$report.transaction_report.sydney.thisweek.compare.value}">$report.transaction_report.sydney.thisweek.compare.value</span>
+                                  th:text="${$report.transaction_report.sydney.thisweek.compare.value}"></span>
                         </div>
                     </div>
                 </div>
@@ -226,89 +226,49 @@
                 </div>
             </div>
 
-            ##
             <div class="weui-panel">
-                ##
                 <div class="weui-panel__hd">新增商户情况(Melbourne)</div>
-                ##
                 <div class="weui-panel__bd">
-                    ##
                     <div class="weui-media-box weui-media-box_small-appmsg">
-                        ##
                         <div class="weui-cells">
-                            ##
                             <div class="weui-cell"
                                  th:each="dt : ${report.new_client_report.melbourne.daily.data}">
-                                ##
                                 <div class="weui-cell__bd weui-cell_primary"
                                      th:text="${dt.datelist}"></div>
-                                ##
                                 <div class="weui-cell__ft" th:text="${dt.num}"></div>
-                                ##
                             </div>
-                            ##
                         </div>
-                        ##
                     </div>
-                    ##
                 </div>
-                ##
                 <div class="weui-panel__ft">
-                    ##
                     <div class="weui-cell">
-                        ##
                         <div class="weui-cell__bd weui-cell_primary">新增总数</div>
-                        ##
                         <div class="weui-cell__ft"
                              th:text="${report.new_client_report.melbourne.daily.total}"></div>
-                        ##
                     </div>
-                    ##
                 </div>
-                ##
             </div>
-            ##
-            ##
             <div class="weui-panel">
-                ##
                 <div class="weui-panel__hd">新增商户情况(Sydney)</div>
-                ##
                 <div class="weui-panel__bd">
-                    ##
                     <div class="weui-media-box weui-media-box_small-appmsg">
-                        ##
                         <div class="weui-cells">
-                            ##
                             <div class="weui-cell"
                                  th:each="dt : ${report.new_client_report.sydney.daily.data}">
-                                ##
                                 <div class="weui-cell__bd weui-cell_primary"
                                      th:text="${dt.datelist}"></div>
-                                ##
                                 <div class="weui-cell__ft" th:text="${dt.num}"></div>
-                                ##
                             </div>
-                            ## #end
-                            ##
                         </div>
-                        ##
                     </div>
-                    ##
                 </div>
-                ##
                 <div class="weui-panel__ft">
-                    ##
                     <div class="weui-cell">
-                        ##
                         <div class="weui-cell__bd weui-cell_primary">新增总数</div>
-                        ##
                         <div class="weui-cell__ft"
                              th:text="${report.new_client_report.sydney.daily.total}"></div>
-                        ##
                     </div>
-                    ##
                 </div>
-                ##
             </div>
 
             <div class="weui-panel">