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

fixed continued button in transaction result screen and date time in paper receipt

Browse Source
This commit is contained in:
moon 2026-09-09 23:41:21 +06:30
parent 23a4ebfb64
commit 43c903c9ee
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -40,8 +40,8 @@ android {
dimension = "env" dimension = "env"
applicationIdSuffix = ".uat" applicationIdSuffix = ".uat"
versionNameSuffix = "-UAT" versionNameSuffix = "-UAT"
versionCode = 18 versionCode = 19
versionName = "3.6" versionName = "3.7"
buildConfigField("String", "ENV", "\"UAT\"") buildConfigField("String", "ENV", "\"UAT\"")
resValue("string", "app_name", "MOB-UAT") resValue("string", "app_name", "MOB-UAT")
} }

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

@ -267,7 +267,7 @@ fun DashboardScreen2(
) )
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
Text( Text(
text = "Released on : 26-Aug-2026", text = "Released on : 06-Sep-2026",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = Color.Gray, color = Color.Gray,
modifier = Modifier.padding(horizontal = 16.dp) modifier = Modifier.padding(horizontal = 16.dp)

26
app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt
View File

@ -87,19 +87,21 @@ fun TransactionResultScreen(
transactionId = state.payDetail?.referNo.toString() transactionId = state.payDetail?.referNo.toString()
) )
Spacer(modifier = Modifier.height(24.dp)) if (!state.isSuccess) {
Spacer(modifier = Modifier.height(24.dp))
Button( Button(
onClick = onContinue, onClick = onContinue,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(56.dp), .height(56.dp),
colors = ButtonDefaults.buttonColors( colors = ButtonDefaults.buttonColors(
containerColor = Color.LegacyRed, containerColor = Color.LegacyRed,
contentColor = Color.White contentColor = Color.White
) )
) { ) {
Text("Continue") Text("Continue")
}
} }
} }

1
app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultState.kt
View File

@ -6,5 +6,6 @@ data class TransactionResultState(
val title: String = "Transaction Result", val title: String = "Transaction Result",
val message: String = "", val message: String = "",
val isLoading: Boolean = false, val isLoading: Boolean = false,
val isSuccess: Boolean = false,
val payDetail: PayDetail? = null val payDetail: PayDetail? = null
) )

3
app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultViewModel.kt
View File

@ -113,7 +113,8 @@ class TransactionResultViewModel @Inject constructor(
_state.value = _state.value.copy( _state.value = _state.value.copy(
title = title, title = title,
message = message message = message,
isSuccess = isSuccess
) )
} }

12
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -895,16 +895,16 @@ public abstract class BaseXPrint {
try { try {
sunmiPrinterService.setFontSize(18, innerResultCallback); sunmiPrinterService.setFontSize(18, innerResultCallback);
sunmiPrinterService.setAlignment(0, 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) { 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) { } 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)) { } 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("MID :"+payDetail.getMerchantNo()+"\n",innerResultCallback);
sunmiPrinterService.printText("TID :"+payDetail.getTerminalNo()+"\n",innerResultCallback); sunmiPrinterService.printText("TID :"+payDetail.getTerminalNo()+"\n",innerResultCallback);
sunmiPrinterService.lineWrap(1, innerResultCallback); sunmiPrinterService.lineWrap(1, innerResultCallback);
sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback); sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
sunmiPrinterService.setAlignment(1, innerResultCallback); sunmiPrinterService.setAlignment(1, innerResultCallback);

4
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 = "https://posmgmt.myanmarorientalbank.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 = "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";