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

fixed for sale transactions are not updated at print settlement slip.

Browse Source
This commit is contained in:
kizzy 2026-07-28 12:47:33 +07:00
parent 81eaa80299
commit 6b9660a7d3
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
settlementViewModel.getSettlementPOS().observe(getViewLifecycleOwner(), payDetails -> { settlementViewModel.getSettlementPOS().observe(getViewLifecycleOwner(), payDetails -> {
resetSettlementCounters(); resetSettlementCounters();
if(payDetails != null && !payDetails.isEmpty()) { if(payDetails != null && !payDetails.isEmpty()) {
cardTransactionsList = payDetails; cardTransactionsList = new ArrayList<>(payDetails);
for(PayDetail payDetail:payDetails) { for(PayDetail payDetail:payDetails) {
int transType = payDetail.getTransactionType(); int transType = payDetail.getTransactionType();
@ -702,20 +702,7 @@ public class SettlementTransactionFragment extends DataBindingFragment implement
private void updateData() { private void updateData() {
PayDetail payDetail = settlementViewModel.getPayDetail(); PayDetail payDetail = settlementViewModel.getPayDetail();
List<PayDetail> cardSettleSource = new ArrayList<>(); // Keep cardSettleData from ViewModel (built before updateDB clears payDetails).
if (cardTransactionsList != null && !cardTransactionsList.isEmpty()) {
cardSettleSource.addAll(cardTransactionsList);
}
for (PayDetail pay : settlementViewModel.deleteTrans) {
if (pay.getTransactionType() == TransactionType.VOID && !pay.isCanceled) {
cardSettleSource.add(pay);
} else if (pay.getTransactionType() == TransactionType.SALE && pay.isCanceled) {
cardSettleSource.add(pay);
}
}
if (!cardSettleSource.isEmpty()) {
payDetail.setCardSettleData(CardSettleData.convertFromPayDetail(cardSettleSource));
}
if (qrTransactionsList != null && !qrTransactionsList.isEmpty()) { if (qrTransactionsList != null && !qrTransactionsList.isEmpty()) {
payDetail.setQrSettleData(QRSettleData.convertFromPayDetail(qrTransactionsList)); payDetail.setQrSettleData(QRSettleData.convertFromPayDetail(qrTransactionsList));

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

@ -228,8 +228,7 @@ public class SettlementViewModel extends ViewModel {
public void setPayDetails(List<PayDetail> payDetailList) { public void setPayDetails(List<PayDetail> payDetailList) {
this.payDetails = payDetailList == null ? null : new ArrayList<>(payDetailList);
this.payDetails = payDetailList;
} }
public void updatePayDetail(PayDetail payDetail){ public void updatePayDetail(PayDetail payDetail){