From 2323562270f92700e95df3dd152d1d3531ad3c53 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Wed, 26 Aug 2026 00:04:33 +0630 Subject: [PATCH] fixed yestarday only date for filters --- .../ui/history_functions/HistoryComponents.kt | 5 ++--- .../ui/history_functions/HistoryFilters.kt | 15 +++++++++++---- .../ui/history_functions/HistorySummaryUtils.kt | 11 ----------- .../paylibs/print/printx/BaseXPrint.java | 2 +- 4 files changed, 14 insertions(+), 19 deletions(-) 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 dc961a3..ce36ad0 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 @@ -25,7 +25,6 @@ import androidx.compose.ui.unit.dp import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.utils.convertDateString import com.utsmyanmar.paylibs.model.PayDetail -import com.utsmyanmar.paylibs.utils.POSUtil @Composable internal fun HistoryTransactionCard( @@ -55,7 +54,7 @@ internal fun HistoryTransactionCard( style = MaterialTheme.typography.titleSmall ) Text( - text = POSUtil.getInstance().formatAmount(payDetail.amount), + text = displayAmountWithSign(payDetail), style = MaterialTheme.typography.titleSmall ) } @@ -88,7 +87,7 @@ internal fun HistoryTransactionDetailCard(payDetail: PayDetail) { ) SummaryLine("Date", payDetail.tradeDate) SummaryLine("Time", payDetail.tradeTime) - SummaryLine("Amount", POSUtil.getInstance().formatAmount(payDetail.amount)) + SummaryLine("Amount", displayAmountWithSign(payDetail)) SummaryLine("Trace No", payDetail.voucherNo) // SummaryLine("Card No", payDetail.cardNo) SummaryLine("Reference No", payDetail.referNo) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryFilters.kt b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryFilters.kt index ac5db2c..125a510 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryFilters.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryFilters.kt @@ -86,10 +86,7 @@ internal fun filterDetailReportTransactions( transactions: List, hostType: HostType ): List { - val yesterday = POSUtil.getInstance().yesterdayDate - return transactions.filter { pay -> - if (POSUtil.getInstance().getDateByString(pay.transDate).before(yesterday)) return@filter false if (pay.transactionType == TransactionsType.REVERSAL.value) return@filter false if (pay.transactionType == TransactionsType.SETTLEMENT.value) return@filter false @@ -112,10 +109,20 @@ internal fun filterDetailReportTransactions( } } +internal fun displayAmountWithSign(payDetail: PayDetail): String { + val prefix = if (payDetail.transactionType == TransactionsType.VOID.value || + payDetail.transactionType == TransactionsType.REFUND.value || + payDetail.transactionType == TransactionsType.WAVEPAY_REFUND.value || + payDetail.transactionType == TransactionsType.CASH_OUT.value + ) "-" else "" + return prefix + POSUtil.getInstance().formatAmount(payDetail.amount) +} + internal fun detailReportSignedAmount(payDetail: PayDetail): Long { val isNegative = payDetail.transactionType == TransactionsType.VOID.value || payDetail.transactionType == TransactionsType.REFUND.value || - payDetail.transactionType == TransactionsType.WAVEPAY_REFUND.value + payDetail.transactionType == TransactionsType.WAVEPAY_REFUND.value || + payDetail.transactionType == TransactionsType.CASH_OUT.value return if (isNegative) -payDetail.amount else payDetail.amount } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistorySummaryUtils.kt b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistorySummaryUtils.kt index a0a4c4a..6c7a2ef 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistorySummaryUtils.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistorySummaryUtils.kt @@ -2,7 +2,6 @@ package com.mob.utsmyanmar.ui.history_functions import com.utsmyanmar.paylibs.model.PayDetail import com.utsmyanmar.paylibs.model.SettleData -import com.utsmyanmar.paylibs.utils.POSUtil import com.utsmyanmar.paylibs.utils.enums.HostType import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType import java.text.ParseException @@ -31,9 +30,7 @@ internal fun buildSummarySettleData( start: Date, end: Date, ): SettleData { - val dateFormat = SimpleDateFormat("dd/MM/yy", Locale.getDefault()) val dateTimeFormat = SimpleDateFormat("dd/MM/yy HH:mm", Locale.getDefault()) - val yesterday = POSUtil.getInstance().yesterdayDate val wave = SummaryCounter() val waveRefund = SummaryCounter() @@ -47,14 +44,6 @@ internal fun buildSummarySettleData( val refund = SummaryCounter() for (pay in transactions) { - val transDate = try { - dateFormat.parse(pay.transDate) - } catch (_: ParseException) { - continue - } ?: continue - - if (yesterday.after(transDate)) continue - val currentDate = try { dateTimeFormat.parse("${pay.transDate} ${pay.transTime}") } catch (_: ParseException) { diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java index e1d4fbc..71eb155 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java @@ -637,7 +637,7 @@ public abstract class BaseXPrint { for (PayDetail pay: lists) { - boolean isNeedMinusSign = pay.getTransactionType() == TransactionsType.VOID.value || pay.getTransactionType() == TransactionsType.REFUND.value || pay.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value || pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE_VOID.value; + boolean isNeedMinusSign = pay.getTransactionType() == TransactionsType.VOID.value || pay.getTransactionType() == TransactionsType.REFUND.value || pay.getTransactionType() == TransactionsType.WAVEPAY_REFUND.value || pay.getTransactionType() == TransactionsType.PRE_AUTH_COMPLETE_VOID.value || pay.getTransactionType() == TransactionsType.CASH_OUT.value; if(hostType == HostType.MPU || hostType == HostType.VISA_MASTER) { sunmiPrinterService.printColumnsString(new String[]{pay.getAccountType() , PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo())}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback);