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

cash out to cash adv

Browse Source
This commit is contained in:
moon 2026-07-09 23:05:49 +06:30
parent 836eb07b3b
commit 838a40ee4f
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt
View File

@ -130,7 +130,7 @@ fun buildMenuItems(
) )
}) { onNavigateAction("Pre-Auth Complete Void") }, }) { onNavigateAction("Pre-Auth Complete Void") },
DashboardMenuItem( DashboardMenuItem(
"Cash Out", "Cash Adv",
{ {
Icon( Icon(
Icons.Default.AccountBalanceWallet, Icons.Default.AccountBalanceWallet,
@ -138,5 +138,5 @@ fun buildMenuItems(
modifier = Modifier.size(32.dp), modifier = Modifier.size(32.dp),
tint = Color.LegacyRed tint = Color.LegacyRed
) )
}) { onNavigateAmount("Cash Out") }, }) { onNavigateAmount("Cash Adv") },
) )

2
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt
View File

@ -115,7 +115,7 @@ private fun formatTypeLabel(raw: String): String = when {
raw.contains("REFUND", ignoreCase = true) -> "Refund" raw.contains("REFUND", ignoreCase = true) -> "Refund"
raw.contains("SETTLEMENT", ignoreCase = true) -> "Settlement" raw.contains("SETTLEMENT", ignoreCase = true) -> "Settlement"
raw.contains("PRE", ignoreCase = true) -> "Pre-Auth" 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" raw.contains("WAVE", ignoreCase = true) -> "Wave Pay"
else -> raw.lowercase().replaceFirstChar { it.uppercaseChar() } else -> raw.lowercase().replaceFirstChar { it.uppercaseChar() }
} }

2
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt
View File

@ -51,7 +51,7 @@ fun SeeMoreScreen(
SeeMoreItem("Pre-Auth Void", Icons.Default.LockOpen), SeeMoreItem("Pre-Auth Void", Icons.Default.LockOpen),
SeeMoreItem("Pre-Auth Complete", Icons.Default.CreditCard), SeeMoreItem("Pre-Auth Complete", Icons.Default.CreditCard),
SeeMoreItem("Pre-Auth Complete Void", Icons.Default.SwapHoriz), SeeMoreItem("Pre-Auth Complete Void", Icons.Default.SwapHoriz),
SeeMoreItem("Cash Out", Icons.Default.AccountBalanceWallet) SeeMoreItem("Cash Adv", Icons.Default.AccountBalanceWallet)
) )
Scaffold( Scaffold(

2
app/src/main/java/com/mob/utsmyanmar/ui/input_amount/AmountRoute.kt
View File

@ -74,7 +74,7 @@ private fun String.toTransactionConfig(): TransactionConfig {
processCode = ProcessCode.PRE_AUTH_COMPLETE_VOID + ProcessCode.SMART + ProcessCode.TO_ACCOUNT processCode = ProcessCode.PRE_AUTH_COMPLETE_VOID + ProcessCode.SMART + ProcessCode.TO_ACCOUNT
) )
"cash out" -> TransactionConfig( "cash adv" -> TransactionConfig(
transactionName = "CASH_OUT", transactionName = "CASH_OUT",
transactionType = TransactionsType.CASH_OUT, transactionType = TransactionsType.CASH_OUT,
processCode = ProcessCode.CASH_ADVANCE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT processCode = ProcessCode.CASH_ADVANCE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT

8
app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt
View File

@ -150,7 +150,7 @@ fun AppNavGraph(
onNavigateAmount = { action -> onNavigateAmount = { action ->
when (action) { when (action) {
"Pre-Auth", "Pre-Auth",
"Cash Out", "Cash Adv",
"Sale" -> { "Sale" -> {
navController.navigate(Routes.Amount.createRoute(action)) { navController.navigate(Routes.Amount.createRoute(action)) {
launchSingleTop = true launchSingleTop = true
@ -158,7 +158,7 @@ fun AppNavGraph(
} }
"Pre-Auth", "Pre-Auth",
"Cash Out" -> { "Cash Adv" -> {
navController.navigate(Routes.Amount.createRoute(action)) { navController.navigate(Routes.Amount.createRoute(action)) {
launchSingleTop = true launchSingleTop = true
} }
@ -191,7 +191,7 @@ fun AppNavGraph(
} }
"Pre-Auth", "Pre-Auth",
"Cash Out" -> { "Cash Adv" -> {
sharedViewModel.transactionsType.value = when (action) { sharedViewModel.transactionsType.value = when (action) {
"Pre-Auth" -> TransactionsType.PRE_AUTH_SALE "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
else -> TransactionsType.CASH_OUT else -> TransactionsType.CASH_OUT
@ -286,7 +286,7 @@ fun AppNavGraph(
} }
"Pre-Auth", "Pre-Auth",
"Cash Out" -> { "Cash Adv" -> {
sharedViewModel.transactionsType.value = when (action) { sharedViewModel.transactionsType.value = when (action) {
"Pre-Auth" -> TransactionsType.PRE_AUTH_SALE "Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
else -> TransactionsType.CASH_OUT else -> TransactionsType.CASH_OUT

5
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
View File

@ -38,8 +38,8 @@ public class SystemParamsSettings implements Serializable {
private boolean checkExpSwitch = false; private boolean checkExpSwitch = false;
private String tmsAddress = "http://posuat.myanmarorientalbank.com:5033/api/v1"; // private String tmsAddress = "https://posmgmt.myanmarorientalbank.com/api/v1";
// private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
// private String tmsAddress = "http://128.199.170.203"; // private String tmsAddress = "http://128.199.170.203";
private String terminalCapability = "E0E8C8"; private String terminalCapability = "E0E8C8";
@ -55,6 +55,7 @@ public class SystemParamsSettings implements Serializable {
private String merchantName = ""; private String merchantName = "";
private String receiptHeader = ""; private String receiptHeader = "";
private String merchantAddress = ""; private String merchantAddress = "";