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

jcb logo align

Browse Source
This commit is contained in:
moon 2026-08-25 22:15:37 +06:30
parent 209279b847
commit 726310a779
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt
View File

@ -390,11 +390,11 @@ private fun CardLogoRow() {
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
CardLogo( CardLogo(
icon = painterResource(R.drawable.logo_visa), icon = painterResource(R.drawable.logo_mpu),
name = "visa", name = "master",
) )
CardLogo( CardLogo(
icon = painterResource(R.drawable.logo_jcb), icon = painterResource(R.drawable.logo_visa),
name = "visa", name = "visa",
) )
CardLogo( CardLogo(
@ -402,12 +402,12 @@ private fun CardLogoRow() {
name = "master", name = "master",
) )
CardLogo( CardLogo(
icon = painterResource(R.drawable.logo_mpu), icon = painterResource(R.drawable.logo_union_pay),
name = "master", name = "union",
) )
CardLogo( CardLogo(
icon = painterResource(R.drawable.logo_union_pay), icon = painterResource(R.drawable.logo_jcb),
name = "master", name = "jcb",
) )
} }
} }

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

@ -34,8 +34,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.PathEffect
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -266,17 +264,18 @@ fun ReceiptPreview(
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
ReceiptDivider() ReceiptDivider()
ReceiptRow("Merchant", state.payDetail?.merchantName.toString() ) ReceiptRow("Date", state.payDetail?.transDate.toString())
ReceiptRow("Terminal ID", state.payDetail?.terminalNo.toString() ) ReceiptRow("Time", state.payDetail?.transTime.toString())
ReceiptRow("Merchant Name", state.payDetail?.merchantName.toString())
ReceiptRow("TID", state.payDetail?.terminalNo.toString())
ReceiptRow("Trace No", state.payDetail?.voucherNo.toString()) ReceiptRow("Trace No", state.payDetail?.voucherNo.toString())
ReceiptRow("Transaction", state.payDetail?.let(::displayTransactionTitle).orEmpty()) ReceiptRow("Ref No", state.payDetail?.referNo.toString())
ReceiptRow("Approval Code", state.payDetail?.approvalCode.toString())
ReceiptRow("Transaction Type", state.payDetail?.let(::displayTransactionTitle).orEmpty())
ReceiptRow("Amount", POSUtil.getInstance().getDecimalAmountSeparatorFormat(state.payDetail?.amount?:0)) ReceiptRow("Amount", POSUtil.getInstance().getDecimalAmountSeparatorFormat(state.payDetail?.amount?:0))
ReceiptRow("Card Type", state.payDetail?.accountType.toString()) ReceiptRow("Card Type", state.payDetail?.accountType.toString())
ReceiptRow("Card No", state.payDetail?.cardNo.toString()) ReceiptRow("Card No", state.payDetail?.cardNo.toString())
ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty()) ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty())
ReceiptRow("Date", state.payDetail?.transDate.toString() )
ReceiptRow("Time", state.payDetail?.transTime.toString())
ReceiptRow("Ref No", state.payDetail?.referNo.toString())
ReceiptDivider() ReceiptDivider()
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Text( Text(
@ -360,6 +359,7 @@ private fun PrintReceiptScreenPreview() {
referNo = "123456789012" referNo = "123456789012"
transType = "SALE" transType = "SALE"
tradeAnswerCode = "00" tradeAnswerCode = "00"
approvalCode = "123456"
} }
val sampleState = TransactionResultState( val sampleState = TransactionResultState(