From 1021025f5c38d67b6edb6daf8f0f8b7558fb9c3f Mon Sep 17 00:00:00 2001 From: kizzy Date: Tue, 30 Jun 2026 17:14:38 +0700 Subject: [PATCH] preauth comp void is corrected, removed password on preauth and cashout trans --- .../com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt | 4 ++-- .../main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt | 4 ++-- .../mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt | 1 + .../com/mob/utsmyanmar/viewmodel/TransProcessViewModel.kt | 4 ++-- .../paylibs/transactions/TransactionsOperation.java | 4 +++- .../com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java | 2 +- 6 files changed, 11 insertions(+), 8 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 6cfcfa9..aa7b437 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 @@ -98,7 +98,7 @@ fun buildMenuItems( modifier = Modifier.size(32.dp), tint = Color.LegacyRed ) - }) { onNavigateAction("Pre-Auth") }, + }) { onNavigateAmount("Pre-Auth") }, DashboardMenuItem( "Pre-Auth Void", { @@ -138,5 +138,5 @@ fun buildMenuItems( modifier = Modifier.size(32.dp), tint = Color.LegacyRed ) - }) { onNavigateAction("Cash Out") }, + }) { onNavigateAmount("Cash Out") }, ) 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 76c9657..abe5a57 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 @@ -111,9 +111,9 @@ fun AppNavGraph( }, onNavigateAmount = { action -> when (action) { + "Pre-Auth", + "Cash Out", "Sale" -> { - sharedViewModel.transactionsType.value = TransactionsType.SALE - sharedViewModel.processCode.value = ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT navController.navigate(Routes.Amount.createRoute(action)) { launchSingleTop = true } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt b/app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt index ff5d20e..501b919 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt @@ -69,6 +69,7 @@ fun ProcessingRoute( } TransResultStatus.REVERSAL_SUCCESS -> onNavigateMain() TransResultStatus.REVERSAL_FAIL -> onNavigateMain() + TransResultStatus.ERROR -> onNavigateMain() else -> {} } } diff --git a/app/src/main/java/com/mob/utsmyanmar/viewmodel/TransProcessViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/viewmodel/TransProcessViewModel.kt index ffbaba7..6fa433b 100644 --- a/app/src/main/java/com/mob/utsmyanmar/viewmodel/TransProcessViewModel.kt +++ b/app/src/main/java/com/mob/utsmyanmar/viewmodel/TransProcessViewModel.kt @@ -219,13 +219,13 @@ class TransProcessViewModel @Inject constructor( _transResultStatus.value = TransResultStatus.SECONDARY - + _state.value = _state.value.copy("Processing with Secondary Host") startOnlineProcess() } else { _errorMessage.value = message - + _state.value = _state.value.copy("Error - $message") _transResultStatus.value = TransResultStatus.ERROR } diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java index 2734d0e..2bb3bf4 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java @@ -18,6 +18,7 @@ import com.utsmyanmar.paylibs.network.ISOSocket; import com.utsmyanmar.paylibs.network.exception.ReversalException; import com.utsmyanmar.paylibs.system.SystemDateTime; import com.utsmyanmar.paylibs.utils.AuthorizationProcessUtil; +import com.utsmyanmar.paylibs.utils.CardType; import com.utsmyanmar.paylibs.utils.MessageType; import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation; import com.utsmyanmar.paylibs.utils.enums.CardScheme; @@ -400,7 +401,8 @@ public class TransactionsOperation { newPay.setCardInfo(oldPay.getCardInfo()); /* * new requirements */ - newPay.setCardType(AidlConstants.CardType.IC.getValue()); + // for cz it's only alow "012" + newPay.setCardType(CardType.NO_CARD.getValue()); newPay.setPINCipher("55"); newPay.setTransCVM(TransCVM.SIGNATURE); } diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java index f36a75b..6930af4 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java @@ -200,7 +200,7 @@ public class BitmapConfig { public static final String CZ_PRE_AUTH="7020058020C09000"; public static final String CZ_PRE_AUTH_VOID="7038058028C08000"; public static final String CZ_PRE_AUTH_COMP="703805802CC08000"; - public static final String CZ_PRE_AUTH_COMP_VOID="703805802CC08004"; + public static final String CZ_PRE_AUTH_COMP_VOID="7038058008C00000"; public static final String UPI_SALE = "7020058020C09200";