diff --git a/pom.xml b/pom.xml index ea0946545..eea844940 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.22 + 2.3.23 UTF-8 2.3.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 08d6f8583..8f2f32e14 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -779,6 +779,7 @@ public class TradeLogServiceImpl implements TradeLogService { ) { List dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class); JSONObject parmerters = new JSONObject(); + parmerters.put("records",dataList.size()); parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom()) ? DateFormatUtils.format(DateUtils.parseDate(query.getDatefrom(), "yyyyMMdd"), "dd/MM/yyyy") : ""); parmerters.put("dateTo", diff --git a/src/main/resources/templates/app/invoice.html b/src/main/resources/templates/app/invoice.html index 73555826b..575ea05db 100644 --- a/src/main/resources/templates/app/invoice.html +++ b/src/main/resources/templates/app/invoice.html @@ -25,7 +25,7 @@ } .divcontent_left { - width: 50%; + width: 48%; height: auto; text-align: left; float: left; @@ -35,7 +35,18 @@ } .divcontent_right { - width: 50%; + width: 52%; + height: auto; + float: right; + text-align: left; + white-space: normal; + word-break: break-all; + word-wrap: break-word; + } + + .divfoot_right { + line-height: 30px; + width: 60%; height: auto; float: right; text-align: left; @@ -105,6 +116,14 @@ } + .spanfoot-title{ + width: 55%; + float: left; + color: #000000; + font-size: 17px; + vertical-align: center; + } + .spancontent-value { color: #000000; font-size: 17px; @@ -114,6 +133,14 @@ } + .spanfoot-value { + color: #000000; + font-size: 17px; + padding-left: 5px; + vertical-align: center; + + } + .statement_title { padding-bottom: 2%; padding-top: 2%; @@ -123,8 +150,8 @@ +
-
@@ -159,6 +186,7 @@
Your Statement
+
Date/Time @@ -187,6 +215,7 @@ Settlement Amount
+
@@ -215,6 +244,24 @@
+
+ +
+     records. +
+
+
+ Total Settlement Amount: + +
+
+ Service Fee for RoyalPay: + (GST inclu) +
+
+ Service fee for Mini Program: + (GST inclu) +