From 43c903c9eeb461d70933f0d63a750dbdfc79491d Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Wed, 9 Sep 2026 23:41:21 +0630 Subject: [PATCH] fixed continued button in transaction result screen and date time in paper receipt --- app/build.gradle.kts | 4 +-- .../ui/dashboard/DashboardScreen.kt | 2 +- .../TransactionResultScreen.kt | 26 ++++++++++--------- .../TransactionResultState.kt | 1 + .../TransactionResultViewModel.kt | 3 ++- .../paylibs/print/printx/BaseXPrint.java | 12 ++++----- .../core_utils/SystemParamsSettings.java | 4 +-- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fb10f76..86b054f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -40,8 +40,8 @@ android { dimension = "env" applicationIdSuffix = ".uat" versionNameSuffix = "-UAT" - versionCode = 18 - versionName = "3.6" + versionCode = 19 + versionName = "3.7" buildConfigField("String", "ENV", "\"UAT\"") resValue("string", "app_name", "MOB-UAT") } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt index 3b87b9a..b5455d0 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt @@ -267,7 +267,7 @@ fun DashboardScreen2( ) Spacer(modifier = Modifier.height(10.dp)) Text( - text = "Released on : 26-Aug-2026", + text = "Released on : 06-Sep-2026", style = MaterialTheme.typography.bodySmall, color = Color.Gray, modifier = Modifier.padding(horizontal = 16.dp) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt index 512b52f..ba1e66c 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt @@ -87,19 +87,21 @@ fun TransactionResultScreen( transactionId = state.payDetail?.referNo.toString() ) - Spacer(modifier = Modifier.height(24.dp)) + if (!state.isSuccess) { + Spacer(modifier = Modifier.height(24.dp)) - Button( - onClick = onContinue, - modifier = Modifier - .fillMaxWidth() - .height(56.dp), - colors = ButtonDefaults.buttonColors( - containerColor = Color.LegacyRed, - contentColor = Color.White - ) - ) { - Text("Continue") + Button( + onClick = onContinue, + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + colors = ButtonDefaults.buttonColors( + containerColor = Color.LegacyRed, + contentColor = Color.White + ) + ) { + Text("Continue") + } } } diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultState.kt b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultState.kt index f0c3e5c..9604623 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultState.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultState.kt @@ -6,5 +6,6 @@ data class TransactionResultState( val title: String = "Transaction Result", val message: String = "", val isLoading: Boolean = false, + val isSuccess: Boolean = false, val payDetail: PayDetail? = null ) diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultViewModel.kt b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultViewModel.kt index 7c8b87c..17146cb 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultViewModel.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultViewModel.kt @@ -113,7 +113,8 @@ class TransactionResultViewModel @Inject constructor( _state.value = _state.value.copy( title = title, - message = message + message = message, + isSuccess = isSuccess ) } 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 71eb155..76a2c98 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 @@ -895,16 +895,16 @@ public abstract class BaseXPrint { try { sunmiPrinterService.setFontSize(18, innerResultCallback); sunmiPrinterService.setAlignment(0, innerResultCallback); - sunmiPrinterService.printColumnsString(new String[]{"DATE :" + PrintUtils.getInstance().toFullYearDate(payDetail.getTransDate()), "TIME: " + payDetail.getTransTime()}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); + sunmiPrinterService.printColumnsString(new String[]{"DATE :" + PrintUtils.getInstance().toFullYearDate(payDetail.getTransDate()), "TIME:" + payDetail.getTransTime()}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); if (payDetail.getTransactionType() == TransactionsType.WAVEPAY.value && payDetail.getQrTransStatus() == 1) { - sunmiPrinterService.printColumnsString(new String[]{"TRACE NO :" + traceNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); + sunmiPrinterService.printColumnsString(new String[]{"TRC NO:" + traceNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.WAVEPAY_REFUND.value && payDetail.getTransactionType() != TransactionsType.WAVEPAY.value) { - sunmiPrinterService.printColumnsString(new String[]{"BTH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); + sunmiPrinterService.printColumnsString(new String[]{"BTH NO:" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, innerResultCallback); } else if (payDetail.getTransType().equals(SUMMARY)) { - sunmiPrinterService.printColumnsString(new String[]{"HOST :" + HOST_NAME_MPU, ""}, new int[]{2, 1}, new int[]{0, 2}, innerResultCallback); + sunmiPrinterService.printColumnsString(new String[]{"HOST :" + HOST_NAME_MPU, ""}, new int[]{2, 1}, new int[]{0, 2}, innerResultCallback); } - sunmiPrinterService.printText("MID :"+payDetail.getMerchantNo()+"\n",innerResultCallback); - sunmiPrinterService.printText("TID :"+payDetail.getTerminalNo()+"\n",innerResultCallback); + sunmiPrinterService.printText("MID :"+payDetail.getMerchantNo()+"\n",innerResultCallback); + sunmiPrinterService.printText("TID :"+payDetail.getTerminalNo()+"\n",innerResultCallback); sunmiPrinterService.lineWrap(1, innerResultCallback); sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback); sunmiPrinterService.setAlignment(1, innerResultCallback); 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 9ace370..ac9677b 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 = "https://posmgmt.myanmarorientalbank.com/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";