Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

src/main/resources/templates/paynotice.html

@@ -14,13 +14,16 @@
             white-space: normal;
             word-break: break-all;
         }
+
         .weui_cell:before {
             left: 0px;
             border-top: 1px solid #10B24C;
         }
+
         .weui_cell {
             line-height: 30px;
         }
+
         .client {
             color: white;
             font-size: 20px;
@@ -31,6 +34,7 @@
             line-height: 45px;
 
         }
+
         .orderCells {
             margin: 6%;
             border: 1px solid #979797;
@@ -63,10 +67,10 @@
         <div class="weui_cell_bd weui_cell_primary">
             <p>Price</p>
         </div>
-        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['total_amount'],1,2)}]]</div>
+        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['total_amount'],1,2)}]]
         </div>
-    <div th:if="${customer!=null}">
-        <div class="weui_cell">
+    </div>
+    <div class="weui_cell" th:if="${customer!=null}">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Customer</p>
         </div>
@@ -74,19 +78,22 @@
             <img data-th-src="@{${customer['headimg']}}" class="headimg"> <span th:text="${customer.nickname}"></span>
         </div>
     </div>
-    </div>
     <div class="weui_cell">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Customer Paid</p>
         </div>
-        <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['customer_payment_amount'],1,2)}]]</div>
+        <div class="weui_cell_ft">[[${order['currency']}]]
+            [[${#numbers.formatDecimal(order['customer_payment_amount'],1,2)}]]
+        </div>
     </div>
     <div th:if="${order.coupon_payment_amount>0}">
         <div class="weui_cell">
             <div class="weui_cell_bd weui_cell_primary">
                 <p>RoyalPay Subsidies</p>
             </div>
-            <div class="weui_cell_ft">[[${order['currency']}]] [[${#numbers.formatDecimal(order['coupon_payment_amount'],1,2)}]]</div>
+            <div class="weui_cell_ft">[[${order['currency']}]]
+                [[${#numbers.formatDecimal(order['coupon_payment_amount'],1,2)}]]
+            </div>
         </div>
     </div>
 
@@ -96,13 +103,11 @@
         </div>
         <div class="weui_cell_ft" th:text="${order.order_description}"></div>
     </div>
-    <div th:if="${order.order_detail!=null} and ${order.order_detail!=''}">
-        <div class="weui_cell">
+    <div class="weui_cell" th:if="${order['order_detail']!=null} and ${order.order_detail}!=''">
         <div class="weui_cell_bd weui_cell_primary">
             <p>Remark</p>
         </div>
-            <div class="weui_cell_ft" th:text="${order.order_detail}"></div>
-        </div>
+        <div class="weui_cell_ft" th:text="${order['order_detail']}"></div>
     </div>
     <div class="weui_cell">
         <div class="weui_cell_bd weui_cell_primary">