From f958dfe572c22c56f0d21f6ff7ca7f3b5fd2369f Mon Sep 17 00:00:00 2001
From: Wai Yan Htun <waiyanhtun.dev@gmail.com>
Date: Tue, 15 Sep 2026 16:27:41 +0700
Subject: [PATCH] fixed settlement issues for cash advance

---
 .idea/misc.xml                                           | 2 +-
 .../mob/utsmyanmar/ui/settlement/SettlementViewModel.kt  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 976db11..efd1031 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementViewModel.kt
index 343a1cc..4297e0b 100644
--- a/app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementViewModel.kt
+++ b/app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementViewModel.kt
@@ -279,8 +279,8 @@ class SettlementViewModel @Inject constructor(
         val hostName = HostName.MPU
         val field60 = SystemParamsOperation.getInstance().getCurrentBatchNum()
 
-        val sale2Count = state.saleCount + state.preCount
-        val sale2Amount = state.saleAmount + state.preAmount
+        val sale2Count = state.saleCount + state.preCount + state.caCount
+        val sale2Amount = state.saleAmount + state.preAmount + state.caAmount
 
         LogUtil.d(TAG,"Sale count :$sale2Count and Sale amount :$sale2Amount")
 
@@ -294,11 +294,12 @@ class SettlementViewModel @Inject constructor(
             if (state.refundAmount == 0L) 0 else state.refundAmount
         )
 
-        val totalDebitSaleCount = String.format(Locale.getDefault(), "%03d", state.caCount)
+        // CZ shared ca and sale as same field, removed from these
+        val totalDebitSaleCount = String.format(Locale.getDefault(), "%03d", 0)
         val totalDebitSaleAmount = String.format(
             Locale.getDefault(),
             "%012d",
-            if (state.caAmount == 0L) 0 else state.caAmount
+            0
         )
 
         val totalERefundCount = String.format(Locale.getDefault(), "%03d", 0)