master
taylor.dang 4 years ago
parent 36f3026922
commit 408650c599

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.58</version> <version>2.3.59</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

@ -154,7 +154,7 @@
<div class="divcontent"> <div class="divcontent">
<div class="divcontent_left"> <div class="divcontent_left">
<img src="https://mpay.royalpay.com.au/static/images/rp_logo.png" alt="" height="100px"/> <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/> <br/>
<span>Tunnel Show Pty Ltd trading as RoyalPay</span><br/> <span>Tunnel Show Pty Ltd trading as RoyalPay</span><br/>
<span>ABN 16 601 619 685</span><br/> <span>ABN 16 601 619 685</span><br/>
@ -192,8 +192,10 @@
<span>Date/Time</span> <span>Date/Time</span>
</div> </div>
<div class="divinvoiceItem" style="width: 22%"> <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>
<div class="divinvoiceItem" style="width: 10%"> <div class="divinvoiceItem" style="width: 10%">
<span>Debit</span> <span>Debit</span>
@ -221,6 +223,9 @@
<div class="divinvoiceItem" style="width: 16%"> <div class="divinvoiceItem" style="width: 16%">
<span th:text="${invoicedata.transaction_time}?:'-'"></span> <span th:text="${invoicedata.transaction_time}?:'-'"></span>
</div> </div>
<div class="divinvoiceItem" style="width: 22%">
<span th:text="${invoicedata.client_order_id}?:'-'"></span>
</div>
<div class="divinvoiceItem" style="width: 22%"> <div class="divinvoiceItem" style="width: 22%">
<span th:text="${invoicedata.order_id}?:'-'"></span> <span th:text="${invoicedata.order_id}?:'-'"></span>

Loading…
Cancel
Save