From 59153170bfb60b54262efcbcf1a7609a25369d9f Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Tue, 25 Aug 2026 22:39:45 +0630 Subject: [PATCH] - prefix in void, refund and cash adv --- .../ui/cardwaiting/CardWaitingViewModel.kt | 4 +--- .../ui/history_functions/HistoryComponents.kt | 10 +++++----- .../ui/print_receipt/PrintReceiptScreen.kt | 6 +++++- .../mob/utsmyanmar/ui/sale_void/TranDetailPage.kt | 13 ++++++------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingViewModel.kt index 16c272f..2ccb20f 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingViewModel.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingViewModel.kt @@ -61,10 +61,8 @@ class CardWaitingViewModel( retryCounter = 0 fallbackCounter = SystemParamsOperation.getInstance().fallbackCounter fallbackEnabled = SystemParamsOperation.getInstance().fallbackEnabled - val isSaleTransaction = sharedViewModel.transactionsType.value == TransactionsType.SALE - _uiState.update { - it.copy(canGoBack = !isSaleTransaction) + it.copy(canGoBack = true) } if (sharedViewModel.transactionsType.value == TransactionsType.REFUND) { diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt index 196acba..560021e 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt @@ -85,13 +85,13 @@ internal fun HistoryTransactionDetailCard(payDetail: PayDetail) { color = Color.LegacyRed, style = MaterialTheme.typography.titleMedium ) - SummaryLine("Trace", payDetail.voucherNo) - SummaryLine("Amount", POSUtil.getInstance().formatAmount(payDetail.amount)) - SummaryLine("Card No", payDetail.cardNo) - SummaryLine("Reference", payDetail.referNo) - SummaryLine("Approval", payDetail.approvalCode.orEmpty()) SummaryLine("Date", payDetail.tradeDate) SummaryLine("Time", payDetail.tradeTime) + SummaryLine("Amount", POSUtil.getInstance().formatAmount(payDetail.amount)) + SummaryLine("Trace No", payDetail.voucherNo) +// SummaryLine("Card No", payDetail.cardNo) + SummaryLine("Reference No", payDetail.referNo) + SummaryLine("Approval Code", payDetail.approvalCode.orEmpty()) SummaryLine("Status", displayTransactionStatus(payDetail)) } } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt index 5409887..9f10235 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt @@ -51,6 +51,7 @@ import com.mob.utsmyanmar.viewmodel.SharedViewModel import com.utsmyanmar.paylibs.model.PayDetail import com.utsmyanmar.paylibs.utils.POSUtil import com.utsmyanmar.paylibs.utils.PrintStatus +import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType import kotlinx.coroutines.launch private enum class ReceiptCopy(val label: String) { @@ -272,7 +273,10 @@ fun ReceiptPreview( ReceiptRow("Ref No", state.payDetail?.referNo.toString()) ReceiptRow("Approval Code", state.payDetail?.approvalCode.toString()) ReceiptRow("Transaction Type", state.payDetail?.let(::displayTransactionTitle).orEmpty()) - ReceiptRow("Amount", POSUtil.getInstance().getDecimalAmountSeparatorFormat(state.payDetail?.amount?:0)) + ReceiptRow("Amount", POSUtil.getInstance().getDecimalAmountSeparatorFormat(state.payDetail?.amount?:0).let { amt -> + val prefix = POSUtil.getInstance().checkMinusSign(state.payDetail?.transactionType ?: 0) + if (prefix.isEmpty() && (state.payDetail?.transactionType ?: 0) == TransactionsType.CASH_OUT.value) "-$amt" else "$prefix$amt" + }) ReceiptRow("Card Type", state.payDetail?.accountType.toString()) ReceiptRow("Card No", state.payDetail?.cardNo.toString()) ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty()) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/sale_void/TranDetailPage.kt b/app/src/main/java/com/mob/utsmyanmar/ui/sale_void/TranDetailPage.kt index 56fe111..4ef5b74 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/sale_void/TranDetailPage.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/sale_void/TranDetailPage.kt @@ -126,19 +126,18 @@ private fun TransactionDetailsCard(transaction: PayDetail) { verticalArrangement = Arrangement.spacedBy(10.dp) ) { Text( - text = "Previous Sale", + text = "Void Sale", color = Color.LegacyRed, fontWeight = FontWeight.Bold, fontSize = 16.sp ) - - DetailRow("Trace", transaction.voucherNo) - DetailRow("Amount", POSUtil.getInstance().formatAmount(transaction.amount)) - DetailRow("Card No", transaction.cardNo) - DetailRow("Reference", transaction.referNo) - DetailRow("Approval", transaction.approvalCode.orEmpty()) DetailRow("Date", transaction.transDate) DetailRow("Time", transaction.transTime) + DetailRow("Amount", POSUtil.getInstance().formatAmount(transaction.amount)) + DetailRow("Trace No", transaction.voucherNo) + DetailRow("Reference No", transaction.referNo) + DetailRow("Approval Code", transaction.approvalCode.orEmpty()) +// DetailRow("Card No", transaction.cardNo) } } }