From 6ec6235ce0859f69c8864d1908ad6e9707a6e520 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Wed, 17 Oct 2018 13:37:58 +0800
Subject: [PATCH] update

---
 .../templates/mail/risk_upload_mail.html      |  6 ++---
 .../analysis/templates/audit_material.html    | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html
index e4208893f..24b1c62a3 100644
--- a/src/main/resources/templates/mail/risk_upload_mail.html
+++ b/src/main/resources/templates/mail/risk_upload_mail.html
@@ -19,9 +19,9 @@
         <tbody>
         <tr th:each="order : ${orders}">
             <td th:text="${order.order_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
-            <td th:text="${order.total_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
-            <td th:text="${order.display_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
-            <td th:text="${order.clearing_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
+            <td th:text="${order.currency}+${order.total_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
+            <td th:text="${order.currency}+${order.display_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
+            <td th:text="AUD+${order.clearing_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.exchange_rate}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.status}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.create_time}" style="border: 1.0px solid;border-collapse: collapse;"></td>
diff --git a/src/main/ui/static/analysis/templates/audit_material.html b/src/main/ui/static/analysis/templates/audit_material.html
index e4a462ad2..e1d30603a 100644
--- a/src/main/ui/static/analysis/templates/audit_material.html
+++ b/src/main/ui/static/analysis/templates/audit_material.html
@@ -16,23 +16,26 @@
     </div>
     <div class="panel-body">
         <div class="form-vertical">
-            <div class="form-group" ng-repeat="(key, value) in fileObject">
-                <label class="control-label col-sm-2">{{key}}</label>
-                <div class="col-sm-4">
-                    <div class="form-control-static">
-                        <a ng-if="value" target="_blank" ng-href="{{value}}">
-                            <img ng-src="{{value}}" class="col-sm-8"></a>
-                    </div>
-                </div>
-            </div>
             <div class="form-group">
                 <label class="control-label col-sm-2">Description:</label>
                 <div class="col-sm-8">
                     <div class="form-control-static">
-                       <p ng-bind="description"></p>
+                        <p ng-bind="description"></p>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group" ng-repeat="(key, value) in fileObject">
+                <div class="col-sm-12">
+                    <label class="control-label col-sm-2">{{key}}</label>
+                    <div class="col-sm-4">
+                        <div class="form-control-static">
+                            <a ng-if="value" target="_blank" ng-href="{{value}}">
+                                <img ng-src="{{value}}" class="col-sm-8"></a>
+                        </div>
                     </div>
                 </div>
             </div>
+
         </div>
     </div>
 </div>