app/build.gradle.kts

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

app/changelog.md

@@ -1,10 +0,0 @@
-## Change Logs For UAT
-
-### version 3.3
-* config auto update after transaction
-* signature removed on void
-* "Enter Password" color to LegacyRed
-* Amount and Card Number show in signature pad
-* fixed recent transaction only working for top 3
-* routed to dashboard after printing receipt
-* receipt printing animation re-scale

app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardMenuItems.kt

@@ -25,25 +25,24 @@ class DashboardMenuItem(
     val onClick: () -> Unit
 )
 
+val settlementEnabled = false
+val voidEnabled = true
+val refundEnabled = true
+val preAuthEnabled = true
+val preAuthVoidEnabled = true
+val preAuthCompleteEnabled = true
+val preAuthCompleteVoidEnabled = true
+val cashAdvEnabled = true
+
 fun buildMenuItems(
     onNavigateAmount: (String) -> Unit,
     onNavigateSignOn: () -> Unit,
     onNavigateSettlement: () -> Unit,
     onNavigateHistory: () -> Unit,
     onNavigateAction: (String) -> Unit
-): List<DashboardMenuItem> {
+): List<DashboardMenuItem> = buildList {
-    val sp = SystemParamsOperation.getInstance()
-    val settlementEnabled = sp.settlementStatus
-    val voidEnabled = sp.voidStatus
-    val refundEnabled = sp.refundStatus
-    val preAuthEnabled = sp.preAuthStatus
-    val preAuthVoidEnabled = sp.preAuthStatus
-    val preAuthCompleteEnabled = sp.preAuthStatus
-    val preAuthCompleteVoidEnabled = sp.preAuthStatus
-    val cashAdvEnabled = sp.cashAdvanceStatus
-    val mmqrEnabled = sp.mmqrStatus
-    return buildList {
 
+    val mmqrEnabled = SystemParamsOperation.getInstance().mmqrStatus
 
         add(
             DashboardMenuItem(
@@ -229,5 +228,6 @@ fun buildMenuItems(
             ) { onNavigateAmount("Cash Adv") }
         )
     }
-    }
+
+
 }

app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt

@@ -92,8 +92,6 @@ fun AppNavGraph(
             val sharedViewModel: SharedViewModel = hiltViewModel(activity)
             SignaturePad(
                 onBack = { navController.popBackStack() },
-                amount = sharedViewModel.payDetail.value?.amount,
-                cardNumber = sharedViewModel.payDetail.value?.cardNo ?: "",
                 onConfirm = { bitmap, signatureBlob ->
                     sharedViewModel.signBitmap = bitmap
                     sharedViewModel.updateSignatureBlob(signatureBlob)
@@ -113,10 +111,10 @@ fun AppNavGraph(
             val transResultViewModel: TransactionResultViewModel = hiltViewModel(activity)
             val dashboardViewModel: DashboardViewModel = hiltViewModel(activity)
             val dashboardUiState = dashboardViewModel.uiState.collectAsStateWithLifecycle().value
-            val recentPayDetails by sharedViewModel.getLastTenTransactions().observeAsState(emptyList())
+            val recentPayDetails by sharedViewModel.getLastThreeTransactions().observeAsState(emptyList())
             val deviceInfoViewModel: DeviceInfoViewModel = hiltViewModel(activity)
             val deviceInfoUiState = deviceInfoViewModel.uiState.collectAsStateWithLifecycle().value
-            val tmsSetupViewModel: TmsSetupViewModel = hiltViewModel(activity);
+            val tmsSetupViewModel: TmsSetupViewModel = hiltViewModel();
 
             LaunchedEffect(deviceInfoViewModel) {
                 deviceInfoViewModel.loadDeviceInfo()
@@ -752,14 +750,9 @@ fun AppNavGraph(
         composable(Routes.TransactionResult.route) {
             val sharedViewModel: SharedViewModel = hiltViewModel(activity)
             val transResultViewModel: TransactionResultViewModel = hiltViewModel(activity)
-            val tmsSetupViewModel: TmsSetupViewModel = hiltViewModel(activity)
-            val dashboardViewModel: DashboardViewModel = hiltViewModel(activity)
-
             TransactionResultRoute(
                 viewModel = transResultViewModel,
                 sharedViewModel = sharedViewModel,
-                tmsSetupViewModel = tmsSetupViewModel,
-                dashboardViewModel = dashboardViewModel,
                 onNavigateMain = {
                     navController.navigate(Routes.Dashboard.route) {
                         popUpTo(Routes.Dashboard.route) {
@@ -801,14 +794,6 @@ fun AppNavGraph(
                         }
                         launchSingleTop = true
                     }
-                },
-                onPrintFinished = {
-                    navController.navigate(Routes.Dashboard.route) {
-                        popUpTo(Routes.Dashboard.route) {
-                            inclusive = false
-                        }
-                        launchSingleTop = true
-                    }
                 }
             )
         }

app/src/main/java/com/mob/utsmyanmar/ui/password_input/PasswordInput.kt

@@ -112,7 +112,7 @@ fun InputPassword(
                     verticalArrangement = Arrangement.Center,
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
-                    Text(text = "Enter Password", color = Color.LegacyRed, fontSize = 18.sp)
+                    Text(text = "Enter Password", color = Color.Gray, fontSize = 18.sp)
                     Spacer(Modifier.height(16.dp))
                     PasswordDots(filledCount = uiState.input.length, totalCount = PASSWORD_LENGTH)
                     Spacer(Modifier.height(8.dp))

app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt

@@ -44,7 +44,9 @@ import com.mob.utsmyanmar.ui.transaction_result.TransactionResultViewModel
 import com.mob.utsmyanmar.viewmodel.SharedViewModel
 import com.utsmyanmar.paylibs.utils.POSUtil
 import com.utsmyanmar.paylibs.utils.PrintStatus
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.milliseconds
 
 private enum class ReceiptCopy(val label: String) {
     MERCHANT("MERCHANT COPY"),
@@ -56,12 +58,12 @@ fun PrintReceiptScreen(
     transactionResultViewModel: TransactionResultViewModel,
     sharedViewModel: SharedViewModel,
     onPrint: () -> Unit,
-    onDone: () -> Unit,
+    onDone: () -> Unit
-    onPrintFinished : () -> Unit,
 ) {
     val state by transactionResultViewModel.state.collectAsStateWithLifecycle()
     val scope = rememberCoroutineScope()
     val receiptOffsetY = remember { Animatable(0f) }
+    val animationDuration = 5000
     val merchant_copy_autoprint = true
     val customer_copy_autoprint = false
     var currentCopy by remember { mutableStateOf(ReceiptCopy.MERCHANT) }
@@ -70,10 +72,10 @@ fun PrintReceiptScreen(
 
     suspend fun animatePrint() {
         receiptOffsetY.animateTo(
-            targetValue = -1400f,
+            targetValue = -1500f,
-            animationSpec = tween(durationMillis = 4000, easing = FastOutSlowInEasing)
+            animationSpec = tween(durationMillis = animationDuration, easing = FastOutSlowInEasing)
         )
-//        delay(1000.milliseconds)
+        delay(1000.milliseconds)
         receiptOffsetY.animateTo(
             targetValue = 0f,
             animationSpec = tween(durationMillis = 0, easing = FastOutSlowInEasing)
@@ -82,30 +84,21 @@ fun PrintReceiptScreen(
 
     fun isReprintMode() = sharedViewModel.isReprint.value == true
 
-    fun doPrint(copy: ReceiptCopy, onFinished: (printFinished: ReceiptCopy) -> Unit) {
+    fun doPrint(copy: ReceiptCopy, onFinished: () -> Unit) {
         val reprint = isReprintMode()
         val actualCopy = if (reprint && copy == ReceiptCopy.MERCHANT) ReceiptCopy.CUSTOMER else copy
         currentCopy = actualCopy
-
         sharedViewModel.setPrintStatus(
-            if (actualCopy == ReceiptCopy.MERCHANT)
+            if (actualCopy == ReceiptCopy.MERCHANT) PrintStatus.FIRST_PRINT else PrintStatus.SECOND_PRINT
-                PrintStatus.FIRST_PRINT
-            else
-                PrintStatus.SECOND_PRINT
         )
         onPrint()
         scope.launch {
             isPrinting = true
             animatePrint()
             isPrinting = false
-            val upcomingCopy = if (reprint) ReceiptCopy.CUSTOMER
+            nextCopy = if (reprint) ReceiptCopy.CUSTOMER
-            else if (actualCopy == ReceiptCopy.MERCHANT) ReceiptCopy.CUSTOMER
+                else if (actualCopy == ReceiptCopy.MERCHANT) ReceiptCopy.CUSTOMER else ReceiptCopy.MERCHANT
-            else ReceiptCopy.CUSTOMER
+            onFinished()
-
-            currentCopy = upcomingCopy
-            nextCopy = upcomingCopy
-
-            onFinished(actualCopy)
         }
     }
 
@@ -181,12 +174,7 @@ fun PrintReceiptScreen(
                     ),
                     shape = RoundedCornerShape(12.dp),
                     onClick = {
-                        doPrint(nextCopy) { printFinished ->
+                        doPrint(nextCopy) { }
-                            if (printFinished == ReceiptCopy.CUSTOMER) {
-                                onPrintFinished()
-                            }
-                        }
-
                     }
                 ) {
                     Text(
@@ -307,8 +295,7 @@ fun PreviewPrintReceiptScreen() {
             sharedViewModel = hiltViewModel(),
             transactionResultViewModel = hiltViewModel(),
             onPrint = {},
-            onDone = {},
+            onDone = {}
-            onPrintFinished = {}
         )
     }
 }

app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostRoute.kt

@@ -55,7 +55,7 @@ fun ProcessingRoute(
             when(transStatus) {
                 TransResultStatus.SUCCESS -> {
                     sharedViewModel.payDetail.value = transProcessViewModel.payDetailResult.value
-                    if (requiresSignature(sharedViewModel.transactionsType.value, sharedViewModel.payDetail.value)) {
+                    if (requiresSignature(sharedViewModel.payDetail.value)) {
                         onNavigateSignature()
                     } else {
                         onNavigateTransactionResult()
@@ -94,9 +94,7 @@ fun ProcessingRoute(
 
 }
 
-private fun requiresSignature(transType: TransactionsType?, payDetail: com.utsmyanmar.paylibs.model.PayDetail?): Boolean {
+private fun requiresSignature(payDetail: com.utsmyanmar.paylibs.model.PayDetail?): Boolean {
-    if (transType == TransactionsType.VOID || transType == TransactionsType.PRE_AUTH_COMPLETE_VOID || transType == TransactionsType.PRE_AUTH_VOID) {
+//    return payDetail?.transCVM == TransCVM.SIGNATURE && payDetail.isFreeSign == false
-        return false
+    return true;
-    }
-    return true
 }

app/src/main/java/com/mob/utsmyanmar/ui/signature_pad/SignaturePad.kt

@@ -1,7 +1,6 @@
 package com.mob.utsmyanmar.ui.signature_pad
 
 import android.graphics.Bitmap
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,21 +15,16 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.mob.utsmyanmar.ui.components.appbar.AppBar
 import com.mob.utsmyanmar.ui.theme.MOBPOSTheme
-import com.mob.utsmyanmar.utils.formatAmount
-import com.mob.utsmyanmar.utils.maskCardNumber
 import se.warting.signaturepad.SignaturePadAdapter
 import se.warting.signaturepad.SignaturePadView
 import java.io.ByteArrayOutputStream
@@ -40,13 +34,9 @@ import com.mob.utsmyanmar.ui.theme.Color as AppColor
 fun SignaturePad(
     modifier: Modifier = Modifier,
     onBack: () -> Unit = {},
-    onConfirm: (Bitmap?, ByteArray?) -> Unit = { _, _ -> },
+    onConfirm: (Bitmap?, ByteArray?) -> Unit = { _, _ -> }
-    amount: Long? = 0L,
-    cardNumber: String,
 ) {
     var signaturePadAdapter: SignaturePadAdapter? = null
-    var selectedMode by remember { mutableStateOf(SignatureMode.Digital) }
-    val isManualMode = selectedMode == SignatureMode.Manual
 
     val scaledWidth = 300
 
@@ -79,137 +69,33 @@ fun SignaturePad(
                 .padding(16.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
-
-            Column(
-                modifier = Modifier.padding(0.dp),
-                verticalArrangement = Arrangement.spacedBy(4.dp)
-            ) {
-                Text(
-                    text = "Amount",
-                    style = MaterialTheme.typography.titleSmall,
-                    color = AppColor.LegacyRed
-                )
-                Text(
-                    text = amount.formatAmount(),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = AppColor.LegacyRed
-                )
-            }
-            Column(
-                modifier = Modifier.padding(0.dp),
-                verticalArrangement = Arrangement.spacedBy(4.dp)
-            ) {
-                Text(
-                    text = "Card Number",
-                    style = MaterialTheme.typography.titleSmall,
-                    color = AppColor.LegacyRed
-                )
-                Text(
-                    text = cardNumber.maskCardNumber(),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = AppColor.LegacyRed
-                )
-            }
-
-
-            if (isManualMode) {
-                Card(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(200.dp),
-                    shape = RoundedCornerShape(8.dp),
-                    colors = CardDefaults.cardColors(containerColor = Color.White),
-                    border = androidx.compose.foundation.BorderStroke(
-                        width = 1.dp,
-                        color = AppColor.Gray.copy(alpha = 0.35f)
-                    )
-                ) {
-                    Column(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(16.dp),
-                        verticalArrangement = Arrangement.Center,
-                        horizontalAlignment = androidx.compose.ui.Alignment.CenterHorizontally
-                    ) {
-                        Text(
-                            text = "Manual Signature",
-                            style = MaterialTheme.typography.titleMedium,
-                            color = AppColor.Gray
-                        )
-                        Text(
-                            text = "Customer need to sign on paper",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = AppColor.Gray.copy(alpha = 0.7f)
-                        )
-                    }
-                }
-            } else {
             SignaturePadView(
                 onReady = { signaturePadAdapter = it },
                 modifier = Modifier
                     .fillMaxWidth()
                     .height(200.dp)
-                        .background(AppColor.White)
+                    .border(width = 1.dp, color = AppColor.LegacyRed)
-                        .border(
-                            width = 1.dp,
-                            color = AppColor.LegacyRed,
-                            shape = RoundedCornerShape(8.dp)
-                        ),
             )
-            }
-
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                verticalArrangement = Arrangement.spacedBy(12.dp)
-            ) {
-                SignatureModeOption(
-                    title = "Digital",
-                    subtitle = "Sign on screen",
-                    selected = !isManualMode,
-                    onClick = { selectedMode = SignatureMode.Digital },
-                    modifier = Modifier.fillMaxWidth()
-                )
-                SignatureModeOption(
-                    title = "Manual",
-                    subtitle = "Sign on paper",
-                    selected = isManualMode,
-                    onClick = { selectedMode = SignatureMode.Manual },
-                    modifier = Modifier.fillMaxWidth()
-                )
-            }
 
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.spacedBy(12.dp)
             ) {
-                Button(
+                OutlinedButton(
-                    onClick = {
+                    onClick = { signaturePadAdapter?.clear() },
-                        if (!isManualMode) {
-                            signaturePadAdapter?.clear()
-                        }
-                    },
-                    colors = ButtonDefaults.buttonColors(
-                        containerColor = AppColor.White,
-                        contentColor = Color.White
-                    ),
                     modifier = Modifier
                         .weight(1f)
-                        .height(50.dp),
+                        .height(50.dp)
-                    enabled = !isManualMode
                 ) {
-                    Text("Clear", color = AppColor.Black)
+                    Text("Clear")
                 }
 
                 Button(
                     onClick = {
-                        if (isManualMode) {
-                            onConfirm(null, null)
-                        } else {
                         val rawBitmap = signaturePadAdapter?.getSignatureBitmap()
                         val bitmap = rawBitmap?.let { scaleBitmap(it) }
                         val signatureBlob = bitmap?.let { bitmapToBlob(it) }
                         onConfirm(bitmap, signatureBlob)
-                        }
                     },
                     modifier = Modifier
                         .weight(1f)
@@ -273,9 +159,6 @@ private fun SignatureModeOption(
 @Composable
 fun SignaturePadPreview() {
     MOBPOSTheme {
-        SignaturePad(
+        SignaturePad()
-            amount = 1000000L,
-            cardNumber = "6244310034582136"
-        )
     }
 }

app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultRepository.kt

@@ -1,4 +0,0 @@
-package com.mob.utsmyanmar.ui.transaction_result
-
-class TransactionResultRepository {
-}

app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultRoute.kt

@@ -4,9 +4,8 @@ package com.mob.utsmyanmar.ui.transaction_result
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.mob.utsmyanmar.ui.dashboard.DashboardViewModel
-import com.mob.utsmyanmar.ui.tms_setup.TmsSetupViewModel
 import com.mob.utsmyanmar.viewmodel.SharedViewModel
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType
 
@@ -18,9 +17,7 @@ fun TransactionResultRoute(
     onNavigatePrintReceipt: () -> Unit,
     onShowError: (String) -> Unit,
     onShowSuccess: (String) -> Unit,
-    onShowPrinterDialog: (String) -> Unit,
+    onShowPrinterDialog: (String) -> Unit
-    tmsSetupViewModel: TmsSetupViewModel,
-    dashboardViewModel: DashboardViewModel,
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
     val canGoBack = sharedViewModel.transactionsType.value != TransactionsType.SALE
@@ -30,8 +27,6 @@ fun TransactionResultRoute(
             TransactionResultEvent.Start,
             sharedViewModel
         )
-        dashboardViewModel.refreshLastSyncTime()
-        tmsSetupViewModel.downloadConfigs()
     }
 
     LaunchedEffect(Unit) {

app/src/main/java/com/mob/utsmyanmar/utils/Converter.kt

@@ -1,20 +0,0 @@
-package com.mob.utsmyanmar.utils
-
-import android.annotation.SuppressLint
-
-@SuppressLint("DefaultLocale")
-fun Long?.formatAmount(): String {
-    val amount = (this ?: 0L) / 100.0
-    return String.format("%,.2f", amount)
-}
-
-fun String?.maskCardNumber(): String {
-    if (this.isNullOrEmpty()) return ""
-    val maskedPan = StringBuilder(this)
-    if (this.length > 12) {
-        maskedPan.replace(6, 12, "******")
-    } else {
-        maskedPan.append(" ")
-    }
-    return maskedPan.toString()
-}

app/src/main/java/com/mob/utsmyanmar/viewmodel/SharedViewModel.kt

@@ -438,10 +438,6 @@ class SharedViewModel @Inject constructor(
         return repository.getLastThreeTransactions()
     }
 
-    fun getLastTenTransactions(): LiveData<List<PayDetail>> {
-        return repository.getLastTenTransactions()
-    }
-
     fun getSettlementRecords(): LiveData<List<PayDetail>> {
         return repository.getSettlementPOS()
     }

opencode.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://opencode.ai/config.json",
-  "mcp": {
-    "codebase-memory": {
-      "type": "local",
-      "command": "codebase-memory-mcp",
-      "args": [],
-      "enabled": true
-    }
-  }
-}