Browse Source

update invoice

master
cyril.tsui 1 month ago
parent
commit
0acf79e7e2
2 changed files with 9 additions and 8 deletions
  1. +4
    -3
      src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt
  2. +5
    -5
      src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt

+ 4
- 3
src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt View File

@@ -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 {


+ 5
- 5
src/main/java/com/ffii/tsms/modules/project/web/models/EditInvoiceRequest.kt View File

@@ -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?
)

Loading…
Cancel
Save