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:ccebba6ba7dcd0ce0aa0b091fc2f82287e0ac9a3
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:merge_latest_SIT
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:adbd0724af63d9942dc62d80d2c19fe6aeea43db
Branches Tags
Kyaw_Min_Khant:merge_latest_SIT
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. "ccebba6ba7dcd0ce0aa0b091fc2f82287e0ac9a3" and "adbd0724af63d9942dc62d80d2c19fe6aeea43db" have entirely different histories.
ccebba6ba7 ... adbd0724af

3 changed files with 10 additions and 25 deletions
Show Stats Expand all files Collapse all files

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

@ -26,8 +26,6 @@ import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.DecimalDigitsInputFilter;
import com.utsmm.kbz.util.TransactionUtil;
import java.text.DecimalFormat;
public class QRRefundDetailFragment extends DataBindingFragment {
@ -45,8 +43,6 @@ public class QRRefundDetailFragment extends DataBindingFragment {
private EditText etReferenceNo, etOriginalAmount, etRefundAmount, etRefundReason;
private LinearLayout originalAmountLayout, refundAmountLayout;
private String originalRefundAmount;
private boolean isPartialRefund = false;
@ -126,10 +122,6 @@ public class QRRefundDetailFragment extends DataBindingFragment {
}
private void initData() {
double realAmount = payDetail.getAmount() / 100.0;
DecimalFormat df = new DecimalFormat("0.00");
originalRefundAmount = df.format(realAmount);
payDetail = TransactionUtil.getInstance().initWalletTransaction(TransactionsType.MMQR_REFUND);
payDetail.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
@ -152,8 +144,8 @@ public class QRRefundDetailFragment extends DataBindingFragment {
} else {
// Hide amount fields for original refund
isPartialRefund = false;
originalAmountLayout.setVisibility(View.VISIBLE);
refundAmountLayout.setVisibility(View.VISIBLE);
originalAmountLayout.setVisibility(View.GONE);
refundAmountLayout.setVisibility(View.GONE);
}
});
}
@ -170,8 +162,6 @@ public class QRRefundDetailFragment extends DataBindingFragment {
String referenceNo = etReferenceNo.getText().toString().trim();
String refundReason = etRefundReason.getText().toString().trim();
String originalAmountStr = etOriginalAmount.getText().toString().trim();
String refundAmountStr = etRefundAmount.getText().toString().trim();
// Validate reference number
if (referenceNo.isEmpty()) {
@ -181,8 +171,8 @@ public class QRRefundDetailFragment extends DataBindingFragment {
if (isPartialRefund) {
// Partial refund validation
// String originalAmountStr = etOriginalAmount.getText().toString().trim();
// String refundAmountStr = etRefundAmount.getText().toString().trim();
String originalAmountStr = etOriginalAmount.getText().toString().trim();
String refundAmountStr = etRefundAmount.getText().toString().trim();
if (originalAmountStr.isEmpty()) {
kPayViewModel.invalidAmountMsg.setValue("Enter original amount");
@ -217,16 +207,12 @@ public class QRRefundDetailFragment extends DataBindingFragment {
kPayViewModel.setQrRefund(qrRefund);
} else {
// String originalAmountStr = etOriginalAmount.getText().toString().trim();
// String refundAmountStr = etRefundAmount.getText().toString().trim();
QRRefund qrRefund = new QRRefund(referenceNo, refundAmountStr, originalRefundAmount, refundReason);
QRRefund qrRefund = new QRRefund(referenceNo, "0", etOriginalAmount.getText().toString().trim(), refundReason);
kPayViewModel.setQrRefund(qrRefund);
}
sharedViewModel.transactionsType.setValue(TransactionsType.MMQR_REFUND);
kPayViewModel.setPayDetail(payDetail);
// sharedViewModel.amount.setValue(refundAmountStr);
routeId = R.id.action_qrRefundDetail_inputPasswordFragment;
safeNavigateToRouteId();
}

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

@ -127,7 +127,7 @@ public class QRRefundProcessFragment extends DataBindingFragment {
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
response -> {
handleRefundResponse(response, referenceNo, originalAmount);
handleRefundResponse(response, referenceNo);
},
throwable -> {
LogUtil.e(TAG, "Refund error: " + throwable.getMessage());
@ -141,12 +141,14 @@ public class QRRefundProcessFragment extends DataBindingFragment {
refundDisposable.add(refundDi);
}
private void handleRefundResponse(KPayRefund.RefundResponse response, String referenceNo, String orgAmount) {
private void handleRefundResponse(KPayRefund.RefundResponse response, String referenceNo) {
if (response != null && response.getResponse() != null && "REFUND_SUCCESS".equalsIgnoreCase(response.getResponse().getRefundStatus())) {
LogUtil.d(TAG, "Refund successful!");
String refundAmount = response.getResponse().getRefundAmount();
Log.d(TAG, "refund amount -> " + refundAmount);
long text = POSUtil.getInstance().convertAmount(refundAmount);
Log.d(TAG, "refund amount but long -> " + text);
String dateTime = SystemDateTime.getTodayDateFormat() + " " + SystemDateTime.getTodayTimeFormat();
payDetail.setTC(response.getResponse().getRefundStatus());
@ -183,7 +185,6 @@ public class QRRefundProcessFragment extends DataBindingFragment {
if (response != null && response.getResponse() != null && response.getResponse().getMsg() != null) {
errorMsg = response.getResponse().getMsg();
}
payDetail.setTradeResultDes(errorMsg);
EReceiptRequest request = EReceiptUtil.getInstance().generateQRRefundReceipt(
"0",
@ -195,7 +196,7 @@ public class QRRefundProcessFragment extends DataBindingFragment {
TransResultStatus.FAIL
);
sharedViewModel.pushReceipt(request);
sharedViewModel.amount.setValue(orgAmount);
sharedViewModel.payDetail.setValue(payDetail);
navigateToNext();
}

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

@ -819,8 +819,6 @@ public abstract class BaseXPrint {
print2ColumnsString("Refund Total:MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(refundTotal));
dashBreak();
print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount));
dashBreak();
print2ColumnsString("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal));
dashBreakEnding();
// emptyLine(2);