From e28b86c46408b7c23db15fd3f6d3d0c30145c377 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 6 Jun 2024 11:49:04 +0800
Subject: [PATCH] update cash flow report

---
 .../com/ffii/tsms/modules/report/service/ReportService.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
index ba386ac..dd6386f 100644
--- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
@@ -755,11 +755,12 @@ open class ReportService(
             }
 
         val groupedInvoices = invoices.sortedBy { it.receiptDate }.filter { it.paidAmount != null }
-            .groupBy { invoiceEntry -> invoiceEntry.invoiceDate?.format(dateFormatter).toString() }
+            .groupBy { invoiceEntry -> invoiceEntry.receiptDate?.format(dateFormatter).toString() }
             .mapValues { (_, invoiceEntries) ->
                 invoiceEntries.map { invoice ->
                     mapOf(
                         "paidAmount" to invoice.paidAmount?.toDouble(),
+                        "invoiceNo" to invoice.invoiceNo,
                         "description" to invoice.milestonePayment?.description
                     )
                 }
@@ -815,7 +816,8 @@ open class ReportService(
                         }
 
                         createCell(4)?.apply {
-                            setCellValue(invoice["description"].toString())
+//                            setCellValue(invoice["description"].toString())
+                            setCellValue("Invoice Receipt: " + (invoice["invoiceNo"] ?: "N/A").toString())
                         }
                     }
                 }
@@ -857,6 +859,7 @@ open class ReportService(
                     }
                 }
             }
+
         }
 
         return workbook