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

merge fix

Browse Source
This commit is contained in:
MooN 2025-11-16 22:34:22 +06:30
parent 063dfae87f
commit 7c266677e7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
View File

@ -135,7 +135,7 @@ public class QRPayFragment extends DataBindingFragment {
} }
private void onClickRefund(){ private void onClickRefund(){
sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND); // sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND);
routeId = R.id.action_qrFragment_to_qr_refund_list; routeId = R.id.action_qrFragment_to_qr_refund_list;
// routeId = R.id.action_qrFragment_to_inputPasswordFragment; // routeId = R.id.action_qrFragment_to_inputPasswordFragment;
safeNavigateToRouteId(); safeNavigateToRouteId();

4
app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundDetailFragment.java
View File

@ -209,12 +209,12 @@ public class QRRefundDetailFragment extends DataBindingFragment {
QRRefund qrRefund = new QRRefund(referenceNo, refundAmountStr, originalAmountStr, refundReason); QRRefund qrRefund = new QRRefund(referenceNo, refundAmountStr, originalAmountStr, refundReason);
kPayViewModel.setQrRefund(qrRefund); // kPayViewModel.setQrRefund(qrRefund);
} else { } else {
QRRefund qrRefund = new QRRefund(referenceNo, "0", etOriginalAmount.getText().toString().trim(), refundReason); QRRefund qrRefund = new QRRefund(referenceNo, "0", etOriginalAmount.getText().toString().trim(), refundReason);
kPayViewModel.setQrRefund(qrRefund); // kPayViewModel.setQrRefund(qrRefund);
} }
kPayViewModel.setPayDetail(payDetail); kPayViewModel.setPayDetail(payDetail);

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

@ -88,7 +88,7 @@ public class QRRefundProcessFragment extends DataBindingFragment {
private void initData() { private void initData() {
payDetail = kPayViewModel.getPayDetail(); payDetail = kPayViewModel.getPayDetail();
qrRefund = kPayViewModel.getQrRefund(); // qrRefund = kPayViewModel.getQrRefund();
} }
private void processKPayRefund(String referenceNo, String refundAmount, String originalAmount, String reason) { private void processKPayRefund(String referenceNo, String refundAmount, String originalAmount, String reason) {