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

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 21
+        versionCode 24
-        versionName "2.1"
+        versionName "2.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -49,7 +49,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java

@@ -675,7 +675,7 @@ public abstract class  EmvBaseViewModel extends BaseViewModel {
             } else {
                 //contact terminal capability ; if different card brand(depend on aid) have different terminal capability
                 if (ByteUtils.byteArray2HexString(aid).toUpperCase().contains("A000000004")) {
-                    emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0x28, (byte) 0xC8});
+                    emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0xF0, (byte) 0xC8});
                     emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1D}, ByteUtils.hexString2ByteArray("6C00800000000000"));//terminal risk
 
                 }
@@ -1232,7 +1232,8 @@ public abstract class  EmvBaseViewModel extends BaseViewModel {
             emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("4C00800000000000"));
         } else {
             //set 9F1D terminal risk management - MasterCard. it should be same with the MTIP configuration for 9F1D
-            emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C00800000000000"));
+//            emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C00800000000000"));
+            emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C7A800000000000"));
         }
 
 

baselib/src/main/res/raw/paypass_config.json

@@ -10,8 +10,8 @@
     "targetPercent": "99",
     "maxTargetPercent": "99",
     "threshold": "00000040",
-    "tacDefault": "D84000A800",
+    "tacDefault": "F45084800C",
-    "tacOnline": "DC4004F800",
+    "tacOnline": "F45084800C",
     "tacDenial": "0000000000",
     "floorLimit": "000000000000",
     "cvmLimit": 75000,
@@ -35,8 +35,8 @@
     "targetPercent": "99",
     "maxTargetPercent": "99",
     "threshold": "00000040",
-    "tacDefault": "D84000A800",
+    "tacDefault": "F45084800C",
-    "tacOnline": "DC4004F800",
+    "tacOnline": "F45084800C",
     "tacDenial": "0000000000",
     "floorLimit": "000000000000",
     "cvmLimit": 75000,
@@ -61,8 +61,8 @@
     "targetPercent": "99",
     "maxTargetPercent": "99",
     "threshold": "00000040",
-    "tacDefault": "D84000A800",
+    "tacDefault": "F45084800C",
-    "tacOnline": "DC4004F800",
+    "tacOnline": "F45084800C",
     "tacDenial": "0000000000",
     "floorLimit": "000000000000",
     "cvmLimit": 75000,
@@ -86,8 +86,8 @@
     "targetPercent": "99",
     "maxTargetPercent": "99",
     "threshold": "00000040",
-    "tacDefault": "D84000A800",
+    "tacDefault": "F45084800C",
-    "tacOnline": "DC4004F800",
+    "tacOnline": "F45084800C",
     "tacDenial": "0000000000",
     "floorLimit": "000000000000",
     "cvmLimit": 75000,

paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java

@@ -456,6 +456,7 @@ public class TransactionsOperation {
 //                }
 //
 //            }
+
             if(equals) {
                 emvOnlineResult.setRejCode("00");
                 emvOnlineResult.setRecvField55(null);