@haroldtran/react-native-pax 1.0.15 → 1.0.17

package/android/src/main/java/com/paxposlink/PaxPosConstant.kt

@@ -15,6 +15,7 @@ data class PaxRequestModel(
     var tip: Int? = null,
     var paymentType: Int? = null,
     var ecrRefNum: String? = "",
+    var showTip: Boolean? = false,
 )
 
 data class PaxResponseModel(

package/android/src/main/java/com/paxposlink/PaxPosLinkModule.kt

@@ -70,38 +70,43 @@ class PaxPosLinkModule(
         timeout: Int?,
         promise: Promise,
     ) {
-        val tcpSetting =
-            TcpSetting().apply {
-                this.ip = ip
-                this.port = port ?: PaxPosConstant.PORT
-                this.timeout = timeout ?: PaxPosConstant.TIMEOUT
-            }
-        val tcpSettingInfo = "=>: ip=$ip, port=${tcpSetting.port}, timeout=${tcpSetting.timeout}"
-        Log.i("TcpSetting", tcpSettingInfo)
-        val map = Arguments.createMap()
-
-        terminal = posLink?.getTerminal(reactContext, tcpSetting)
-        Log.e("terminal", terminal.toString())
-        return if (terminal != null) {
-            val info = getTerminalInfo()
-            val serialNumber = info.getString("serialNumber") ?: ""
-            if (serialNumber.isEmpty()) {
-                Log.d("Failed Init", "Create terminal failed!")
-                promise.reject(
-                    "Create terminal failed!",
-                    tcpSettingInfo,
-                )
-            } else {
-                Log.d("Success Init", "Create terminal success")
-                map.putString("message", "Create terminal success! $tcpSettingInfo")
-                map.putBoolean("status", true)
-                map.putMap("serialNumber", info)
-                promise.resolve(map)
+        Thread {
+            try {
+                val tcpSetting =
+                    TcpSetting().apply {
+                        this.ip = ip
+                        this.port = port ?: PaxPosConstant.PORT
+                        this.timeout = timeout ?: PaxPosConstant.TIMEOUT
+                    }
+                val tcpSettingInfo = "=>: ip=$ip, port=${tcpSetting.port}, timeout=${tcpSetting.timeout}"
+                Log.i("TcpSetting", tcpSettingInfo)
+                val map = Arguments.createMap()
+                terminal = posLink?.getTerminal(reactContext, tcpSetting)
+                Log.e("terminal", terminal.toString())
+                if (terminal != null) {
+                    val info = getTerminalInfo()
+                    val serialNumber = info.getString("serialNumber") ?: ""
+                    if (serialNumber.isEmpty()) {
+                        Log.d("Failed Init", "Create terminal failed!")
+                        promise.reject(
+                            "Create terminal failed!",
+                            tcpSettingInfo,
+                        )
+                    } else {
+                        Log.d("Success Init", "Create terminal success")
+                        map.putString("message", "Create terminal success! $tcpSettingInfo")
+                        map.putBoolean("status", true)
+                        map.putMap("serialNumber", info)
+                        promise.resolve(map)
+                    }
+                } else {
+                    Log.d("Failed Init", "Create terminal failed!")
+                    promise.reject("Create terminal failed!", tcpSettingInfo)
+                }
+            } catch (e: Exception) {
+                promise.reject("INIT_ERROR", e)
             }
-        } else {
-            Log.d("Failed Init", "Create terminal failed!")
-            promise.reject("Create terminal failed!", tcpSettingInfo)
-        }
+        }.start()
     }
 
     @ReactMethod
@@ -708,9 +713,18 @@ class PaxPosLinkModule(
     private fun getTransactionBehaviorReq() =
         TransactionBehavior().apply {
             val tip = salesRequest?.tip
+            val showTip = salesRequest?.showTip
             signatureCaptureFlag = null
             tipRequestFlag =
-                if (tip != null && tip > 0) TipRequestFlag.NOT_NEED_ENTER_TIP_ON_TERMINAL else TipRequestFlag.NEED_ENTER_TIP_ON_TERMINAL
+                if (showTip) {
+                    if (tip != null && tip > 0) {
+                        TipRequestFlag.NOT_NEED_ENTER_TIP_ON_TERMINAL
+                    } else {
+                        TipRequestFlag.NEED_ENTER_TIP_ON_TERMINAL
+                    }
+                } else {
+                    TipRequestFlag.NOT_NEED_ENTER_TIP_ON_TERMINAL
+                }
             signatureUploadFlag = null
             statusReportFlag = null
             acceptedCardType = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haroldtran/react-native-pax",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "React Native native module for PAX devices",
   "main": "./src/index.ts",
   "files": [

package/src/index.ts

@@ -64,9 +64,17 @@ export function makePayment(
   amount: number = 0,
   tip?: number,
   paymentType?: number,
-  ecrRefNum?: string
+  ecrRefNum?: string,
+  showTip?: boolean
 ): Promise<PaxResponseModel> {
-  return PaxPosLink.payment({ id, amount, tip, paymentType, ecrRefNum });
+  return PaxPosLink.payment({
+    id,
+    amount,
+    tip,
+    paymentType,
+    ecrRefNum,
+    showTip,
+  });
 }
 
 /**