From 0acf79e7e21111a454e2a56f12ebcf71d2004e95 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Fri, 7 Nov 2025 22:49:50 +0800
Subject: [PATCH] update invoice

---
 .../tsms/modules/project/service/InvoiceService.kt     |  7 ++++---
 .../modules/project/web/models/EditInvoiceRequest.kt   | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt b/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt
index d1bffcf..2492018 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt
@@ -772,17 +772,18 @@ open class InvoiceService(
         return result
     }
 
+    @Transactional
     open fun updateInvoiceDetail(editInvoiceRequest :EditInvoiceRequest): EditInvoiceResponse {
         val invoice = repository.findById(editInvoiceRequest.id)
         val formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy")
-//        println("${editInvoiceRequest.issuedDate}, ${editInvoiceRequest.receiptDate}")
+        println("ID (${editInvoiceRequest.id}): Issue date(${editInvoiceRequest.issuedDate}), Receipt date(${editInvoiceRequest.receiptDate}), Received amount(${editInvoiceRequest.receivedAmount})")
         if (invoice.isPresent){
             val updateInvocie = invoice.get().apply {
                 invoiceNo = editInvoiceRequest.invoiceNo
                 issueAmount = editInvoiceRequest.issuedAmount
                 paidAmount = editInvoiceRequest.receivedAmount
-                invoiceDate = LocalDate.parse(editInvoiceRequest.issuedDate, formatter)
-                receiptDate = LocalDate.parse(editInvoiceRequest.receiptDate, formatter)
+                invoiceDate = editInvoiceRequest.issuedDate?.let { try { LocalDate.parse(it, formatter) } catch (e: Exception) { null } }
+                receiptDate = editInvoiceRequest.receiptDate?.let { try { LocalDate.parse(it, formatter) } catch (e: Exception) { null } }
             }.also { saveAndFlush(it) }
 
             return updateInvocie.let {
diff --git a/src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt b/src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt
index 0f27c4a..8718e82 100644
--- a/src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt
@@ -5,9 +5,9 @@ import java.time.LocalDate
 
 data class EditInvoiceRequest(
     val id: Long,
-    val invoiceNo: String,
-    val issuedAmount: BigDecimal,
-    val issuedDate: String,
-    val receiptDate: String,
-    val receivedAmount: BigDecimal
+    val invoiceNo: String?,
+    val issuedAmount: BigDecimal?,
+    val issuedDate: String?,
+    val receiptDate: String?,
+    val receivedAmount: BigDecimal?
 )
\ No newline at end of file