diff --git a/app/src/main/java/com/utsmm/kbz/service/AutoSettleService.java b/app/src/main/java/com/utsmm/kbz/service/AutoSettleService.java
index 85a488d..6156a5c 100644
--- a/app/src/main/java/com/utsmm/kbz/service/AutoSettleService.java
+++ b/app/src/main/java/com/utsmm/kbz/service/AutoSettleService.java
@@ -40,6 +40,7 @@ import com.utsmyanmar.paylibs.batch_upload.BatchUploadProcess;
 import com.utsmyanmar.paylibs.isobuilder.ISOMode;
 import com.utsmyanmar.paylibs.isobuilder.builderx.ISOMsgX;
 import com.utsmyanmar.paylibs.isobuilder.builderx.ISOVersion;
+import com.utsmyanmar.paylibs.model.CardSettleData;
 import com.utsmyanmar.paylibs.model.MsgField;
 import com.utsmyanmar.paylibs.model.PayDetail;
 import com.utsmyanmar.paylibs.model.QRSettleData;
@@ -257,6 +258,7 @@ public class AutoSettleService extends Service {
                 SettleData settleData = new SettleData(
                         saleCount, saleAmount, preCount, preAmount, refundCount, refundAmount, caCount, caAmount);
                 payDetail.setSettleDataObj(settleData);
+                payDetail.setCardSettleData(CardSettleData.convertFromPayDetail(list));
 
                 long totalAmount = saleAmount + preAmount + refundAmount + caAmount;
                 String settlementData;
diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java
index f0fb1f4..2928fca 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementViewModel.java
@@ -74,36 +74,36 @@ public class SettlementViewModel extends ViewModel {
     public SingleLiveEvent<TransactionStatus> resultString = new SingleLiveEvent<>();
 
 
-    public SingleLiveEvent<Integer> sale_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> sale_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> sale_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> sale_count = new MutableLiveData<>();
+    public MutableLiveData<Long> sale_amount = new MutableLiveData<>();
+    public MutableLiveData<String> sale_breakdown = new MutableLiveData<>();
     //qr
-    public SingleLiveEvent<Integer> qr_sale_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> qr_sale_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> qr_sale_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> qr_sale_count = new MutableLiveData<>();
+    public MutableLiveData<Long> qr_sale_amount = new MutableLiveData<>();
+    public MutableLiveData<String> qr_sale_breakdown = new MutableLiveData<>();
     
-    public SingleLiveEvent<Integer> void_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> void_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> void_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> void_count = new MutableLiveData<>();
+    public MutableLiveData<Long> void_amount = new MutableLiveData<>();
+    public MutableLiveData<String> void_breakdown = new MutableLiveData<>();
 
-    public SingleLiveEvent<Integer> pre_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> pre_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> pre_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> pre_count = new MutableLiveData<>();
+    public MutableLiveData<Long> pre_amount = new MutableLiveData<>();
+    public MutableLiveData<String> pre_breakdown = new MutableLiveData<>();
 
-    public SingleLiveEvent<Integer> refund_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> refund_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> refund_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> refund_count = new MutableLiveData<>();
+    public MutableLiveData<Long> refund_amount = new MutableLiveData<>();
+    public MutableLiveData<String> refund_breakdown = new MutableLiveData<>();
 
-    public SingleLiveEvent<Integer> ca_count = new SingleLiveEvent<>();
-    public SingleLiveEvent<Long> ca_amount = new SingleLiveEvent<>();
-    public SingleLiveEvent<String> ca_breakdown = new SingleLiveEvent<>();
+    public MutableLiveData<Integer> ca_count = new MutableLiveData<>();
+    public MutableLiveData<Long> ca_amount = new MutableLiveData<>();
+    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 */
-    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);
 
diff --git a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
index 7deeab2..9c1c593 100644
--- a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
+++ b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
@@ -460,7 +460,7 @@ public class TMSSetupsImpl implements TMSSetups{
                 SystemParamsOperation.getInstance().setRandomPinPad(parseBoolean(data));
             } 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")) {
 
                 SystemParamsOperation.getInstance().setAlertSound(parseBoolean(data));
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
index 30cdbc0..010c752 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
@@ -419,7 +419,7 @@ public abstract class BaseXPrint {
     protected void printTransFooterForSettlement() {
         String receiptFooter = SystemParamsOperation.getInstance().getReceiptFooter();
         String finalVersion = SystemParamsOperation.getInstance().getFinalVersion();
-        printer.appendPrnStr("**** SETTLEMENT CONFIRMED ****", fontNormal, AlignEnum.CENTER, false);
+        printer.appendPrnStr("****SETTLEMENT CONFIRMED****", fontNormal, AlignEnum.CENTER, false);
         printer.appendPrnStr(receiptFooter, fontNormal, AlignEnum.CENTER, false);
     }