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

Compare commits

base: Kyaw_Min_Khant:48513f8da9c3637ff9357f2ce17a179c6e3b2efa
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
..
compare: Kyaw_Min_Khant:836eb07b3b9875bf357e9fb21a9a15293c78140c
Branches Tags
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
Kyaw_Min_Khant:main

No commits in common. "48513f8da9c3637ff9357f2ce17a179c6e3b2efa" and "836eb07b3b9875bf357e9fb21a9a15293c78140c" have entirely different histories.
48513f8da9 ... 836eb07b3b

8 changed files with 16 additions and 17 deletions
Show Stats Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -43,8 +43,8 @@ android {
dimension = "env"
applicationIdSuffix = ".uat"
versionNameSuffix = "-UAT"
versionCode = 12
versionName = "3.0"
versionCode = 11
versionName = "2.9"
buildConfigField("String", "ENV", "\"UAT\"")
resValue("string", "app_name", "MOB-UAT")
}

6
app/src/main/java/com/mob/utsmyanmar/ui/components/appbar/AppBar.kt
View File

@ -5,14 +5,14 @@ import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.compose.dropUnlessResumed
import com.mob.utsmyanmar.ui.theme.Color
import com.mob.utsmyanmar.ui.theme.Primary
import com.mob.utsmyanmar.ui.theme.White
@OptIn(ExperimentalMaterial3Api::class)
@ -35,7 +35,7 @@ fun AppBar(
navigationIcon = {
if (icon != null && onIconClick != null) {
IconButton(
onClick = dropUnlessResumed { onIconClick() }
onClick = onIconClick
) {
Icon(
imageVector = icon,

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") },
DashboardMenuItem(
"Cash Adv",
"Cash Out",
{
Icon(
Icons.Default.AccountBalanceWallet,
@ -138,5 +138,5 @@ fun buildMenuItems(
modifier = Modifier.size(32.dp),
tint = Color.LegacyRed
)
}) { onNavigateAmount("Cash Adv") },
}) { onNavigateAmount("Cash Out") },
)

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("SETTLEMENT", ignoreCase = true) -> "Settlement"
raw.contains("PRE", ignoreCase = true) -> "Pre-Auth"
raw.contains("CASH", ignoreCase = true) -> "Cash Adv"
raw.contains("CASH", ignoreCase = true) -> "Cash Out"
raw.contains("WAVE", ignoreCase = true) -> "Wave Pay"
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 Complete", Icons.Default.CreditCard),
SeeMoreItem("Pre-Auth Complete Void", Icons.Default.SwapHoriz),
SeeMoreItem("Cash Adv", Icons.Default.AccountBalanceWallet)
SeeMoreItem("Cash Out", Icons.Default.AccountBalanceWallet)
)
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
)
"cash adv" -> TransactionConfig(
"cash out" -> TransactionConfig(
transactionName = "CASH_OUT",
transactionType = TransactionsType.CASH_OUT,
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 ->
when (action) {
"Pre-Auth",
"Cash Adv",
"Cash Out",
"Sale" -> {
navController.navigate(Routes.Amount.createRoute(action)) {
launchSingleTop = true
@ -158,7 +158,7 @@ fun AppNavGraph(
}
"Pre-Auth",
"Cash Adv" -> {
"Cash Out" -> {
navController.navigate(Routes.Amount.createRoute(action)) {
launchSingleTop = true
}
@ -191,7 +191,7 @@ fun AppNavGraph(
}
"Pre-Auth",
"Cash Adv" -> {
"Cash Out" -> {
sharedViewModel.transactionsType.value = when (action) {
"Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
else -> TransactionsType.CASH_OUT
@ -286,7 +286,7 @@ fun AppNavGraph(
}
"Pre-Auth",
"Cash Adv" -> {
"Cash Out" -> {
sharedViewModel.transactionsType.value = when (action) {
"Pre-Auth" -> TransactionsType.PRE_AUTH_SALE
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 String tmsAddress = "https://posmgmt.myanmarorientalbank.com/api/v1";
private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
private String tmsAddress = "http://posuat.myanmarorientalbank.com:5033/api/v1";
// private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1";
// private String tmsAddress = "http://128.199.170.203";
private String terminalCapability = "E0E8C8";
@ -55,7 +55,6 @@ public class SystemParamsSettings implements Serializable {
private String merchantName = "";
private String receiptHeader = "";
private String merchantAddress = "";