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

duel settlement

Browse Source
This commit is contained in:
moon 2026-07-12 20:24:57 +06:30
parent 05eca7560b
commit 5ecaf4abcc
4 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/utsmm/kbz/service/AutoSettleService.java
View File

@ -40,6 +40,7 @@ import com.utsmyanmar.paylibs.batch_upload.BatchUploadProcess;
import com.utsmyanmar.paylibs.isobuilder.ISOMode; import com.utsmyanmar.paylibs.isobuilder.ISOMode;
import com.utsmyanmar.paylibs.isobuilder.builderx.ISOMsgX; import com.utsmyanmar.paylibs.isobuilder.builderx.ISOMsgX;
import com.utsmyanmar.paylibs.isobuilder.builderx.ISOVersion; import com.utsmyanmar.paylibs.isobuilder.builderx.ISOVersion;
import com.utsmyanmar.paylibs.model.CardSettleData;
import com.utsmyanmar.paylibs.model.MsgField; import com.utsmyanmar.paylibs.model.MsgField;
import com.utsmyanmar.paylibs.model.PayDetail; import com.utsmyanmar.paylibs.model.PayDetail;
import com.utsmyanmar.paylibs.model.QRSettleData; import com.utsmyanmar.paylibs.model.QRSettleData;
@ -257,6 +258,7 @@ public class AutoSettleService extends Service {
SettleData settleData = new SettleData( SettleData settleData = new SettleData(
saleCount, saleAmount, preCount, preAmount, refundCount, refundAmount, caCount, caAmount); saleCount, saleAmount, preCount, preAmount, refundCount, refundAmount, caCount, caAmount);
payDetail.setSettleDataObj(settleData); payDetail.setSettleDataObj(settleData);
payDetail.setCardSettleData(CardSettleData.convertFromPayDetail(list));
long totalAmount = saleAmount + preAmount + refundAmount + caAmount; long totalAmount = saleAmount + preAmount + refundAmount + caAmount;
String settlementData; String settlementData;

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

@ -74,36 +74,36 @@ public class SettlementViewModel extends ViewModel {
public SingleLiveEvent<TransactionStatus> resultString = new SingleLiveEvent<>(); public SingleLiveEvent<TransactionStatus> resultString = new SingleLiveEvent<>();
public SingleLiveEvent<Integer> sale_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> sale_count = new MutableLiveData<>();
public SingleLiveEvent<Long> sale_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> sale_amount = new MutableLiveData<>();
public SingleLiveEvent<String> sale_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> sale_breakdown = new MutableLiveData<>();
//qr //qr
public SingleLiveEvent<Integer> qr_sale_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> qr_sale_count = new MutableLiveData<>();
public SingleLiveEvent<Long> qr_sale_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> qr_sale_amount = new MutableLiveData<>();
public SingleLiveEvent<String> qr_sale_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> qr_sale_breakdown = new MutableLiveData<>();
public SingleLiveEvent<Integer> void_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> void_count = new MutableLiveData<>();
public SingleLiveEvent<Long> void_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> void_amount = new MutableLiveData<>();
public SingleLiveEvent<String> void_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> void_breakdown = new MutableLiveData<>();
public SingleLiveEvent<Integer> pre_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> pre_count = new MutableLiveData<>();
public SingleLiveEvent<Long> pre_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> pre_amount = new MutableLiveData<>();
public SingleLiveEvent<String> pre_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> pre_breakdown = new MutableLiveData<>();
public SingleLiveEvent<Integer> refund_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> refund_count = new MutableLiveData<>();
public SingleLiveEvent<Long> refund_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> refund_amount = new MutableLiveData<>();
public SingleLiveEvent<String> refund_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> refund_breakdown = new MutableLiveData<>();
public SingleLiveEvent<Integer> ca_count = new SingleLiveEvent<>(); public MutableLiveData<Integer> ca_count = new MutableLiveData<>();
public SingleLiveEvent<Long> ca_amount = new SingleLiveEvent<>(); public MutableLiveData<Long> ca_amount = new MutableLiveData<>();
public SingleLiveEvent<String> ca_breakdown = new SingleLiveEvent<>(); public MutableLiveData<String> ca_breakdown = new MutableLiveData<>();
public SingleLiveEvent<SettlementType> settlementType = new SingleLiveEvent<>(); public MutableLiveData<SettlementType> settlementType = new MutableLiveData<>();
/* check is there settlement transactions or not */ /* check is there settlement transactions or not */
public SingleLiveEvent<Boolean> isNoData = new SingleLiveEvent<>(); public MutableLiveData<Boolean> isNoData = new MutableLiveData<>();
public SingleLiveEvent<Boolean> isSentData = new SingleLiveEvent<>(); public MutableLiveData<Boolean> isSentData = new MutableLiveData<>();
public MutableLiveData<Integer> btmLayout = new MutableLiveData<>(0); public MutableLiveData<Integer> btmLayout = new MutableLiveData<>(0);

2
app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
View File

@ -460,7 +460,7 @@ public class TMSSetupsImpl implements TMSSetups{
SystemParamsOperation.getInstance().setRandomPinPad(parseBoolean(data)); SystemParamsOperation.getInstance().setRandomPinPad(parseBoolean(data));
} else if (TextUtils.equals(name,"clear_batch_time")) { } else if (TextUtils.equals(name,"clear_batch_time")) {
SystemParamsOperation.getInstance().setClearBatchTime(data); SystemParamsOperation.getInstance().setClearBatchTime("20:00");
} else if (TextUtils.equals(name,"alert_sound_enable")) { } else if (TextUtils.equals(name,"alert_sound_enable")) {
SystemParamsOperation.getInstance().setAlertSound(parseBoolean(data)); SystemParamsOperation.getInstance().setAlertSound(parseBoolean(data));