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

no 7 and 8 fixed

Browse Source
This commit is contained in:
kizzy 2025-12-11 13:21:46 +07:00
parent d76b48d4ca
commit a071c53823
9 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/ChatHistory_schema_v3.xml
View File

File diff suppressed because one or more lines are too long

1
app/src/main/java/com/utsmm/kbz/ui/kpay/QRConnectingFragment.java
View File

@ -168,7 +168,6 @@ public class QRConnectingFragment extends DataBindingFragment implements DataBin
LogUtil.d(TAG,"Ref Label :"+refLabel);
payDetail.setPayQRCode(response.getResponse().getQrCode());
payDetail.setQrReferNo(refLabel);
payDetail.setQrTransStatus(2);
payDetail.setReferNo(refLabel);

2
app/src/main/java/com/utsmm/kbz/ui/kpay/QRRefundFragment.java
View File

@ -196,7 +196,6 @@ public class QRRefundFragment extends DataBindingFragment {
payDetail.setAmount(refundAmount == null ? 0 : POSUtil.getInstance().convertAmount(refundAmount));
payDetail.setOriginalTransDate(dateTime);
payDetail.setQrTransStatus(1);
payDetail.setQrReferNo(referenceNo);
payDetail.setReferNo(referenceNo);
payDetail.setIsCanceled(true);
@ -207,7 +206,6 @@ public class QRRefundFragment extends DataBindingFragment {
} else {
LogUtil.d(TAG, "Refund failed!");
payDetail.setQrTransStatus(-1);
payDetail.setQrReferNo(referenceNo);
payDetail.setReferNo(referenceNo);
String errorMsg = "Refund failed";

8
app/src/main/java/com/utsmm/kbz/ui/kpay/QRTransactionFragment.java
View File

@ -277,9 +277,6 @@ public class QRTransactionFragment extends DataBindingFragment implements DataBi
Disposable setUpDi = Observable.interval(intervalInSec, TimeUnit.SECONDS) // Emit an item every 10 seconds
.take(totalCount) // Take only 3 emissions
.flatMap(tick -> {
// Make the API call here using Retrofit
// WaveStatusRequest request = new WaveStatusRequest(refLabel, merchantId);
// DemoQRStatusRequest request = new DemoQRStatusRequest(refLabel, merchantId);
KPayQRQueryRequest.QRQueryRequest request = kPayViewModel.getQrStatus(refLabel,merchantId);
return kPayViewModel.checkStatus(request)
@ -308,8 +305,11 @@ public class QRTransactionFragment extends DataBindingFragment implements DataBi
payDetail.setCustomerMobile("KBZ PAY");
}
if(response.getResponse().getMmqrRef() != null) {
payDetail.setQrReferNo(response.getResponse().getMmqrRef());
}
payDetail.setTC(response.getResponse().getTradeStatus());
payDetail.setQrReferNo(refLabel);
payDetail.setQrTransId(response.getResponse().getMmOrderId());
payDetail.setReferNo(refLabel);
payDetail.setApprovalCode(response.getResponse().getMmOrderId());

12
app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
View File

@ -62,6 +62,13 @@ public class QRRefundProcessFragment extends DataBindingFragment {
.addBindingParam(BR.kPayViewModel, kPayViewModel);
}
@Override
public void onResume() {
super.onResume();
setToolBarTitleWithoutBackIcon("QR Refund Process");
}
@Override
public void onDestroyView() {
super.onDestroyView();
@ -144,7 +151,9 @@ public class QRRefundProcessFragment extends DataBindingFragment {
payDetail.setAmount(refundAmount == null ? 0 : POSUtil.getInstance().convertAmount(refundAmount));
payDetail.setOriginalTransDate(dateTime);
payDetail.setQrTransStatus(1);
payDetail.setQrReferNo(referenceNo);
if(response.getResponse().getMmqrRef() != null) {
payDetail.setQrReferNo(response.getResponse().getMmqrRef());
}
payDetail.setReferNo(referenceNo);
payDetail.setIsCanceled(true);
payDetail.setCustomerMobile(response.getResponse().getWalletIdentifier());
@ -163,7 +172,6 @@ public class QRRefundProcessFragment extends DataBindingFragment {
} else {
LogUtil.d(TAG, "Refund failed!");
payDetail.setQrTransStatus(-1);
payDetail.setQrReferNo(referenceNo);
payDetail.setReferNo(referenceNo);
String errorMsg = "Refund failed";

30
app/src/main/res/layout/fragment_print_receipt_screen.xml
View File

@ -222,6 +222,36 @@
</LinearLayout>
<!-- MMQR Ref Row -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginTop="8dp"
android:visibility="@{(sharedViewModel.payDetail != null &amp;&amp; sharedViewModel.payDetail.qrReferNo != null &amp;&amp; !sharedViewModel.payDetail.qrReferNo.empty) ? android.view.View.VISIBLE : android.view.View.GONE}">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="MMQR Ref"
android:textColor="@color/colorTextContent"
android:textSize="14sp"
android:fontFamily="@font/rubik_regular" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{sharedViewModel.payDetail.qrReferNo}"
android:textColor="@color/colorTextTitle"
android:textSize="14sp"
android:fontFamily="@font/rubik_medium"
tools:text="REF123456789" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>

9
baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayQRQueryRequest.java
View File

@ -245,6 +245,9 @@ public class KPayQRQueryRequest {
@SerializedName("Wallet_identifier")
private String walletIdentifier;
@SerializedName("mmqr_ref")
private String mmqrRef;
public Response() {
}
@ -312,6 +315,8 @@ public class KPayQRQueryRequest {
public String getWalletIdentifier() { return walletIdentifier; }
public String getMmqrRef() { return mmqrRef; }
public void setPaySuccessTime(String paySuccessTime) { this.paySuccessTime = paySuccessTime; }
public void setMmOrderId(String mmOrderId) { this.mmOrderId = mmOrderId;}
@ -359,6 +364,10 @@ public class KPayQRQueryRequest {
public void setWalletIdentifier(String walletIdentifier) {
this.walletIdentifier = walletIdentifier;
}
public void setMmqrRef(String mmqrRef) {
this.mmqrRef = mmqrRef;
}
}
public boolean checkResponse() {

9
baselib/src/main/java/com/utsmyanmar/baselib/network/model/KPayRefund.java
View File

@ -292,6 +292,9 @@ public class KPayRefund {
@SerializedName("Wallet_identifier")
private String walletIdentifier;
@SerializedName("mmqr_ref")
private String mmqrRef;
public RefundResp() {
}
@ -371,6 +374,8 @@ public class KPayRefund {
public String getWalletIdentifier() {return walletIdentifier; }
public String getMmqrRef() {return mmqrRef; }
public void setMsg(String msg) {
this.msg = msg;
}
@ -430,6 +435,10 @@ public class KPayRefund {
public void setWalletIdentifier(String walletIdentifier) {
this.walletIdentifier = walletIdentifier;
}
public void setMmqrRef(String mmqrRef) {
this.mmqrRef = mmqrRef;
}
}
}

3
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
View File

@ -317,6 +317,9 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
if(payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1 ) {
print2ColumnsStringNoSpace("PAYMENT TYPE ",": "+ (payDetail.getCustomerMobile() == null || payDetail.getCustomerMobile().isEmpty() ? "-": payDetail.getCustomerMobile().toUpperCase()));
print2ColumnsStringNoSpace("TRXN REF ",": "+ payDetail.getReferNo());
if(payDetail.getQrReferNo() != null && !payDetail.getQrReferNo().isEmpty()) {
print2ColumnsStringNoSpace("MMQR REF ",": "+ payDetail.getQrReferNo());
}
print2ColumnsStringNoSpace("TRXN ID ",": "+ (payDetail.getQrTransId() == null || payDetail.getQrTransId().isEmpty() ? "-": payDetail.getQrTransId()));
print2ColumnsStringNoSpace("STATUS ",": "+ PrintUtils.getInstance().getQrTransStatus(payDetail.getQrTransStatus()));