From 838a40ee4f53da9dfb3d82eaf0afa599bdc6ff04 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Thu, 9 Jul 2026 23:05:49 +0630 Subject: [PATCH] cash out to cash adv --- .../com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt | 4 ++-- .../com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt | 2 +- .../java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt | 2 +- .../com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt | 2 +- .../java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt | 8 ++++---- .../paylibs/utils/core_utils/SystemParamsSettings.java | 5 +++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt index aa7b437..c02ddc5 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt @@ -130,7 +130,7 @@ fun buildMenuItems( ) }) { onNavigateAction("Pre-Auth Complete Void") }, DashboardMenuItem( - "Cash Out", + "Cash Adv", { Icon( Icons.Default.AccountBalanceWallet, @@ -138,5 +138,5 @@ fun buildMenuItems( modifier = Modifier.size(32.dp), tint = Color.LegacyRed ) - }) { onNavigateAmount("Cash Out") }, + }) { onNavigateAmount("Cash Adv") }, ) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt index 3c7979f..05361d3 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt @@ -115,7 +115,7 @@ private fun formatTypeLabel(raw: String): String = when { raw.contains("REFUND", ignoreCase = true) -> "Refund" raw.contains("SETTLEMENT", ignoreCase = true) -> "Settlement" raw.contains("PRE", ignoreCase = true) -> "Pre-Auth" - raw.contains("CASH", ignoreCase = true) -> "Cash Out" + raw.contains("CASH", ignoreCase = true) -> "Cash Adv" raw.contains("WAVE", ignoreCase = true) -> "Wave Pay" else -> raw.lowercase().replaceFirstChar { it.uppercaseChar() } } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt index 43637ca..b429823 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt @@ -51,7 +51,7 @@ fun SeeMoreScreen( SeeMoreItem("Pre-Auth Void", Icons.Default.LockOpen), SeeMoreItem("Pre-Auth Complete", Icons.Default.CreditCard), SeeMoreItem("Pre-Auth Complete Void", Icons.Default.SwapHoriz), - SeeMoreItem("Cash Out", Icons.Default.AccountBalanceWallet) + SeeMoreItem("Cash Adv", Icons.Default.AccountBalanceWallet) ) Scaffold( diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt b/app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt index 3872e30..08be2bd 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt @@ -74,7 +74,7 @@ private fun String.toTransactionConfig(): TransactionConfig { processCode = ProcessCode.PRE_AUTH_COMPLETE_VOID + ProcessCode.SMART + ProcessCode.TO_ACCOUNT ) - "cash out" -> TransactionConfig( + "cash adv" -> TransactionConfig( transactionName = "CASH_OUT", transactionType = TransactionsType.CASH_OUT, processCode = ProcessCode.CASH_ADVANCE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt b/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt index 7b57f06..7b6dc9b 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt @@ -150,7 +150,7 @@ fun AppNavGraph( onNavigateAmount = { action -> when (action) { "Pre-Auth", - "Cash Out", + "Cash Adv", "Sale" -> { navController.navigate(Routes.Amount.createRoute(action)) { launchSingleTop = true @@ -158,7 +158,7 @@ fun AppNavGraph( } "Pre-Auth", - "Cash Out" -> { + "Cash Adv" -> { navController.navigate(Routes.Amount.createRoute(action)) { launchSingleTop = true } @@ -191,7 +191,7 @@ fun AppNavGraph( } "Pre-Auth", - "Cash Out" -> { + "Cash Adv" -> { sharedViewModel.transactionsType.value = when (action) { "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE else -> TransactionsType.CASH_OUT @@ -286,7 +286,7 @@ fun AppNavGraph( } "Pre-Auth", - "Cash Out" -> { + "Cash Adv" -> { sharedViewModel.transactionsType.value = when (action) { "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE else -> TransactionsType.CASH_OUT diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index 650c311..475bdb7 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -38,8 +38,8 @@ public class SystemParamsSettings implements Serializable { private boolean checkExpSwitch = false; - private String tmsAddress = "http://posuat.myanmarorientalbank.com:5033/api/v1"; -// private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; +// private String tmsAddress = "https://posmgmt.myanmarorientalbank.com/api/v1"; + private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; // private String tmsAddress = "http://128.199.170.203"; private String terminalCapability = "E0E8C8"; @@ -55,6 +55,7 @@ public class SystemParamsSettings implements Serializable { private String merchantName = ""; + private String receiptHeader = ""; private String merchantAddress = "";