diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index 7039077..bbfd4b1 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -911,16 +911,6 @@ public class MainFragment extends DataBindingFragment {
 
     }
 
-    private void generateMockQR() {
-        String transDate = "24/12/25";
-        String transTime = "12:06:30";
-        TradeData tradeData = MockData.getInstance().generateMockDataWithTime(TransactionsType.MMQR, 1, transDate, transTime);
-        PayDetail payDetail = tradeData.getPayDetail();
-        sharedViewModel.insertPayDetail(payDetail);
-        LogUtil.d(TAG, "------------------- Inserted Mocked Data ------------------");
-        LogUtil.d(TAG, "trans date : " + payDetail.getTransDate() + "- Trans Time: " + payDetail.getTransTime());
-    }
-
 
     public class ClickEvent {
 
diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
index 8c0fdc9..4d8b27f 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java
@@ -24,6 +24,8 @@ import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
 import com.utsmyanmar.paylibs.utils.enums.CurrencyType;
 import com.utsmyanmar.paylibs.utils.enums.HostType;
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
+import com.utsmm.kbz.util.MockData;
+import com.utsmyanmar.paylibs.model.TradeData;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -61,6 +63,7 @@ public class QRPayFragment extends DataBindingFragment {
             features.add(new QRPayItem("Refund", R.drawable.ic_refund, true));
         }
         features.add(new QRPayItem("History", R.drawable.ic_history, true));
+        features.add(new QRPayItem("Mock QR", R.drawable.ic_qr_pay, true));
 
 //        List<QRPayItem> features = List.of(
 //                new QRPayItem("Sale", R.drawable.ic_qr_pay, true),
@@ -80,6 +83,9 @@ public class QRPayFragment extends DataBindingFragment {
                 case "History":
                     onClickHistory();
                     break;
+                case "Mock QR":
+                    onClickMockQR();
+                    break;
             }
         });
 
@@ -136,6 +142,22 @@ public class QRPayFragment extends DataBindingFragment {
         safeNavigateToRouteId();
     }
 
+    private void onClickMockQR(){
+        TradeData sale1 = MockData.getInstance().generateMockQRWithAmount(TransactionsType.MMQR, 5000L, "QR001");
+        sharedViewModel.insertPayDetail(sale1.getPayDetail());
+
+        TradeData sale2 = MockData.getInstance().generateMockQRWithAmount(TransactionsType.MMQR, 10000L, "QR002");
+        sharedViewModel.insertPayDetail(sale2.getPayDetail());
+
+        TradeData sale3 = MockData.getInstance().generateMockQRWithAmount(TransactionsType.MMQR, 3500L, "QR003");
+        sharedViewModel.insertPayDetail(sale3.getPayDetail());
+
+        TradeData refund1 = MockData.getInstance().generateMockQRWithAmount(TransactionsType.MMQR_REFUND, 2000L, "QR004");
+        sharedViewModel.insertPayDetail(refund1.getPayDetail());
+
+        showSingleInfoDialog("Mock QR inserted successfully");
+    }
+
     private void onClickRefund(){
 //        sharedViewModel.setTransactionsType(TransactionsType.MMQR_REFUND);
         routeId = R.id.action_qrFragment_to_qr_refund_list;
diff --git a/app/src/main/java/com/utsmm/kbz/util/MockData.java b/app/src/main/java/com/utsmm/kbz/util/MockData.java
index 5eefaf5..23db8a8 100644
--- a/app/src/main/java/com/utsmm/kbz/util/MockData.java
+++ b/app/src/main/java/com/utsmm/kbz/util/MockData.java
@@ -342,6 +342,71 @@ public class MockData {
         return tradeData;
     }
 
+    public TradeData generateMockQRWithAmount(TransactionsType transType, long amount, String qrTransId) {
+        String strDate = SystemDateTime.getMMDD();
+        String strTime = SystemDateTime.getHHmmss();
+        String strDateAndTime = SystemDateTime.getMMDDhhmmss();
+        String strDateTime = SystemDateTime.getYYMMDDhhmmss();
+        String strYearMonthDay = SystemDateTime.getYYMMDD();
+        String strTransDate = SystemDateTime.getTodayDateFormat();
+        String strTransTime = SystemDateTime.getTodayTimeFormat();
+
+        TradeData tradeData = new TradeData();
+        PayDetail payDetail = new PayDetail();
+        CardInfo cardInfo = new CardInfo();
+        MAGCardInfo magCardInfo = new MAGCardInfo();
+        ICCardInfo icCardInfo = new ICCardInfo();
+
+        magCardInfo.setTrack2Cipher("6234660011092075D22102201112210220110");
+        cardInfo.setMAGCardInfo(magCardInfo);
+        cardInfo.setICCardInfo(icCardInfo);
+        tradeData.setCardInfo(cardInfo);
+        payDetail.setCardInfo(cardInfo);
+
+        payDetail.batchNo = SystemParamsOperation.getInstance().getCurrentBatchNum();
+        payDetail.voucherNo = SystemParamsOperation.getInstance().getIncrementSerialNum();
+
+        payDetail.setMerchantNo(MERCHANT_ID);
+        payDetail.setMerchantName(MERCHANT_NAME);
+        payDetail.setTerminalNo(TERMINAL_ID);
+        payDetail.setCurrencyCode(CURRENCY_CODE);
+
+        payDetail.setCardSerialNo("000");
+        payDetail.setIsFreeSign(true);
+        payDetail.setIsCanceled(false);
+        payDetail.transNum = System.currentTimeMillis() / 1000;
+
+        payDetail.setOriginalTransDate(SystemDateTime.getMMDD() + SystemDateTime.getYYYY());
+        payDetail.setTransCVM(TransCVM.NO_CVM);
+
+        payDetail.setCardType(1);
+        payDetail.setTransType(transType.name);
+        payDetail.setProcessCode(transType.processCode);
+        payDetail.setAccountType(Constants.WALLET);
+        payDetail.setTransactionType(transType.value);
+        payDetail.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
+        payDetail.setCustomerMobile("kbzpay");
+        payDetail.setQrTransId(qrTransId);
+        payDetail.setQrTransStatus(1);
+        payDetail.setQrReferNo("REF" + qrTransId);
+        payDetail.setReferNo("REF" + qrTransId);
+        payDetail.setApprovalCode(qrTransId);
+        payDetail.setTC("PAY_SUCCESS");
+
+        payDetail.setTradeDate(strDate);
+        payDetail.setTradeTime(strTime);
+        payDetail.setTradeDateAndTime(strDateAndTime);
+        payDetail.setTradeDateTime(strDateTime);
+        payDetail.setSettleDate(strYearMonthDay);
+        payDetail.setTransDate(strTransDate);
+        payDetail.setTransTime(strTransTime);
+
+        payDetail.setAmount(amount);
+
+        tradeData.setPayDetail(payDetail);
+        return tradeData;
+    }
+
     public TradeData generateSettlementData() {
          int saleCount = 0;
          String saleAmount = "1000";
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 9c1c593..c5a935f 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("20:00");
+                SystemParamsOperation.getInstance().setClearBatchTime("21:10");
             } else if (TextUtils.equals(name,"alert_sound_enable")) {
 
                 SystemParamsOperation.getInstance().setAlertSound(parseBoolean(data));