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

fixed for settlement

Browse Source
This commit is contained in:
kizzy 2026-03-31 21:49:43 +07:00
parent 175ebab148
commit ddd64fb48d
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java
View File

@ -12,6 +12,7 @@ import com.utsmm.kbz.ui.management.ManagementViewModel;
import com.utsmm.kbz.ui.settlement.model.CurrencyBucket; import com.utsmm.kbz.ui.settlement.model.CurrencyBucket;
import com.utsmm.kbz.util.CurrencySelectionHelper; import com.utsmm.kbz.util.CurrencySelectionHelper;
import com.utsmm.kbz.util.EReceiptUtil; import com.utsmm.kbz.util.EReceiptUtil;
import com.utsmm.kbz.util.enums.TransactionStatus;
import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.fragment.DataBindingFragment;
import com.utsmyanmar.baselib.network.model.e_receipt.EReceiptRequest; import com.utsmyanmar.baselib.network.model.e_receipt.EReceiptRequest;
import com.utsmyanmar.baselib.util.DataBindingConfig; import com.utsmyanmar.baselib.util.DataBindingConfig;
@ -455,13 +456,14 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
@Override @Override
public void onSuccessSignOn() { public void onSuccessSignOn() {
if(isUSDSettleNeeded()) { if(settlementViewModel.resultString.getValue() != TransactionStatus.ON_FINAL_SUCCESS) {
currencySelectionHelper.applyCardCurrencyAndHost("MMK"); currencySelectionHelper.applyCardCurrencyAndHost("MMK");
settlementViewModel.startSettlementProcess(mmkBucket,true); settlementViewModel.startSettlementProcess(mmkBucket,true);
} else { } else {
navigateToNext(); navigateToNext();
} }
} }
@Override @Override

17
app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java
View File

@ -234,14 +234,7 @@ public class SettlementViewModel extends ViewModel {
if(payDetails != null && payDetails.size() > 0) { if(payDetails != null && payDetails.size() > 0) {
for (PayDetail pay:payDetails) { for (PayDetail pay:payDetails) {
// if(paydetail.getTransactionType() == TransactionsType.SALE.value) {
// paydetail.setIsSettle(true);
// updatePayDetail(paydetail);
// } else {
deletePayDetail(pay); deletePayDetail(pay);
// repository.deletePayDetail(paydetail);
// }
} }
} }
@ -271,14 +264,6 @@ public class SettlementViewModel extends ViewModel {
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
public void startSettlementProcess(CurrencyBucket currencyBucket,boolean isLast) { public void startSettlementProcess(CurrencyBucket currencyBucket,boolean isLast) {
// saleCount = sale_count.getValue();
// saleAmount = sale_amount.getValue();
// preAuthCount = pre_count.getValue();
// preAuthAmount = pre_amount.getValue();
// refundCount = refund_count.getValue();
// refundAmount = refund_amount.getValue();
// caCount = ca_count.getValue();
// caAmount = ca_amount.getValue();
this.isLast = isLast; this.isLast = isLast;
SystemParamsOperation.getInstance().getIncrementBatchNo(); SystemParamsOperation.getInstance().getIncrementBatchNo();
@ -356,7 +341,7 @@ public class SettlementViewModel extends ViewModel {
updateDB(); updateDB();
insertPayDetail(payDetail); insertPayDetail(payDetail);
resultString.postValue(TransactionStatus.ON_SUCCESS); resultString.postValue(TransactionStatus.ON_FINAL_SUCCESS);
} }
private void requestOnlineProcessSettlement(CurrencyBucket currencyBucket) { private void requestOnlineProcessSettlement(CurrencyBucket currencyBucket) {