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

src/main/resources/templates/paynotice.html

@@ -9,36 +9,40 @@
     <link rel="stylesheet" href="/static/templates/payment/payment.css?t=201608312202">
     <script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=20170313"></script>
     <style type="text/css">
-        .weui_cell_ft{
-            max-width:60%;
+        .weui_cell_ft {
+            max-width: 60%;
             white-space: normal;
             word-break: break-all;
         }
-        .weui_cell:before{
+
+        .weui_cell:before {
             left: 0px;
-            border-top:1px solid #10B24C;
+            border-top: 1px solid #10B24C;
         }
-        .weui_cell{
+
+        .weui_cell {
             line-height: 30px;
         }
-        .client{
+
+        .client {
             color: white;
             font-size: 20px;
             font-family: Helvetica;
-            font-weight:bold;
+            font-weight: bold;
             text-align: center;
-            background-color:#10B24C;
+            background-color: #10B24C;
             line-height: 45px;
 
         }
-        .orderCells{
+
+        .orderCells {
             margin: 6%;
             border: 1px solid #979797;
             border-radius: 20px;
             overflow: hidden;
         }
 
-        .headimg{
+        .headimg {
             width: 30px;
             border-radius: 50%;
         }
@@ -49,10 +53,10 @@
 <div class="logo-box">
     <div class="row">
         <div th:if="${client.logo_url!=null} and ${client.logo_url!=''}">
-          <img  data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo" style="max-height: 120px;">
+            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo" style="max-height: 120px;">
         </div>
         <div th:if="${client.logo_url==null} or ${client.logo_url==''}">
-        <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo" style="max-height: 120px;">
+            <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo" style="max-height: 120px;">
         </div>
     </div>
 
@@ -63,30 +67,33 @@
         <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>
-    <div th:if="${customer!=null}">
-        <div class="weui_cell">
-            <div class="weui_cell_bd weui_cell_primary">
-                <p>Customer</p>
-            </div>
-            <div class="weui_cell_ft weui_cell_primary">
-                <img data-th-src="@{${customer['headimg']}}" class="headimg"> <span th:text="${customer.nickname}"></span>
-            </div>
+    <div class="weui_cell" th:if="${customer!=null}">
+        <div class="weui_cell_bd weui_cell_primary">
+            <p>Customer</p>
+        </div>
+        <div class="weui_cell_ft weui_cell_primary">
+            <img data-th-src="@{${customer['headimg']}}" class="headimg"> <span th:text="${customer.nickname}"></span>
         </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_bd weui_cell_primary">
-                <p>Remark</p>
-            </div>
-            <div class="weui_cell_ft" th:text="${order.order_detail}"></div>
+    <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">
         <div class="weui_cell_bd weui_cell_primary">