From 408650c599244858a1d117d0f7e0f2c570e4557c Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@geekforbest.com>
Date: Fri, 14 Aug 2020 16:01:38 +0800
Subject: [PATCH] invoice

---
 pom.xml                                       |  2 +-
 src/main/resources/templates/app/invoice.html | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae1dcea8e..77f11443e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.58</version>
+    <version>2.3.59</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/templates/app/invoice.html b/src/main/resources/templates/app/invoice.html
index 35ab771a2..3db7b3dd8 100644
--- a/src/main/resources/templates/app/invoice.html
+++ b/src/main/resources/templates/app/invoice.html
@@ -154,7 +154,7 @@
 <div class="divcontent">
     <div class="divcontent_left">
         <img src="https://mpay.royalpay.com.au/static/images/rp_logo.png" alt=""  height="100px"/>
-        <img th:if="${orgInfo.logo!='none'}" th:src="${orgInfo.logo}" width="100px" height="100px" style="padding-left: 10px"/>
+        <img th:if="${orgInfo.logo!='none'}" th:src="${orgInfo.logo}" width="150px" height="100px" style="padding-left: 10px"/>
         <br/>
         <span>Tunnel Show Pty Ltd trading as RoyalPay</span><br/>
         <span>ABN 16 601 619 685</span><br/>
@@ -192,8 +192,10 @@
         <span>Date/Time</span>
     </div>
     <div class="divinvoiceItem" style="width: 22%">
-        <span>Transaction ID</span>
-
+        <span>Client Order ID</span>
+    </div>
+    <div class="divinvoiceItem" style="width: 22%">
+        <span>Order ID</span>
     </div>
     <div class="divinvoiceItem" style="width: 10%">
         <span>Debit</span>
@@ -221,6 +223,9 @@
         <div class="divinvoiceItem" style="width: 16%">
             <span th:text="${invoicedata.transaction_time}?:'-'"></span>
         </div>
+        <div class="divinvoiceItem" style="width: 22%">
+            <span th:text="${invoicedata.client_order_id}?:'-'"></span>
+        </div>
         <div class="divinvoiceItem" style="width: 22%">
             <span th:text="${invoicedata.order_id}?:'-'"></span>