Merge branch 'merge_latest_SIT' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into merge_latest_SIT

app/build.gradle

@@ -16,20 +16,56 @@ android {
         targetSdk 33
         versionCode 1
         versionName "1.0"
-
-//        applicationId "com.utsmm.kbz"
-//        versionName "1.10"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-//        // Add CMake configuration
-//        externalNativeBuild {
-//            cmake {
-//                cppFlags "-std=c++14"
-//            }
-//        }
     }
 
+    // -----------------------------
+    // 🔥 MULTI-VARIANT FLAVORS
+    // -----------------------------
+    flavorDimensions "env"
+
+    productFlavors {
+        sit {
+            dimension "env"
+            applicationId "com.utsmm.kbz.sit"
+            versionNameSuffix "-sit"
+            resValue "string", "app_name", "KBZ-SIT"
+        }
+
+        uat {
+            dimension "env"
+            applicationId "com.utsmm.kbz.uat"
+            versionNameSuffix "-uat"
+            resValue "string", "app_name", "KBZ-UAT"
+        }
+
+        prod {
+            dimension "env"
+            applicationId "com.utsmm.kbz"
+            versionNameSuffix ""
+        }
+    }
+
+//    defaultConfig {
+//        applicationId "com.utsmm.kbz.sit"
+//        minSdk 24
+//        targetSdk 33
+//        versionCode 1
+//        versionName "1.0"
+//
+////        applicationId "com.utsmm.kbz"
+////        versionName "1.10"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//
+////        // Add CMake configuration
+////        externalNativeBuild {
+////            cmake {
+////                cppFlags "-std=c++14"
+////            }
+////        }
+//    }
+
     // Configure CMake
 //    externalNativeBuild {
 //        cmake {
@@ -43,6 +79,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            debuggable true
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11

app/src/main/java/com/utsmm/kbz/MainViewModel.java

@@ -58,6 +58,8 @@ public class MainViewModel extends ViewModel {
 
     public MutableLiveData<Boolean> kPayStatus = new MutableLiveData<>();
 
+    public MutableLiveData<Boolean> voidStatus = new MutableLiveData<>();
+
 
     public SingleLiveEvent<String> disabledMsg = new SingleLiveEvent<>();
 
@@ -98,6 +100,8 @@ public class MainViewModel extends ViewModel {
         kPayStatus.setValue(SystemParamsOperation.getInstance().getQRPayStatus());
 
         disabledMsg.setValue(SystemParamsOperation.getInstance().getDisabledMsg());
+
+        voidStatus.setValue(SystemParamsOperation.getInstance().getVoidStatus());
     }
 
     @Override

app/src/main/java/com/utsmm/kbz/ui/adapters/QRPayAdapter.java

@@ -51,10 +51,12 @@ public class QRPayAdapter extends RecyclerView.Adapter<QRPayAdapter.ViewHolder>
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         QRPayItem item = items.get(position);
-        holder.binding.setText(item.title);
-        holder.binding.setIcon(item.icon);
+
+        holder.binding.setItem(item);
+        holder.binding.executePendingBindings();
+
         holder.binding.btnItem.setOnClickListener(v -> {
-            if(listener != null){
+            if(item.isActive && listener != null){
                 listener.onItemClick(position);
             }
         });

app/src/main/java/com/utsmm/kbz/ui/core_ui/InputAmountFragment.java

@@ -100,10 +100,18 @@ public class InputAmountFragment extends DataBindingFragment implements DataBind
         setToolBarTitleWithBackIcon(getResourceString(R.string.txt_subtitle_amount));
 
         boolean decimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
+        boolean qrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
+        boolean isDecimalEnabled;
+
+        if(sharedViewModel.transactionsType.getValue() == TransactionsType.MMQR){
+            isDecimalEnabled = qrDecimalEnabled;
+        }else {
+            isDecimalEnabled = decimalEnabled;
+        }
         View keyboardView = getView().findViewById(R.id.numberKeyboard);
 
         if (keyboardView instanceof NumberKeyboard) {
-            ((NumberKeyboard) keyboardView).setDecimalEnable(decimalEnabled);
+            ((NumberKeyboard) keyboardView).setDecimalEnable(isDecimalEnabled);
         }
 
         if(sharedViewModel.isEcr.getValue() != null){

app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java

@@ -405,7 +405,7 @@ public class SharedViewModel extends ViewModel {
         }
     }
 
-    private void startPrintProcessSettlement() {
+    public void startPrintProcessSettlement() {
 
         if(payDetail.getValue() == null)  return;
 

app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java

@@ -106,6 +106,9 @@ public class DashboardTransFragment extends DataBindingFragment {
                 case HISTORY:
                     new DashboardTransFragment.ClickEvent().onClickHistory();
                     break;
+                case DEVICE_CONFIG:
+                    new DashboardTransFragment.ClickEvent().onClickDeviceConfig();
+                    break;
             }
 
         });
@@ -210,7 +213,10 @@ public class DashboardTransFragment extends DataBindingFragment {
             safeRouteTo(currentId,routeId,hostId);
         }
 
-
+        public void onClickDeviceConfig(){
+            routeId = R.id.action_dashboardTransFragment_to_deviceConfig;
+            safeRouteTo(currentId, routeId, hostId);
+        }
     }
 
 }

app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayFragment.java

@@ -17,12 +17,14 @@ import com.utsmm.kbz.util.tms.TMSUtil;
 import com.utsmyanmar.baselib.util.DataBindingConfig;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.paylibs.model.PayDetail;
+import com.utsmyanmar.paylibs.utils.LogUtil;
 import com.utsmyanmar.paylibs.utils.POSUtil;
 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 java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -33,9 +35,6 @@ public class QRPayFragment extends DataBindingFragment {
     private static final int hostId = Constants.NAV_HOST_ID;
     private int routeId;
     private static final int currentId = R.id.qrFragment;
-
-
-
     private Observer<PayDetail> observeLastTrans;
     private PayDetail lastPay;
 
@@ -54,12 +53,20 @@ public class QRPayFragment extends DataBindingFragment {
 
     @Override
     protected DataBindingConfig getDataBindingConfig() {
+        boolean isQrRefundEnable = SystemParamsOperation.getInstance().getQrRefundEnable();
+        LogUtil.d("KMK", "isQrRefundEnable =>" + isQrRefundEnable);
+        List<QRPayItem> features = new ArrayList<>();
+        features.add(new QRPayItem("Sale", R.drawable.ic_qr_pay, true));
+        if(isQrRefundEnable){
+            features.add(new QRPayItem("Refund", R.drawable.ic_refund, false));
+        }
+        features.add(new QRPayItem("History", R.drawable.ic_history, true));
 
-        List<QRPayItem> features = List.of(
-                new QRPayItem("Sale", R.drawable.ic_qr_pay),
-                new QRPayItem("Refund", R.drawable.ic_refund),
-                new QRPayItem("History", R.drawable.ic_history)
-        );
+//        List<QRPayItem> features = List.of(
+//                new QRPayItem("Sale", R.drawable.ic_qr_pay, true),
+//                new QRPayItem("Refund", R.drawable.ic_refund, false),
+//                new QRPayItem("History", R.drawable.ic_history, true)
+//        );
 
         QRPayAdapter adapter = new QRPayAdapter(features, position -> {
             QRPayItem selectedBtn = features.get(position);

app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRPayItem.java

@@ -3,9 +3,12 @@ package com.utsmm.kbz.ui.qr_pay;
 public class QRPayItem {
     public String title;
     public int icon;
+    public boolean isActive;
 
-    public QRPayItem(String title, int icon) {
+    public QRPayItem(String title, int icon, boolean isActive) {
         this.title = title;
         this.icon = icon;
+        this.isActive = isActive;
     }
+
 }

app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java

@@ -11,6 +11,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -49,8 +50,8 @@ public class HostConfigFragment extends DataBindingFragment {
 
     private HostConfigViewModel viewModel;
     protected Printer printer;
-    int FONT_NORMAL = 20;
-    int FONT_HEADER = 28;
+    int FONT_NORMAL = 24;
+    int FONT_HEADER = 30;
 
     @Override
     protected void initViewModel() {
@@ -112,20 +113,18 @@ public class HostConfigFragment extends DataBindingFragment {
             return;
         }
         printer.setGray(GrayLevelEnum.LEVEL_2);
-        printer.setTypeface(Typeface.SANS_SERIF);
+        Typeface typeface = ResourcesCompat.getFont(requireContext(), R.font.consolas_regular);
+        printer.setTypeface(typeface);
         SystemParamsOperation sp = SystemParamsOperation.getInstance();
 
-
-        Bitmap bitmap = BitmapFactory.decodeResource(requireContext().getResources(), com.utsmyanmar.paylibs.R.drawable.print_kbz_logo);
+        Bitmap bitmap = BitmapFactory.decodeResource(requireContext().getResources(), R.drawable.kbz_receipt_logo);
         printLogo(bitmap);
-        printer.appendPrnStr("\n", FONT_NORMAL, AlignEnum.CENTER, false);
         printer.appendPrnStr("TERMINAL CONFIGURATION", FONT_HEADER, AlignEnum.CENTER, true);
         printer.appendPrnStr("\n", FONT_NORMAL, AlignEnum.CENTER, false);
-        printer.appendPrnStr(sp.getMerchantName(), FONT_NORMAL, AlignEnum.LEFT, false);
-        printer.appendPrnStr(sp.getMerchantPhoneNo(), FONT_NORMAL, AlignEnum.LEFT, false);
+        printer.appendPrnStr(sp.getMerchantName(), FONT_NORMAL, AlignEnum.CENTER, false);
         printer.appendPrnStr(sp.getMerchantAddress(), FONT_NORMAL, AlignEnum.CENTER, false);
         printer.appendPrnStr(sp.getMerchantAddress2(), FONT_NORMAL, AlignEnum.CENTER, false);
-        printer.appendPrnStr("\n--------------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
+        printer.appendPrnStr("\n---------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
         printer.appendPrnStr("PRIMARY HOST", FONT_NORMAL, AlignEnum.LEFT, true);
         printer.appendPrnStr("Name : " + sp.getHostName(), FONT_NORMAL, AlignEnum.LEFT, false);
         printer.appendPrnStr("TID  : " + sp.getTerminalId(), FONT_NORMAL, AlignEnum.LEFT, false);
@@ -141,9 +140,9 @@ public class HostConfigFragment extends DataBindingFragment {
         String secIp = secIpAndPort[0];
         String secPort = secIpAndPort[1];
         printer.appendPrnStr("Secondary Ip  : " + secIp, FONT_NORMAL, AlignEnum.LEFT, true);
-        printer.appendPrnStr("Secondary Port : " + secPort, FONT_NORMAL, AlignEnum.LEFT, true);
+        printer.appendPrnStr("Secondary Port: " + secPort, FONT_NORMAL, AlignEnum.LEFT, true);
         printer.appendPrnStr("Currency Code : " + sp.getCurrencyType(), FONT_NORMAL, AlignEnum.LEFT, true);
-        printer.appendPrnStr("\n--------------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
+        printer.appendPrnStr("\n---------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
 
         if (!TextUtils.isEmpty(sp.getSecHostName())) {
             printer.appendPrnStr("SECONDARY HOST", FONT_NORMAL, AlignEnum.LEFT, true);
@@ -161,9 +160,9 @@ public class HostConfigFragment extends DataBindingFragment {
             String secHostSecIp = SecHostSecIpAndPort[0];
             String secHostSecPort = SecHostSecIpAndPort[1];
             printer.appendPrnStr("Secondary Ip  : " + secHostSecIp, FONT_NORMAL, AlignEnum.LEFT, true);
-            printer.appendPrnStr("Secondary Port : " + secHostSecPort, FONT_NORMAL, AlignEnum.LEFT, true);
+            printer.appendPrnStr("Secondary Port: " + secHostSecPort, FONT_NORMAL, AlignEnum.LEFT, true);
             printer.appendPrnStr("Currency Code : " + sp.getCurrencyType(), FONT_NORMAL, AlignEnum.LEFT, true);
-            printer.appendPrnStr("\n--------------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
+            printer.appendPrnStr("\n---------------------------\n", FONT_NORMAL, AlignEnum.LEFT, false);
         }
 
         printer.startPrint(true, ret -> {

app/src/main/java/com/utsmm/kbz/util/enums/FeaturesType.java

@@ -21,5 +21,6 @@ public enum FeaturesType {
     TEST,
     QR_INQUIRY,
     QR_REFUND,
-    LOG_OUT
+    LOG_OUT,
+    DEVICE_CONFIG
 }

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

@@ -602,8 +602,11 @@ public class TMSSetupsImpl implements TMSSetups{
                 SystemParamsOperation.getInstance().setAppKey(data);
             } else if (TextUtils.equals(name,"app_id")) {
                 SystemParamsOperation.getInstance().setAppId(data);
+            }else if (TextUtils.equals(name, "qr_decimal_enable")) {
+                SystemParamsOperation.getInstance().setQrDecimalEnable(parseBoolean(data));
+            }else if (TextUtils.equals(name, "qr_refund_enable")){
+                SystemParamsOperation.getInstance().setQrRefundEnable(parseBoolean(data));
             }
-
         }
 
         SystemParamsOperation.getInstance().setCarouselUrls(convertToString(imgUrls));

app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java

@@ -177,7 +177,6 @@ public class TMSUtil {
         LogUtil.d(TAG,"Receipt Footer: "+SystemParamsOperation.getInstance().getReceiptFooter());
         LogUtil.d(TAG,"Manual Update: "+SystemParamsOperation.getInstance().getManualUpdate());
         LogUtil.d(TAG,"Master Enabled: "+SystemParamsOperation.getInstance().isEmvEnabled());
-
     }
 
 
@@ -220,7 +219,7 @@ public class TMSUtil {
 //        featuresList.add(new Features(5, fragmentActivity.getString(R.string.menu_wavepay_inquiry), R.drawable.ic_wave_status_dash, FeaturesType.WAVE_PAY_INQUIRY, wavePayInquiryStatus));
         featuresList.add(new Features(1, fragmentActivity.getString(R.string.menu_cash_advance), R.drawable.ic_cash_advance, FeaturesType.CASH_ADVANCE, cashAdvanceStatus));
         featuresList.add(new Features(9, fragmentActivity.getString(R.string.menu_history), R.drawable.ic_history, FeaturesType.HISTORY, true));
-
+        featuresList.add(new Features(10, "Configs", R.drawable.ic_host, FeaturesType.DEVICE_CONFIG, true));
     }
 
     public TMSValidity checkParams() {

app/src/main/res/layout/fragment_dashboard_screen.xml

@@ -167,6 +167,9 @@
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:background="@drawable/honey"
+                android:clickable="@{mainViewModel.voidStatus}"
+                android:focusable="@{mainViewModel.voidStatus}"
+                android:alpha="@{mainViewModel.voidStatus ? 1f : 0.5f}"
                 android:onClick="@{() -> click.onClickVoid()}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/bt4"

app/src/main/res/layout/item_qr_pay_button.xml

@@ -7,11 +7,8 @@
         <import type="com.utsmm.kbz.R"/>
         <import type="com.utsmm.kbz.util.enums.FeaturesType" />
         <variable
-            name="text"
-            type="String" />
-        <variable
-            name="icon"
-            type="Integer" />
+            name="item"
+            type="com.utsmm.kbz.ui.qr_pay.QRPayItem" />
     </data>
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_height="wrap_content"
@@ -25,8 +22,6 @@
             app:cardElevation="6dp"
             android:layout_margin="6dp"
             android:foreground="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:focusable="true"
             android:background="@color/white"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -48,7 +43,7 @@
                     android:layout_width="38dp"
                     android:layout_height="38dp"
                     android:layout_marginBottom="8dp"
-                    app:srcUrl="@{icon}"
+                    app:srcUrl="@{item.icon}"
                     app:tint="@color/colorPrimary"
                     tools:src="@drawable/ic_sale"
                     tools:tint="@color/colorPrimary" />
@@ -60,7 +55,7 @@
                     android:fontFamily="@font/rubik_medium"
                     android:gravity="center"
                     android:maxLines="2"
-                    android:text="@{text}"
+                    android:text="@{item.title}"
                     tools:text="button title"
                     android:textAlignment="center"
                     android:textColor="@color/colorPrimary"

app/src/main/res/navigation/mobile_navigation.xml

@@ -629,6 +629,12 @@
             app:popUpToInclusive="true"
             android:id="@+id/action_dashboardTransFragment_to_manageFunctionFragment"
             app:destination="@id/managementFunctionFragment" />
+        <action
+            app:launchSingleTop="true"
+            app:popUpTo="@+id/dashboardTransFragment"
+            app:popUpToInclusive="true"
+            android:id="@+id/action_dashboardTransFragment_to_deviceConfig"
+            app:destination="@id/hostConfigFragment" />
     </fragment>
     <dialog
         tools:layout="@layout/fragment_dashboard_bottom_sheet_pre_auth"

baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java

@@ -285,8 +285,8 @@ public class NetworkModule {
             tmsAddress = getTMSUrlFromNative();
         }
 
-        String baseUrl = tmsAddress.trim() + "/api/v1/";
-//        String baseUrl = tmsAddress.trim() + "/";
+//        String baseUrl = tmsAddress.trim() + "/api/v1/";
+        String baseUrl = tmsAddress.trim() + "/";
 
         final Gson gson =
                 new GsonBuilder().create();

nexdlkey-lib/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('nexgo-sdk-dlkey-1.0.2.aar'))
+artifacts.add("default", file('nexgo-sdk-dlkey-1.0.3.aar'))

nexdlkey-lib/build/.transforms/1461251b8eaddc289a4d591b6ec61814/results.bin

@@ -0,0 +1 @@
+i/AndroidManifest.xml

nexdlkey-lib/build/.transforms/2a65f02b0b492c122ab22b4ea93c915f/results.bin

@@ -0,0 +1 @@
+o/com.nexgo.downloadkey-r.txt

nexdlkey-lib/build/.transforms/2d01785c0c985a05c38b270430f5ff6f/results.bin

@@ -0,0 +1 @@
+i/jni

nexdlkey-lib/build/.transforms/55d1b129c65b25a90e07ef20abd94b92/results.bin

@@ -0,0 +1 @@
+o/nexgo-sdk-dlkey-1.0.3-api.jar

nexdlkey-lib/build/.transforms/59a95da2964cf8c93305976ed1194e6e/results.bin

@@ -0,0 +1 @@
+o/nexgo-sdk-dlkey-1.0.3-runtime.jar

nexdlkey-lib/build/.transforms/5fd986f801ff75e7b083b612a855f10d/results.bin

@@ -0,0 +1 @@
+o/com.nexgo.downloadkey

nexdlkey-lib/build/.transforms/7f84e160a6057a38955f76cbe54ae05e/results.bin

@@ -0,0 +1 @@
+o/nexgo-sdk-dlkey-1.0.3

nexdlkey-lib/build/.transforms/7f84e160a6057a38955f76cbe54ae05e/transformed/nexgo-sdk-dlkey-1.0.3/AndroidManifest.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.nexgo.downloadkey"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="26" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true" >
+    </application>
+
+</manifest>

nexdlkey-lib/build/.transforms/7f84e160a6057a38955f76cbe54ae05e/transformed/nexgo-sdk-dlkey-1.0.3/res/values/values.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">downloadkey</string>
+</resources>

nexdlkey-lib/build/.transforms/9df00bd4abbee7cad6a40225e025a07b/results.bin

@@ -0,0 +1 @@
+i/jars/classes.jar

nexdlkey-lib/build/.transforms/a3e3cb4e291ca4c17dc38300487d145f/results.bin

@@ -0,0 +1 @@
+i/

nexdlkey-lib/build/.transforms/b419f587399eaf3340eef84222935b9c/results.bin

@@ -0,0 +1 @@
+i/res

nexdlkey-lib/build/.transforms/cf4220edbf983c07c7b57e3ec7201b0f/results.bin

@@ -0,0 +1 @@
+i/

nexdlkey-lib/build/.transforms/d283578cacade70a980c902cdd871b1e/results.bin

@@ -0,0 +1 @@
+o/nexgo-sdk-dlkey-1.0.3-runtime

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java

@@ -1573,4 +1573,25 @@ public class SystemParamsOperation {
         return params.isQrPartialRefundEnable();
     }
 
+    public void setQrDecimalEnable(boolean enable){
+        SystemParamsSettings params = getSystemParamsSettings();
+        params.setQrDecimalEnable(enable);
+        saveSystemParamsSettings(params);
+    }
+
+    public boolean isQrDecimalEnable(){
+        SystemParamsSettings params = getSystemParamsSettings();
+        return params.isQrDecimalEnable();
+    }
+
+    public void setQrRefundEnable(boolean enable) {
+        SystemParamsSettings params = getSystemParamsSettings();
+        params.setQrRefundEnable(enable);
+        saveSystemParamsSettings(params);
+    }
+
+    public boolean getQrRefundEnable(){
+        SystemParamsSettings params = getSystemParamsSettings();
+        return params.getQrRefundEnable();
+    }
 }

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java

@@ -42,8 +42,8 @@ public class SystemParamsSettings implements Serializable {
 
 //    private String tmsAddress = "https://tms.smile-mm.com";
 //    private String tmsAddress = "http://128.199.170.203";
-    private String tmsAddress = "http://sirius-nest.utsmyanmar.com";
-//    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius";
+//    private String tmsAddress = "http://sirius-nest.utsmyanmar.com";
+    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius";
     private String ereceiptAddress = "http://receipt-nest.utsmyanmar.com";
 
     private String terminalCapability = "E0E8C8";
@@ -238,6 +238,9 @@ public class SystemParamsSettings implements Serializable {
 
     private boolean qrPartialRefundEnable = false;
 
+    private boolean qrDecimalEnable = false;
+    private boolean qrRefundEnable = false;
+
     public boolean isQrPartialRefundEnable(){
         return qrPartialRefundEnable;
     }
@@ -932,6 +935,22 @@ public class SystemParamsSettings implements Serializable {
         this.emvEnabled = emvEnabled;
     }
 
+    public boolean isQrDecimalEnable() {
+        return qrDecimalEnable;
+    }
+
+    public void setQrDecimalEnable(boolean qrDecimalEnable){
+        this.qrDecimalEnable = qrDecimalEnable;
+    }
+
+    public void setQrRefundEnable(boolean qrRefundEnable) {
+        this.qrRefundEnable = qrRefundEnable;
+    }
+
+    public boolean getQrRefundEnable(){
+        return qrRefundEnable;
+    }
+
     /*  // 流水号起始
     private String serialNum = Configs.getInstance().SERIAL_NUM();
     // 批次号起始