Kyaw_Min_Khant/mob_pos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed settlement issues for cash advance

Browse Source
This commit is contained in:
Wai Yan Htun 2026-09-15 16:27:41 +07:00
parent 83047648b4
commit f958dfe572
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

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

9
app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementViewModel.kt
View File

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