Changed from masterpass to checkout api

Author: kileha3

.idea/gradle.xml

@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.furahitechpay.furahitechpay.FurahitechPay
 import com.furahitechpay.furahitechpay.FurahitechPay.Companion.PAYMENT_ALL
+import com.furahitechpay.furahitechpay.FurahitechPay.Companion.PAYMENT_MOBILE
 import com.furahitechpay.furahitechpay.callback.PayCallback
 import com.furahitechpay.furahitechpay.model.BillingInfo
 import com.furahitechpay.furahitechpay.model.PaymentRequest
@@ -37,11 +38,11 @@ class MainActivity : AppCompatActivity() {
             userLastName = "Kileha"
         )
 
-        furahitechPay.defaultPhoneForCard = "255712000000"
+        furahitechPay.defaultPhoneForCard = "255712XXXXXX"
         furahitechPay.activity = this
         furahitechPay.isCardEnglish = true
         furahitechPay.isMobileEnglish = false
-        furahitechPay.paymentType = PAYMENT_ALL
+        furahitechPay.paymentType = PAYMENT_MOBILE
         furahitechPay.paymentRequest = request
         furahitechPay.paymentBilling = billing
         furahitechPay.authToken = "dummy"

.idea/jarRepositories.xml

@@ -329,7 +329,7 @@ class CardFragment : BaseFragment(), CardView, PayCallback{
     override fun onSuccess(tokenResponse: TokenResponse) {
         showProgressVisible(false)
         val intent = Intent(activity, CardPaymentRedirection::class.java)
-        intent.putExtra(REDIRECTION_URL, Base64.decode(tokenResponse.instructions, Base64.DEFAULT).decodeToString())
+        intent.putExtra(REDIRECTION_URL, Base64.decode(tokenResponse.paymentUrl, Base64.DEFAULT).decodeToString())
         dismissDialog()
         startActivity(intent)
     }

app/src/main/java/com/furahitechpay/selcom/MainActivity.kt

@@ -260,11 +260,11 @@ class MobileFragment : BaseFragment(), MobileView, PayCallback {
         mainHolder.visibility = VISIBLE
         tokenDetailsHolder.visibility = VISIBLE
         val instruction: Spanned = if(furahitechPay.isMobileEnglish) Html.fromHtml(
-            String.format(response.instructions,
+            String.format(response.instructions?.infoEnglish!!,
                 "Which is ${response.paymentToken}", "Which is $selectedPrice"
             ) + "<br/> Your payment token is <big><b> ${response.paymentToken}</b></big>"
         ) else Html.fromHtml(
-            String.format(response.instructions,
+            String.format(response.instructions?.infoSwahili!!,
                 "Ambayo ni ${response.paymentToken}", "Ambacho ni $selectedPrice"
             ) + "<br/> Kumbukumbu namba yako ya malipo ni <big><b> ${response.paymentToken}</b></big>"
         )

furahitechpay/src/main/java/com/furahitechpay/furahitechpay/card/CardFragment.kt

@@ -70,20 +70,20 @@ class MobilePresenter(view: MobileView) : BasePresenter<MobileView>(view) {
             "payment_duration" to paymentRequest.duration,
             "payment_email" to billingInfo.userEmail, "payment_amount" to paymentRequest.amount,
             "payment_phone" to billingInfo.userPhone, "payment_product" to paymentRequest.productId,
-            "payment_remarks" to paymentRequest.remarks, "mno" to mno)
+            "payment_remarks" to paymentRequest.remarks, "payment_name" to "${billingInfo.userFirstName} ${billingInfo.userLastName}")
         if(paymentRequest.orderId.isNotEmpty()){
             paymentData = paymentData.plus("order_id" to paymentRequest.orderId)
         }
         GlobalScope.launch {
             val (_, _, result) = Fuel
-                .post("https://apis.furahitech.co.tz/core/v1/payment/auth/mobile", paymentData)
+                .post("https://api.furahipay.co.tz/v2/payment/create", paymentData)
                 .header(mapOf("x-api-key" to token))
                 .awaitObjectResponseResult(TokenResponse.TokenResponseSerializer())
             result.fold(
                 { data -> view.runOnUiThread(Runnable {
                     handleButtonEnabling(true)
                     view.showPaymentResponse(data)
-                    data.instructions = ""
+                    data.instructions = null
                     payCallback.onSuccess(data)
                 })},
                 { error -> launch(Dispatchers.Main) {payCallback.onFailre(error.message!!)  }}

furahitechpay/src/main/java/com/furahitechpay/furahitechpay/mobile/MobileFragment.kt

@@ -4,15 +4,28 @@ import com.github.kittinunf.fuel.core.ResponseDeserializable
 import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
 
-data class TokenResponse (var error: Boolean,
-                          @SerializedName("payment_orderId") var paymentOrderId: String,
-                          @SerializedName("payment_phone") var paymentPhone: String,
-                          @SerializedName("payment_qr") var paymentQr: String,
+data class TokenResponse (@SerializedName("request_code") var requestCode: Int,
+                          @SerializedName("request_status") var requestStatus: String,
+                          @SerializedName("request_message") var requestMessage: String,
                           @SerializedName("payment_status") var paymentStatus: String,
                           @SerializedName("payment_token") var paymentToken: String,
-                          @SerializedName("payment_instruction") var instructions: String){
+                          @SerializedName("payment_orderId") var paymentOrderId: String,
+                           @SerializedName("payment_url") var paymentUrl: String,
+                           @SerializedName("payment_qr") var paymentQr: String,
+                           @SerializedName("payment_instruction") var instructions: PaymentInstruction?,
+                           var error: Boolean = requestStatus == "SUCCESS"
+){
     class TokenResponseSerializer : ResponseDeserializable<TokenResponse> {
         override fun deserialize(content: String) = Gson().fromJson(content, TokenResponse::class.java)!!
     }
 }
 
+data class PaymentInstruction(@SerializedName("info_hId") var hoverActionId: String,
+                              @SerializedName("info_swa") var infoSwahili: String,
+                              @SerializedName("info_en") var infoEnglish: String){
+
+    class PaymentInstructionSerializer : ResponseDeserializable<PaymentInstruction> {
+        override fun deserialize(content: String) = Gson().fromJson(content, PaymentInstruction::class.java)!!
+    }
+}
+