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

cash out to cash adv

Browse Source
This commit is contained in:
moon 2026-08-21 10:54:35 +06:30
parent 752693c8f3
commit 8223b4877f
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/changelog.md
View File

@ -10,10 +10,12 @@
* receipt printing animation re-scale * receipt printing animation re-scale
### version 3.4 ### version 3.4
* disable display always on * enabled screen sleep
* auto-settlement * auto-settlement
* show expiry date as "`**`/`**`" * show expiry date as "`**`/`**`"
* align the customer name, in paper slip * align the customer name, in paper slip
* settlement fixed in both UI and system * settlement fixed in both UI and system
* amount, date, time fixed in Void Preview * amount, date, time fixed in Void Preview
* show reversal status in trans records * show reversal status in trans records
* error_slip_print enable/disable in tms
* auto_settlement enable/disable in tms

4
app/src/main/java/com/mob/utsmyanmar/auto_settlement/SettlementScheduler.kt
View File

@ -10,7 +10,7 @@ import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation
import java.util.Calendar import java.util.Calendar
object SettlementScheduler { object SettlementScheduler {
private const val FALLBACK_ALERT_TIME = "01:10:00" private const val FALLBACK_ALERT_TIME = "23:30:00"
fun schedule(context: Context): Boolean { fun schedule(context: Context): Boolean {
if (!SystemParamsOperation.getInstance().isAutoSettlement()) { if (!SystemParamsOperation.getInstance().isAutoSettlement()) {
@ -29,7 +29,7 @@ object SettlementScheduler {
val configuredTime = parseTime( val configuredTime = parseTime(
// SystemParamsOperation.getInstance().clearBatchTime // SystemParamsOperation.getInstance().clearBatchTime
"23:05:00" "10:50:00"
) ?: parseTime(FALLBACK_ALERT_TIME)!! ) ?: parseTime(FALLBACK_ALERT_TIME)!!
val calendar = Calendar.getInstance().apply { val calendar = Calendar.getInstance().apply {

1
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardViewModel.kt
View File

@ -152,6 +152,7 @@ private fun PayDetail.isSaleTransaction(): Boolean {
} }
private fun formatTypeLabel(raw: String): String = when { private fun formatTypeLabel(raw: String): String = when {
raw.equals("CASH_OUT", ignoreCase = true) -> "CASH_ADV"
raw.contains("SALE", ignoreCase = true) -> "Sale" raw.contains("SALE", ignoreCase = true) -> "Sale"
raw.contains("VOID", ignoreCase = true) -> "Void" raw.contains("VOID", ignoreCase = true) -> "Void"
raw.contains("REFUND", ignoreCase = true) -> "Refund" raw.contains("REFUND", ignoreCase = true) -> "Refund"

4
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryFilters.kt
View File

@ -34,7 +34,9 @@ internal fun displayTransactionStatus(payDetail: PayDetail): String {
} }
internal fun displayTransactionTitle(payDetail: PayDetail): String { internal fun displayTransactionTitle(payDetail: PayDetail): String {
val title = payDetail.transType.ifBlank { "TRANSACTION" } val title = payDetail.transType
.ifBlank { "TRANSACTION" }
.replace("CASH_OUT", "CASH_ADV", ignoreCase = true)
return if (payDetail.transactionType == TransactionsType.REVERSAL.value) { return if (payDetail.transactionType == TransactionsType.REVERSAL.value) {
"$title (REVERSAL)" "$title (REVERSAL)"
} else { } else {

4
app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementScreen.kt
View File

@ -171,7 +171,9 @@ private fun SettlementRecordRow(record: PayDetail) {
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Text( Text(
text = record.transType.ifBlank { "UNKNOWN" }, text = record.transType
.ifBlank { "UNKNOWN" }
.replace("CASH_OUT", "CASH_ADV", ignoreCase = true),
color = Color.LegacyRed, color = Color.LegacyRed,
style = MaterialTheme.typography.titleSmall style = MaterialTheme.typography.titleSmall
) )

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

@ -516,7 +516,7 @@ public abstract class BaseXPrint {
if(settleData.getVoidSaleCount() > 0) if(settleData.getVoidSaleCount() > 0)
sunmiPrinterService.printColumnsString(new String[]{"VOID SALES", countStringFormat(settleData.getVoidSaleCount()),MMK, "-" + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getVoidSaleAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback); sunmiPrinterService.printColumnsString(new String[]{"VOID SALES", countStringFormat(settleData.getVoidSaleCount()),MMK, "-" + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getVoidSaleAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback);
if(settleData.getCashAdvanceCount() > 0) if(settleData.getCashAdvanceCount() > 0)
sunmiPrinterService.printColumnsString(new String[]{"CASH OUT", countStringFormat(settleData.getCashAdvanceCount()),MMK, PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback); sunmiPrinterService.printColumnsString(new String[]{"CASH ADV", countStringFormat(settleData.getCashAdvanceCount()),MMK, PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback);
if(settleData.getPreAuthCount() > 0) if(settleData.getPreAuthCount() > 0)
sunmiPrinterService.printColumnsString(new String[]{"PRE AUTH", countStringFormat(settleData.getPreAuthCount()),MMK, PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback); sunmiPrinterService.printColumnsString(new String[]{"PRE AUTH", countStringFormat(settleData.getPreAuthCount()),MMK, PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthAmount())}, new int[]{3, 1,1, 2}, new int[]{0, 1,1, 2}, innerResultCallback);
if(settleData.getPreAuthVoidCount() > 0) if(settleData.getPreAuthVoidCount() > 0)