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

- prefix in void, refund and cash adv

Browse Source
This commit is contained in:
moon 2026-08-25 22:39:45 +06:30
parent 726310a779
commit 59153170bf
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingViewModel.kt
View File

@ -61,10 +61,8 @@ class CardWaitingViewModel(
retryCounter = 0 retryCounter = 0
fallbackCounter = SystemParamsOperation.getInstance().fallbackCounter fallbackCounter = SystemParamsOperation.getInstance().fallbackCounter
fallbackEnabled = SystemParamsOperation.getInstance().fallbackEnabled fallbackEnabled = SystemParamsOperation.getInstance().fallbackEnabled
val isSaleTransaction = sharedViewModel.transactionsType.value == TransactionsType.SALE
_uiState.update { _uiState.update {
it.copy(canGoBack = !isSaleTransaction) it.copy(canGoBack = true)
} }
if (sharedViewModel.transactionsType.value == TransactionsType.REFUND) { if (sharedViewModel.transactionsType.value == TransactionsType.REFUND) {

10
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt
View File

@ -85,13 +85,13 @@ internal fun HistoryTransactionDetailCard(payDetail: PayDetail) {
color = Color.LegacyRed, color = Color.LegacyRed,
style = MaterialTheme.typography.titleMedium 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("Date", payDetail.tradeDate)
SummaryLine("Time", payDetail.tradeTime) 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)) SummaryLine("Status", displayTransactionStatus(payDetail))
} }
} }

6
app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt
View File

@ -51,6 +51,7 @@ import com.mob.utsmyanmar.viewmodel.SharedViewModel
import com.utsmyanmar.paylibs.model.PayDetail import com.utsmyanmar.paylibs.model.PayDetail
import com.utsmyanmar.paylibs.utils.POSUtil import com.utsmyanmar.paylibs.utils.POSUtil
import com.utsmyanmar.paylibs.utils.PrintStatus import com.utsmyanmar.paylibs.utils.PrintStatus
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
private enum class ReceiptCopy(val label: String) { private enum class ReceiptCopy(val label: String) {
@ -272,7 +273,10 @@ fun ReceiptPreview(
ReceiptRow("Ref No", state.payDetail?.referNo.toString()) ReceiptRow("Ref No", state.payDetail?.referNo.toString())
ReceiptRow("Approval Code", state.payDetail?.approvalCode.toString()) ReceiptRow("Approval Code", state.payDetail?.approvalCode.toString())
ReceiptRow("Transaction Type", state.payDetail?.let(::displayTransactionTitle).orEmpty()) 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 Type", state.payDetail?.accountType.toString())
ReceiptRow("Card No", state.payDetail?.cardNo.toString()) ReceiptRow("Card No", state.payDetail?.cardNo.toString())
ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty()) ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty())

13
app/src/main/java/com/mob/utsmyanmar/ui/sale_void/TranDetailPage.kt
View File

@ -126,19 +126,18 @@ private fun TransactionDetailsCard(transaction: PayDetail) {
verticalArrangement = Arrangement.spacedBy(10.dp) verticalArrangement = Arrangement.spacedBy(10.dp)
) { ) {
Text( Text(
text = "Previous Sale", text = "Void Sale",
color = Color.LegacyRed, color = Color.LegacyRed,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 16.sp 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("Date", transaction.transDate)
DetailRow("Time", transaction.transTime) 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)
} }
} }
} }