9 changed files with 30 additions and 116 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,8 +14,6 @@
 .cxx
 local.properties
 /.idea
-/app/release/*
-/app/sit/release/*
-/app/uat/release/*
-/app/uat
-/.idea
+/app/release
+/app/sit/release
+/app/uat/release
--- a/app/build.gradle
+++ b/app/build.gradle
@ -14,8 +14,8 @@ android {
        applicationId "com.utsmm.kbz"
        minSdk 24
        targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 15
+        versionName "1.14"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@ -43,7 +43,6 @@ android {
            dimension "env"
            applicationId "com.utsmm.kbz"
            versionNameSuffix ""
-            resValue "string", "app_name", "KBZ-POS"
        }
    }

@ -77,8 +76,7 @@ android {

    buildTypes {
        release {
-            minifyEnabled true
-            shrinkResources false
+            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        debug {
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -24,88 +24,3 @@
 # Keep Bouncy Castle classes for security providers
 -keep class org.bouncycastle.** { *; }
 -dontwarn org.bouncycastle.**
-keep class com.squareup.okhttp.** { *; }
-dontwarn org.conscrypt.Conscrypt$Version
-dontwarn org.conscrypt.Conscrypt
-dontwarn org.conscrypt.ConscryptHostnameVerifier
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE
-
-############################
-# HILT
-############################
-keep class dagger.hilt.** { *; }
-keep class javax.inject.** { *; }
-keep class * extends dagger.hilt.internal.GeneratedComponent { *; }
-keep class * extends dagger.hilt.internal.GeneratedComponentManager { *; }
-keep class hilt_aggregated_deps.** { *; }
-
-############################
-# ANDROIDX NAVIGATION
-############################
-keep class androidx.navigation.** { *; }
-
-############################
-# DATA BINDING
-############################
-keep class **.databinding.*Binding { *; }
-keep class androidx.databinding.** { *; }
-
-############################
-# FRAGMENTS
-############################
-keep class * extends androidx.fragment.app.Fragment
-
-############################
-# SERIALIZABLE / PARCELABLE
-############################
-keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-}
-
-############################
-# NEXGO / SUNMI / PAYLIBS
-############################
-keep class com.nexgo.** { *; }
-keep class com.sunmi.** { *; }
-keep class com.utsmyanmar.** { *; }
-keep class com.kizzy.xpay.** { *; }
-
-############################
-# ENUMS (ISO / TRANSACTION TYPES)
-############################
-keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-# Keep Retrofit generic signatures
-keepattributes Signature
-keepattributes *Annotation*
-
-# RxJava
-keep class io.reactivex.** { *; }
-dontwarn io.reactivex.**
-
-# Retrofit
-keep class retrofit2.** { *; }
-dontwarn retrofit2.**
-
-# Your API interfaces
-keep interface com.utsmyanmar.baselib.api.** { *; }
-
-# Your response models
-keep class com.utsmyanmar.baselib.model.** { *; }
-
-# Keep model fields for Gson
-keepclassmembers class * {
-    @com.google.gson.annotations.SerializedName <fields>;
-}
-
-# Or keep all models directly (simpler & safer)
-keep class com.utsmyanmar.baselib.model.** { *; }
-
-keep class androidx.lifecycle.** { *; }
-keep class * extends androidx.lifecycle.ViewModel { *; }
-keep class com.utsmyanmar.baselib.repo.** { *; }
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/TransactionResultFragment.java
@ -172,9 +172,9 @@ public class TransactionResultFragment extends DataBindingFragment implements Da
                } else if (isQRPayNonSuccessTransaction(transactionType, payDetail)) {
 //                    startPrintProcess(false);
                    if(transactionType == TransactionsType.MMQR_REFUND){
-                        showDeclineDialog("QR Refund Failed! \n" + payDetail.getTradeResultDes());
+                        showDeclineDialog("QR Refund Failed!");
                    }else{
-                        showDeclineDialog("QR Payment Failed! \n" + payDetail.getTradeResultDes());
+                        showDeclineDialog("QR Payment Failed!");
                    }
                    navigateToMainScreen();
                } else if (isQRPaySuccessTransaction(transactionType, payDetail)) {
--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/QRRefundProcessFragment.java
@ -144,6 +144,7 @@ public class QRRefundProcessFragment extends DataBindingFragment {
    private void handleRefundResponse(KPayRefund.RefundResponse response, String referenceNo, String orgAmount) {
        if (response != null && response.getResponse() != null && "REFUND_SUCCESS".equalsIgnoreCase(response.getResponse().getRefundStatus())) {
            LogUtil.d(TAG, "Refund successful!");
+
            String refundAmount = response.getResponse().getRefundAmount();
            long text = POSUtil.getInstance().convertAmount(refundAmount);

--- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java
@ -40,13 +40,15 @@ public class RefundCertificateManager {
            if (tmsAddress == null || tmsAddress.trim().isEmpty()) {
                LogUtil.e(TAG, "TMS address is empty");
                return;
-            };
+            }

-//            String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath=";
-            String downloadBase = tmsAddress.trim() + "/file/download?filePath=";
+            String downloadBase =
+                    tmsAddress.trim() + "/api/v1/file/download?filePath=";

-            String certUrl = SystemParamsOperation.getInstance().getCertificateUrl();
-            String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl();
+            String certUrl =
+                    SystemParamsOperation.getInstance().getCertificateUrl();
+            String clientCertUrl =
+                    SystemParamsOperation.getInstance().getCertificateClientUrl();

            if (certUrl == null || clientCertUrl == null) {
                LogUtil.e(TAG, "Certificate URLs are missing");
@ -56,9 +58,9 @@ public class RefundCertificateManager {
            String timestamp = String.valueOf(System.currentTimeMillis());
            String signature = generateSignature(timestamp);

-//            LogUtil.d(TAG, "Download base => " + downloadBase);
-//            LogUtil.d(TAG, "Cert URL => " + certUrl);
-//            LogUtil.d(TAG, "Client Cert URL => " + clientCertUrl);
+            LogUtil.d(TAG, "Download base => " + downloadBase);
+            LogUtil.d(TAG, "Cert URL => " + certUrl);
+            LogUtil.d(TAG, "Client Cert URL => " + clientCertUrl);

            // ---------- CA CERT ----------
            DownloadUtil.downloadCertificateRx(
--- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
@ -290,8 +290,8 @@ public class NetworkModule {
            tmsAddress = getTMSUrlFromNative();
        }

-//        String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
-        String baseUrl = tmsAddress.trim() + "/"; //for uat
+        String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
+//        String baseUrl = tmsAddress.trim() + "/"; //for uat

        final Gson gson =
                new GsonBuilder().create();
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
@ -343,9 +343,9 @@ public abstract class BaseXPrint {
 //            print2ColumnsStringNoSpace("AID       :", MPU_AID);
 //        }

-//        if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED)) {
-//            print2ColumnsStringNoSpace("TXN ID    :",payDetail.getReferNo());
-//        }
+        if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED)) {
+            print2ColumnsStringNoSpace("TXN ID    :",payDetail.getReferNo());
+        }



--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
@ -42,10 +42,10 @@ 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"; //for uat
-//    private String ereceiptAddress = "http://receipt-nest.utsmyanmar.com"; //for on prime
-    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat
+    private String tmsAddress = "http://sirius-nest.utsmyanmar.com";
+//    private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat
+    private String ereceiptAddress = "http://receipt-nest.utsmyanmar.com"; //for on prime
+//    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat

    private String terminalName = "";