fix device id serial name

noebs · Dec 29, 2022 · 2208a0a · 2208a0a
1 parent c6c9f6d
commit 2208a0a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=22.12.9
+version=22.12.11
diff --git a/lib/src/main/java/com/tuti/api/TutiApiClient.kt b/lib/src/main/java/com/tuti/api/TutiApiClient.kt
@@ -499,12 +499,14 @@ class TutiApiClient {
             card: Card,
             ipin: String,
             receiverCard: Card,
+            deviceId: String = "",
             amount: Float,
             onResponse: (TutiResponse) -> Unit,
             onError: (TutiResponse?, Exception?) -> Unit
     ) {
         val request = fillRequestFields(card, ipin, amount)
         request.toCard = receiverCard.PAN
+        request.deviceId = deviceId
         sendRequest(
                 RequestMethods.POST,
                 serverURL + Operations.CARD_TRANSFER,
@@ -540,14 +542,15 @@ class TutiApiClient {
             ipin: String,
             voucherNumber: String,
             amount: Float,
+            deviceId: String = "",
             onResponse: (TutiResponse) -> Unit,
             onError: (TutiResponse?, Exception?) -> Unit
     ) {
 
         val request = fillRequestFields(card, ipin, amount)
         request.payeeId = TelecomIDs.E15.payeeID
         request.voucherNumber = voucherNumber
-
+        request.deviceId = deviceId
         sendRequest(
                 RequestMethods.POST,
                 serverURL + Operations.GENERATE_VOUCHER,

diff --git a/lib/src/main/java/com/tuti/api/ebs/EBSRequest.kt b/lib/src/main/java/com/tuti/api/ebs/EBSRequest.kt
@@ -56,6 +56,8 @@ class EBSRequest {
     var idNo: String? = null
     var merchantCategoryCode: String? = null
     val postalCode: String? = null
+    @SerialName("device_id")
+    var deviceId: String? = ""
 
     var panCategory: String? = null
 

diff --git a/lib/src/main/java/com/tuti/model/data.kt b/lib/src/main/java/com/tuti/model/data.kt
@@ -21,7 +21,6 @@ data class SignInRequest(
 
 @kotlinx.serialization.Serializable
 data class SignupRequest(
-
         @SerialName("password")
         val password: String,
         @SerialName("otp")
@@ -45,22 +44,10 @@ data class GenerateOTP(
         val mobile: String,
         val password: String? = "",
         @SerialName("fullname") val name: String? = "",
-
         @SerialName("user_pubkey") val pubkey: String,
 )
 
-/*
-	Type           string                     `json:"type"`
-	Date           time.Time                  `json:"date"`
-	UUID string `gorm:"primaryKey"`
-	To             string                     `json:"to"`
-	Title          string                     `json:"title"`
-	Body           string                     `json:"body"`
-	EBSData        ebs_fields.EBSResponse `json:"data" gorm:"foreignKey:UUID;references:UUID"` // EBS parser fields holds many unnecssary info
-	PaymentRequest ebs_fields.QrData          `json:"payment_request" gorm:"foreignKey:UUID"`
-	CallToAction   string                     `json:"call_to_action"`
-	Phone          string                     `json:"phone"`
- **/
+
 @kotlinx.serialization.Serializable
 data class Notification(
         @SerialName("phone") val phone: String?,