fixed continued button in transaction result screen and date time in paper receipt
This commit is contained in:
parent
23a4ebfb64
commit
43c903c9ee
@ -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")
|
||||
}
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -87,6 +87,7 @@ fun TransactionResultScreen(
|
||||
transactionId = state.payDetail?.referNo.toString()
|
||||
)
|
||||
|
||||
if (!state.isSuccess) {
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Button(
|
||||
@ -101,6 +102,7 @@ fun TransactionResultScreen(
|
||||
) {
|
||||
Text("Continue")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
)
|
||||
|
||||
@ -113,7 +113,8 @@ class TransactionResultViewModel @Inject constructor(
|
||||
|
||||
_state.value = _state.value.copy(
|
||||
title = title,
|
||||
message = message
|
||||
message = message,
|
||||
isSuccess = isSuccess
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -897,7 +897,7 @@ public abstract class BaseXPrint {
|
||||
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);
|
||||
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);
|
||||
} else if (payDetail.getTransType().equals(SUMMARY)) {
|
||||
|
||||
@ -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";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user