Merge remote-tracking branch 'origin/merge_latest_SIT' into merge_latest_SIT

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

@@ -604,8 +604,10 @@ public class TMSSetupsImpl implements TMSSetups{
                 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")){
+            } else if (TextUtils.equals(name, "qr_refund_enable")){
                 SystemParamsOperation.getInstance().setQrRefundEnable(parseBoolean(data));
+            } else if (TextUtils.equals(name, "tpdu_value")){
+                SystemParamsOperation.getInstance().setTpduValue(data);
             }
         }
 

paylibs/src/main/java/com/utsmyanmar/paylibs/isobuilder/builderx/BaseISOMsgX.java

@@ -6,6 +6,7 @@ import com.utsmyanmar.paylibs.isobuilder.ISOMode;
 import com.utsmyanmar.paylibs.model.MsgField;
 import com.utsmyanmar.paylibs.utils.LogUtil;
 import com.utsmyanmar.paylibs.utils.core_utils.ByteUtil;
+import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
 import com.utsmyanmar.paylibs.utils.enums.HostName;
 
 import java.util.Map;
@@ -18,6 +19,9 @@ public abstract class BaseISOMsgX {
         byte[] newSendBytes = EncodePackage.assembly(map, msgIdentifier, 0, "0000000000",hostName);
 
         String BPCTPDU = "6005150000"; //UAT
+
+        BPCTPDU = SystemParamsOperation.getInstance().getTpduValue();
+
 //        String BPCTPDU = "6005170000"; //PrePro
 
         if(isoMode == ISOMode.BOTH_HEADER_TPDU) {

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

@@ -1099,6 +1099,17 @@ public class SystemParamsOperation {
         saveSystemParamsSettings(params);
     }
 
+    public void setTpduValue(String value) {
+        SystemParamsSettings params = getSystemParamsSettings();
+        params.setTpduValue(value);
+        saveSystemParamsSettings(params);
+    }
+
+    public String getTpduValue(){
+        SystemParamsSettings params = getSystemParamsSettings();
+        return params.getTpduValue();
+    }
+
     public boolean getTpduStatus(){
         SystemParamsSettings params = getSystemParamsSettings();
         return params.isTpdu_status();

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

@@ -132,6 +132,8 @@ public class SystemParamsSettings implements Serializable {
 
     private String lastSuccessTranx = "000001";
 
+    private String tpduValue = "6005150000";
+
     private String appId = "";
 
     private String appKey = "";
@@ -310,6 +312,14 @@ public class SystemParamsSettings implements Serializable {
         this.disabledMessage = disabledMessage;
     }
 
+    protected void setTpduValue(String tpduValue) {
+        this.tpduValue = tpduValue;
+    }
+
+    protected String getTpduValue() {
+        return tpduValue;
+    }
+
     public void setAppId(String appId) {
         this.appId = appId;
     }