diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java index 117fc8d..2a8a6c8 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java @@ -168,6 +168,7 @@ public class QRRefundProcessFragment extends DataBindingFragment { payDetail != null ? payDetail.getInvoiceNo() : "", payDetail != null ? payDetail.getVoucherNo() : "", payDetail != null ? payDetail.getQrReferNo() != null ? payDetail.getQrReferNo() : "" : "" , + payDetail != null ? payDetail.getCustomerMobile() : "", TransResultStatus.SUCCESS ); sharedViewModel.pushReceipt(request); @@ -191,6 +192,7 @@ public class QRRefundProcessFragment extends DataBindingFragment { payDetail != null ? payDetail.getInvoiceNo() : "", payDetail != null ? payDetail.getVoucherNo() : "", payDetail != null ? payDetail.getQrReferNo() != null ? payDetail.getQrReferNo() : "" : "" , + payDetail != null ? payDetail.getCustomerMobile() : "", TransResultStatus.FAIL ); sharedViewModel.pushReceipt(request); diff --git a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java index 988f46d..1cca851 100644 --- a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java +++ b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java @@ -73,7 +73,7 @@ public class EReceiptUtil { request.setShortCode(qrMerchantId); request.setMmqrRef(payDetail.getQrReferNo() == null ? "" : payDetail.getQrReferNo()); request.setHostId(hostId); - + request.setPaymentIdentifier(payDetail.getCustomerMobile()); request.setInvoiceNumber(payDetail.getInvoiceNo()); request.setDE11(payDetail.getVoucherNo()); @@ -106,6 +106,7 @@ public class EReceiptUtil { String invoiceNo, String voucherNo, String mmqrRef, + String paymentIdentifier, TransResultStatus status ) { long amt = POSUtil.getInstance().convertAmount(refundAmount); @@ -133,6 +134,8 @@ public class EReceiptUtil { request.setInvoiceNumber(invoiceNo != null ? invoiceNo : ""); request.setDE11(voucherNo != null ? voucherNo : ""); request.setHostId(hostId); + request.setMmqrRef(mmqrRef); + request.setPaymentIdentifier(paymentIdentifier); // need to add payment identifier field too diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/network/model/e_receipt/EReceiptRequest.java b/baselib/src/main/java/com/utsmyanmar/baselib/network/model/e_receipt/EReceiptRequest.java index 8357223..fa7a1ed 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/network/model/e_receipt/EReceiptRequest.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/network/model/e_receipt/EReceiptRequest.java @@ -38,13 +38,16 @@ public class EReceiptRequest { private String shortCode; private String terminalId; private String mmqrRef; - private String hostId; + private String paymentIdentifier; public EReceiptRequest() {} // GETTERS + public String getPaymentIdentifier(){ + return paymentIdentifier; + } public String getHostId(){ return hostId; } @@ -149,6 +152,11 @@ public class EReceiptRequest { public String getDE63_08() { return DE63_08; } + + //setters + public void setPaymentIdentifier(String paymentIdentifier){ + this.paymentIdentifier = paymentIdentifier; + } public void setDE63_05(String DE63_05) { this.DE63_05 = DE63_05; }