Compare commits

..

No commits in common. "e51d6587332e4aafe970ea2678e15e6a20bac504" and "7ee4a29a86e38a29d462f7db27e8b2328ccbb942" have entirely different histories.

14 changed files with 42 additions and 101 deletions

View File

@ -222,7 +222,6 @@ public class InputRRNFragment extends DataBindingFragment {
newPay.setReferNo(rrnNo); newPay.setReferNo(rrnNo);
newPay.setCurrencyCode(payDetail.getCurrencyCode());
if(sharedViewModel.getTransMenu().getValue() == TransMenu.PRE_AUTH_FULL_VOID) { if(sharedViewModel.getTransMenu().getValue() == TransMenu.PRE_AUTH_FULL_VOID) {
newPay.setAmount(payDetail.getAmount()); newPay.setAmount(payDetail.getAmount());
@ -316,7 +315,6 @@ public class InputRRNFragment extends DataBindingFragment {
} }
newPay.setReferNo(rrnNo); newPay.setReferNo(rrnNo);
newPay.setCurrencyCode(payDetail.getCurrencyCode());
newPay.setApprovalCode(payDetail.getApprovalCode()); newPay.setApprovalCode(payDetail.getApprovalCode());
newPay.setTradeTime(payDetail.getTradeTime()); newPay.setTradeTime(payDetail.getTradeTime());
newPay.setTradeDate(payDetail.getTradeDate()); newPay.setTradeDate(payDetail.getTradeDate());

View File

@ -113,7 +113,7 @@ public class ReceiptFragment extends DataBindingFragment {
data.retrievalReferenceNumber = payDetail.getReferNo(); data.retrievalReferenceNumber = payDetail.getReferNo();
data.approvalNumber = payDetail.getApprovalCode(); data.approvalNumber = payDetail.getApprovalCode();
data.amount = POSUtil.getInstance().getDecimalAmountSeparatorFormat(payDetail.getAmount()); data.amount = POSUtil.getInstance().getDecimalAmountSeparatorFormat(payDetail.getAmount());
data.currency = POSUtil.getInstance().currencyCodeToText(payDetail.getCurrencyCode()); data.currency = payDetail.getCurrency();
data.footerMessage = "Keep this receipt for your records"; data.footerMessage = "Keep this receipt for your records";
data.responseCode = payDetail.getTradeAnswerCode(); data.responseCode = payDetail.getTradeAnswerCode();

View File

@ -170,10 +170,9 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
if (isNonApprovedTrade(payDetail) && isNonQRPayTransaction(transactionType)) { if (isNonApprovedTrade(payDetail) && isNonQRPayTransaction(transactionType)) {
if (SystemParamsOperation.getInstance().getPrinterEnabled()) { if (SystemParamsOperation.getInstance().getPrinterEnabled()) {
startPrintErrorReceipt(); startPrintProcess(false);
} else {
isCardInside();
} }
isCardInside();
} else if (transactionType == TransactionsType.SETTLEMENT || transactionType == TransactionsType.MMQR_SETTLEMENT) { } else if (transactionType == TransactionsType.SETTLEMENT || transactionType == TransactionsType.MMQR_SETTLEMENT) {
handleSettlementTransaction(siriusReq); handleSettlementTransaction(siriusReq);
} else if (isQRPayNonSuccessTransaction(transactionType, payDetail)) { } else if (isQRPayNonSuccessTransaction(transactionType, payDetail)) {
@ -379,50 +378,6 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
}); });
} }
private void startPrintErrorReceipt() {
PrintHelper.getInstance().checkPaperRollStatus(new PaperRollStatusCallback() {
@Override
public void printerReady() {
sharedViewModel.printErrorReceipt(new PrintXStatus() {
@Override
public void onSuccess() {
isCardInside();
}
@Override
public void onFailure() {
handleForEmptyPaperRoll(false);
}
});
}
@Override
public void paperRollIsEmpty() {
handleForEmptyPaperRoll(false);
}
@Override
public void printNotComplete() {
handleForEmptyPaperRoll(false);
}
@Override
public void printerTooHot() {
handleForEmptyPaperRoll(false);
}
@Override
public void printerFailed() {
handleForEmptyPaperRoll(false);
}
@Override
public void unknownStatusOccur(int code) {
handleForEmptyPaperRoll(false);
}
});
}
private void handleForEmptyPaperRoll(boolean isSettle) { private void handleForEmptyPaperRoll(boolean isSettle) {
cancelTimeout(); cancelTimeout();
@ -437,11 +392,7 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
@Override @Override
public void onClickRetry() { public void onClickRetry() {
dismissPrinterAlertDialog(); dismissPrinterAlertDialog();
if (isSettle) { startPrintProcess(isSettle);
startPrintProcess(true);
} else {
startPrintErrorReceipt();
}
} }
}); });

View File

@ -460,7 +460,6 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
mPayDetail.setIsCanceled(true); mPayDetail.setIsCanceled(true);
updatePayDetail(mPayDetail); updatePayDetail(mPayDetail);
payResult.setESignBlob(mPayDetail.getESignBlob()); payResult.setESignBlob(mPayDetail.getESignBlob());
payResult.setCurrencyCode(mPayDetail.getCurrencyCode());
repository.insertPayDetail(updateCurrentDateAndTime(payResult)); repository.insertPayDetail(updateCurrentDateAndTime(payResult));
} }

View File

@ -403,10 +403,6 @@ public class SharedViewModel extends ViewModel {
}); });
} }
public void printErrorReceipt(PrintXStatus printXStatus) {
PrintXReceipt.getInstance().printSmileReceipt(payDetail.getValue(), true, printXStatus);
}
public void startPrintReceipt(boolean isFirstPrint) { public void startPrintReceipt(boolean isFirstPrint) {
/* /*

View File

@ -300,7 +300,6 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
payDetail.setIsCanceled(true); payDetail.setIsCanceled(true);
updatePayDetail(payDetail); updatePayDetail(payDetail);
payResult.setESignBlob(payDetail.getESignBlob()); payResult.setESignBlob(payDetail.getESignBlob());
payResult.setCurrencyCode(payDetail.getCurrencyCode());
repository.insertPayDetail(updateCurrentDateAndTime(payResult)); repository.insertPayDetail(updateCurrentDateAndTime(payResult));
} }

View File

@ -63,7 +63,7 @@ public class QRPayFragment extends DataBindingFragment {
features.add(new QRPayItem("Refund", R.drawable.ic_refund, true)); features.add(new QRPayItem("Refund", R.drawable.ic_refund, true));
} }
features.add(new QRPayItem("History", R.drawable.ic_history, true)); features.add(new QRPayItem("History", R.drawable.ic_history, true));
// features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true)); features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true));
// List<QRPayItem> features = List.of( // List<QRPayItem> features = List.of(
// new QRPayItem("Sale", R.drawable.ic_qr_pay, true), // new QRPayItem("Sale", R.drawable.ic_qr_pay, true),

View File

@ -6,8 +6,6 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.utsmm.kbz.config.data.model.ValidityStatus;
import com.utsmm.kbz.util.tms.TMSUtil;
import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.fragment.DataBindingFragment;
import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.baselib.util.DataBindingConfig;
import com.utsmyanmar.paylibs.utils.enums.HostType; import com.utsmyanmar.paylibs.utils.enums.HostType;
@ -18,7 +16,9 @@ import com.utsmm.kbz.config.Constants;
import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.ecr.CoreUtils; import com.utsmm.kbz.util.ecr.CoreUtils;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType; import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
import com.utsmm.kbz.util.tms.TMSUtil;
import com.utsmm.kbz.util.Connectivity; import com.utsmm.kbz.util.Connectivity;
import com.utsmm.kbz.config.data.model.ValidityStatus;
public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback { public class SelectSettlementFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback {
@ -80,7 +80,9 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat
public class ClickEvent { public class ClickEvent {
public void onCardSettlement() { public void onCardSettlement() {
if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) {
showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage());
} else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
} else{ } else{
routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment; routeId = R.id.action_selectSettlementFragment_to_settlementTransactionFragment;
@ -108,4 +110,4 @@ public class SelectSettlementFragment extends DataBindingFragment implements Dat
popBackStack(); popBackStack();
} }
} }
} }

View File

@ -36,7 +36,9 @@ import com.utsmyanmar.paylibs.model.QRSettleData;
import com.utsmyanmar.paylibs.model.SettleData; import com.utsmyanmar.paylibs.model.SettleData;
import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.Connectivity; import com.utsmm.kbz.util.Connectivity;
import com.utsmm.kbz.config.data.model.ValidityStatus;
import com.utsmm.kbz.util.ecr.CoreUtils; import com.utsmm.kbz.util.ecr.CoreUtils;
import com.utsmm.kbz.util.tms.TMSUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -115,7 +117,10 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
super.onResume(); super.onResume();
if(sharedViewModel.getTransMenu().getValue() == TransMenu.SETTLEMENT) { if(sharedViewModel.getTransMenu().getValue() == TransMenu.SETTLEMENT) {
if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) { if (TMSUtil.getInstance().checkParams().isStatus() == ValidityStatus.FAILURE) {
showDeclineDialog(getResourceString(R.string.txt_please_download_config)+"\n"+TMSUtil.getInstance().checkParams().getMessage());
return;
} else if (!Connectivity.isConnectedWifi(getContext()) && !Connectivity.isConnectedMobile(getContext())) {
showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet)); showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
return; return;
} }

View File

@ -76,6 +76,10 @@ public class CurrencySelectionHelper {
values.add(normalizeCurrency(primaryCurrency.name)); values.add(normalizeCurrency(primaryCurrency.name));
} }
if (!SystemParamsOperation.getInstance().getDuelCurrencyStatus()) {
return new ArrayList<>(values);
}
String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency()); String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) { if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
values.add(secondaryCurrency); values.add(secondaryCurrency);

View File

@ -131,12 +131,12 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{sharedViewModel.payDetail != null ? sharedViewModel.amount : sharedViewModel.amount}" android:text="@{sharedViewModel._currencyText+` `+sharedViewModel.amount}"
android:textColor="@color/colorTextTitle" android:textColor="@color/colorTextTitle"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
android:fontFamily="@font/rubik_medium" android:fontFamily="@font/rubik_medium"
tools:text="250,000.00" /> tools:text="MMK 250,000.00" />
</LinearLayout> </LinearLayout>

View File

@ -300,12 +300,11 @@ public abstract class BaseXPrint {
return currencyMap; return currencyMap;
} }
protected void printMMQRReport(PayDetail payDetail, List<QRSettleData> qrList) { protected void printMMQRReport(List<QRSettleData> qrList) {
if (qrList == null || qrList.isEmpty()) return; if (qrList == null || qrList.isEmpty()) return;
long saleTotal = 0; long saleTotal = 0;
long refundTotal = 0; long refundTotal = 0;
String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
emptyLine(1); emptyLine(1);
@ -323,7 +322,7 @@ public abstract class BaseXPrint {
printString("Status :" + data.getStatus()); printString("Status :" + data.getStatus());
printString("Date :" + data.getDate()); printString("Date :" + data.getDate());
printString("Time :" + data.getTime()); printString("Time :" + data.getTime());
printString("Amount : " + currencySign + " " printString("Amount : MMK "
+ (data.getTransactionType() == TransactionsType.MMQR_REFUND.value ? "-" : "") + (data.getTransactionType() == TransactionsType.MMQR_REFUND.value ? "-" : "")
+ PrintUtils.getInstance().getSeparatorOnlyNumberFormat(data.getAmount())); + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(data.getAmount()));
emptyLine(1); emptyLine(1);
@ -333,13 +332,13 @@ public abstract class BaseXPrint {
dotBreak(); dotBreak();
// printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false); // printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false);
print2ColumnsString("Refund Total:", "-" + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + currencySign); print2ColumnsString("Refund Total:", "-" + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + "MMK");
dotBreak(); dotBreak();
// printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + " ", fontNormal, false); // printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + " ", fontNormal, false);
print2ColumnsString("SALE TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + currencySign); print2ColumnsString("SALE TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(saleTotal) + "MMK");
dotBreak(); dotBreak();
// printer.appendPrnStr("Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + " ", fontNormal, false); // printer.appendPrnStr("Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + " ", fontNormal, false);
print2ColumnsString("GRAND TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + currencySign); print2ColumnsString("GRAND TOTAL :", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(grandTotal) + "MMK");
dashBreakEnding(); dashBreakEnding();
emptyLine(1); emptyLine(1);
} }
@ -521,7 +520,7 @@ public abstract class BaseXPrint {
if (payDetail.getTradeAnswerCode().equals("00") || payDetail.getTradeAnswerCode().equals("000")) { if (payDetail.getTradeAnswerCode().equals("00") || payDetail.getTradeAnswerCode().equals("000")) {
String currencySign = currencyCodeToText(payDetail.getCurrencyCode()); String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) { if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) {
printer.appendPrnStr(currencySign + " " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr("MMK " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT, false);
} else if (payDetail.getTransactionType() == TransactionType.VOID || payDetail.getTransactionType() == TransactionType.REFUND || payDetail.getTransactionType() == TransactionType.PRE_SALE_CANCEL || payDetail.getTransactionType() == TransactionType.PRE_SALE_COMPLETE_VOID) { } else if (payDetail.getTransactionType() == TransactionType.VOID || payDetail.getTransactionType() == TransactionType.REFUND || payDetail.getTransactionType() == TransactionType.PRE_SALE_CANCEL || payDetail.getTransactionType() == TransactionType.PRE_SALE_COMPLETE_VOID) {
print2SideString("AMT:" + currencySign, "- " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isDecimalEnabled)); print2SideString("AMT:" + currencySign, "- " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isDecimalEnabled));
@ -683,7 +682,7 @@ public abstract class BaseXPrint {
String currencySign = currencyCodeToText(payDetail.getCurrencyCode()); String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
// CurrencyType currencySign = currencyTextToCurrencyType(payDetail.getCurrencyCode()); // CurrencyType currencySign = currencyTextToCurrencyType(payDetail.getCurrencyCode());
if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) { if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) {
printer.appendPrnStr(currencySign + " " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT, true); printer.appendPrnStr("MMK " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT, true);
} else { } else {
print2SideString("AMT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isDecimalEnabled)); print2SideString("AMT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isDecimalEnabled));
// printer.appendPrnStr("AMOUNT:" + currencySign + " " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true); // printer.appendPrnStr("AMOUNT:" + currencySign + " " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true);
@ -717,7 +716,7 @@ public abstract class BaseXPrint {
protected void printTransDetailSummary(PayDetail payDetail) { protected void printTransDetailSummary(PayDetail payDetail) {
String currencySign = currencyCodeToText(payDetail.getCurrencyCode()); String MMK = "MMK";
SettleData settleData = payDetail.getSettleDataObj(); SettleData settleData = payDetail.getSettleDataObj();
boolean isQrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable(); boolean isQrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
boolean isWallet = "WALLET".equalsIgnoreCase(payDetail.getAccountType()); boolean isWallet = "WALLET".equalsIgnoreCase(payDetail.getAccountType());
@ -743,7 +742,7 @@ public abstract class BaseXPrint {
// emptyLine(1); // emptyLine(1);
emptyLine(1); emptyLine(1);
printer.appendPrnStr("(COUNT)TRANS", "AMOUNT(" + currencySign + ")", fontNormal, false); printer.appendPrnStr("(COUNT)TRANS", "AMOUNT(MMK)", fontNormal, false);
if (!isWallet) { if (!isWallet) {
boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable(); boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
@ -1391,12 +1390,11 @@ public abstract class BaseXPrint {
} }
} }
protected void printQRSettlementTransDetail(PayDetail payDetail, List<QRSettleData> lists) { protected void printQRSettlementTransDetail(List<QRSettleData> lists) {
long totalAmount = 0; long totalAmount = 0;
long refundTotal = 0; long refundTotal = 0;
String currencySign = currencyCodeToText(payDetail.getCurrencyCode());
for (QRSettleData pay : lists) { for (QRSettleData pay : lists) {
@ -1410,7 +1408,7 @@ public abstract class BaseXPrint {
printString("Status :" + pay.getStatus()); printString("Status :" + pay.getStatus());
printString("Date :" + pay.getDate()); printString("Date :" + pay.getDate());
printString("Time :" + pay.getTime()); printString("Time :" + pay.getTime());
printString("Amount : " + currencySign + " " printString("Amount : MMK "
+ (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value ? "-" : "") + (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value ? "-" : "")
+ PrintUtils.getInstance().getSeparatorOnlyNumberFormat(pay.getAmount())); + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(pay.getAmount()));
@ -1426,13 +1424,13 @@ public abstract class BaseXPrint {
dashBreak(); dashBreak();
// print2ColumnsString("Refund Total:MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal)); // print2ColumnsString("Refund Total:MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal));
printer.appendPrnStr("Refund Total:" + currencySign, "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false); printer.appendPrnStr("Refund Total:MMK", "- " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal) + " ", fontNormal, false);
dashBreak(); dashBreak();
// print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount)); // print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount));
printer.appendPrnStr("Sale Total :" + currencySign, PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount) + " ", fontNormal, false); printer.appendPrnStr("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount) + " ", fontNormal, false);
dashBreak(); dashBreak();
// print2ColumnsString("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal)); // print2ColumnsString("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal));
printer.appendPrnStr("Grand Total :" + currencySign, PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal) + " ", fontNormal, false); printer.appendPrnStr("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal) + " ", fontNormal, false);
dashBreakEnding(); dashBreakEnding();
// emptyLine(2); // emptyLine(2);
} }
@ -1648,7 +1646,6 @@ public abstract class BaseXPrint {
if (printer.getStatus() != SdkResult.Success) { if (printer.getStatus() != SdkResult.Success) {
callbackStatus.onFailure(); callbackStatus.onFailure();
return;
} }
printer.startPrint(true, new OnPrintListener() { printer.startPrint(true, new OnPrintListener() {

View File

@ -112,9 +112,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
if (callbackStatus != null) {
callbackStatus.onFailure();
}
} }
} }
@ -180,9 +177,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
} catch (RemoteException | NullPointerException e) { } catch (RemoteException | NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
if (callbackStatus != null) {
callbackStatus.onFailure();
}
} }
} }
@ -222,7 +216,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
printMerchantHeader(); printMerchantHeader();
printTransHeader(payDetail); printTransHeader(payDetail);
printTransDetailSettlement(payDetail); printTransDetailSettlement(payDetail);
printMMQRReport(payDetail, qrList); printMMQRReport(qrList);
printTransFooterForSettlement(); printTransFooterForSettlement();
emptyLine(1); emptyLine(1);
@ -243,7 +237,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
printLogo(); printLogo();
printMerchantHeader(); printMerchantHeader();
printTransHeader(payDetail, HostType.QR); printTransHeader(payDetail, HostType.QR);
printQRSettlementTransDetail(payDetail, list); printQRSettlementTransDetail(list);
printTransFooterSummary(); printTransFooterSummary();
emptyLine(1); emptyLine(1);
@ -311,9 +305,6 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
} catch (RemoteException | NullPointerException e) { } catch (RemoteException | NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
if (callbackStatus != null) {
callbackStatus.onFailure();
}
} }
} }
@ -380,10 +371,9 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value; boolean isNeedMinusSign = payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value;
boolean isQrDecimalEnable = SystemParamsOperation.getInstance().isQrDecimalEnable(); boolean isQrDecimalEnable = SystemParamsOperation.getInstance().isQrDecimalEnable();
String currencySign = POSUtil.getInstance().currencyCodeToText(payDetail.getCurrencyCode());
dotBreak(); dotBreak();
print2ColumnsStringBoldCenter("AMOUNT :", isNeedMinusSign? "- "+PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isQrDecimalEnable) + " " + currencySign: PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isQrDecimalEnable) + " " + currencySign,fontLarge, AlignEnum.LEFT); print2ColumnsStringBoldCenter("AMOUNT :", isNeedMinusSign? "- "+PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isQrDecimalEnable) + " MMK": PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount(), isQrDecimalEnable) + " MMK",fontLarge, AlignEnum.LEFT);
dotBreak(); dotBreak();
// if(payDetail.getTransactionType() == TransactionsType.MMQR.value) { // if(payDetail.getTransactionType() == TransactionsType.MMQR.value) {
// String data = payDetail.getReferNo()+"-"+payDetail.getAmount()+"-"+payDetail.getQrTransId()+"-"+payDetail.getMerchantNo()+"-"+payDetail.getCustomerMobile().toUpperCase()+"-"+payDetail.getOriginalTransDate(); // String data = payDetail.getReferNo()+"-"+payDetail.getAmount()+"-"+payDetail.getQrTransId()+"-"+payDetail.getMerchantNo()+"-"+payDetail.getCustomerMobile().toUpperCase()+"-"+payDetail.getOriginalTransDate();

View File

@ -385,7 +385,7 @@ public class POSUtil {
return "Success"; return "Success";
}*/ }*/
String currencySign = currencyCodeToText(payDetail.getCurrencyCode()); String currencySign = SystemParamsOperation.getInstance().getCurrencyType().name;
if(payDetail.getTransactionType() == TransactionsType.VOID.value ) { if(payDetail.getTransactionType() == TransactionsType.VOID.value ) {
return "Transaction for Amount \n"+getDecimalAmountFormat(payDetail.getAmount()) +" "+currencySign+" Voided."; return "Transaction for Amount \n"+getDecimalAmountFormat(payDetail.getAmount()) +" "+currencySign+" Voided.";
@ -410,7 +410,7 @@ public class POSUtil {
} }
} else if(TextUtils.equals(payDetail.getAccountType(),"WALLET")) { } else if(TextUtils.equals(payDetail.getAccountType(),"WALLET")) {
if(payDetail.getQrTransStatus() == 1) { if(payDetail.getQrTransStatus() == 1) {
return "Transaction for Amount \n"+getDecimalAmountFormat(payDetail.getAmount()) +" "+currencyCodeToText(payDetail.getCurrencyCode())+" Received."; return "Transaction for Amount \n"+getDecimalAmountFormat(payDetail.getAmount()) +" MMK Received.";
} else if(payDetail.getQrTransStatus() == 3){ } else if(payDetail.getQrTransStatus() == 3){
return "Declined \n COMMUNICATION ERROR"; return "Declined \n COMMUNICATION ERROR";
} else if(payDetail.getQrTransStatus() == 2) { } else if(payDetail.getQrTransStatus() == 2) {