Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kyaw_Min_Khant:7f9aa52e4732d43cbf9aa0a3a268af88898aca64
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
..
compare: Kyaw_Min_Khant:7b8728da8f5c38883fa7f03c794527e743074c0d
Branches Tags
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
Kyaw_Min_Khant:main

No commits in common. "7f9aa52e4732d43cbf9aa0a3a268af88898aca64" and "7b8728da8f5c38883fa7f03c794527e743074c0d" have entirely different histories.
7f9aa52e47 ... 7b8728da8f

4 changed files with 17 additions and 33 deletions
Show Stats Expand all files Collapse all files

5
app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardHistoryFragment.java
View File

@ -89,10 +89,7 @@ public class DashboardHistoryFragment extends DataBindingFragment {
for (PayDetail payDetail : payDetailList) { for (PayDetail payDetail : payDetailList) {
if (payDetail.getTransactionType() == TransactionsType.MMQR.value if (payDetail.getTransactionType() == TransactionsType.MMQR.value
|| payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value || payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
|| payDetail.getTransactionType() == TransactionsType.SETTLEMENT.value
|| payDetail.getTransactionType() == TransactionsType.MMQR_SETTLEMENT.value
|| payDetail.getTransactionType() == TransactionsType.REVERSAL.value) {
continue; continue;
} }

7
app/src/main/java/com/utsmm/kbz/ui/management/DetailReportFragment.java
View File

@ -149,12 +149,7 @@ public class DetailReportFragment extends DataBindingFragment {
if(sharedViewModel.hostType.getValue() == HostType.MPU) { if(sharedViewModel.hostType.getValue() == HostType.MPU) {
if(payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value if(payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value && payDetail.getTransactionType() != TransactionsType.REVERSAL.value && payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value && POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
&& payDetail.getTransactionType() != TransactionsType.MMQR.value
&& payDetail.getTransactionType() != TransactionsType.MMQR_SETTLEMENT.value
&& payDetail.getTransactionType() != TransactionsType.REVERSAL.value
&& payDetail.getTransactionType() != TransactionsType.SETTLEMENT.value
&& POSUtil.getInstance().getYesterdayDate().compareTo(POSUtil.getInstance().getDateByString(payDetail.transDate)) < 1) {
boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value; boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.VOID.value || payDetail.getTransactionType() == TransactionsType.REFUND.value;
lists.add(payDetail); lists.add(payDetail);
count++; count++;

5
app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java
View File

@ -304,10 +304,7 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment {
} else { } else {
// Reprint Any Transaction:: // Reprint Any Transaction::
if(yesterday.compareTo(transDate) <= 0 if(yesterday.compareTo(transDate) <= 0 && pay.getTransactionType() != TransactionsType.SETTLEMENT.value && pay.getTransactionType() != TransactionsType.REVERSAL.value) {
&& pay.getTransactionType() != TransactionsType.SETTLEMENT.value
&& pay.getTransactionType() != TransactionsType.MMQR_SETTLEMENT.value
&& pay.getTransactionType() != TransactionsType.REVERSAL.value) {
// April 2, 2024 client requested to add QR host at host selection type // April 2, 2024 client requested to add QR host at host selection type
if(sharedViewModel.hostType.getValue() == HostType.MPU) { if(sharedViewModel.hostType.getValue() == HostType.MPU) {

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

@ -759,7 +759,11 @@ public abstract class BaseXPrint {
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) { if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
// Use the same line-by-line style as QR detail report print2ColumnsString("CARD NAME", "CARD NUMBER");
print2ColumnsString("EXP DATE", "TRACE NO");
print2ColumnsString("TRANSACTION", "");
print2ColumnsString("AMOUNT", "");
print2ColumnsString("REF NUM", "");
} else if (hostType == HostType.QR) { } else if (hostType == HostType.QR) {
// print2ColumnsString("PAYMENT NAME", ""); // print2ColumnsString("PAYMENT NAME", "");
// print2ColumnsString("DATE", "TIME"); // print2ColumnsString("DATE", "TIME");
@ -778,21 +782,10 @@ public abstract class BaseXPrint {
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable(); boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) { if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
boolean isDecimalEnabledCard = SystemParamsOperation.getInstance().getDecimalEnable(); print2ColumnsString(pay.getAccountType(), PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo()));
printString("CARD TYPE:" + pay.getAccountType()); print2ColumnsString("**/**", pay.getVoucherNo());
printString("CARD NO :" + PrintUtils.getInstance().maskCardNumberPciDss(pay.getCardNo())); print2ColumnsString(pay.getTransType().replace("_", " "), isNeedMinusSign ? "-" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled) : "" + PrintUtils.getInstance().getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabled));
printString("TRACE NO :" + pay.getVoucherNo()); print2ColumnsString(pay.getReferNo(), "");
printString("RRN :" + pay.getReferNo());
printString("DATE :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate()) + " " + pay.getTransTime());
printString("TYPE :" + pay.getTransType().replace("_", " "));
printString("AMOUNT :" +
(isNeedMinusSign
? "-" + PrintUtils.getInstance()
.getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabledCard)
: PrintUtils.getInstance()
.getSeparatorNumberFormat(pay.getAmount(), isDecimalEnabledCard))
+ " " + "MMK");
dotBreak();
} else if (hostType == HostType.QR) { } else if (hostType == HostType.QR) {
@ -846,9 +839,11 @@ public abstract class BaseXPrint {
if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) { if (hostType == HostType.MPU || hostType == HostType.VISA_MASTER) {
boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable(); boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
print2ColumnsString("CARD", ""); print2ColumnsString("MPU", "");
print3ColumnsString("TYPE ", "COUNT", "AMOUNT"); print2ColumnsString("CARD TYPE", "");
print3ColumnsString("CARD", " " + countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled), true); print3ColumnsString("", "COUNT", "AMOUNT");
emptyLine(1);
print3ColumnsString("MPU", countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled));
} else if (hostType == HostType.QR) { } else if (hostType == HostType.QR) {
boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable(); boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
print2ColumnsString("PAYMENT", ""); print2ColumnsString("PAYMENT", "");