diff --git a/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt index a75c2e9..cd87d86 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/model/ResponseXXXXXXXXXXXXXXXX.kt @@ -5,5 +5,6 @@ data class ResponseXXXXXXXXXXXXXXXX( val Message: String, val Status: String, val StatusCode: Int, - val UniqueId: String + val UniqueId: String, + val KYCFlag: Int ) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt index 5b145b1..0b2eb87 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt @@ -1,5 +1,6 @@ package com.nivesh.production.niveshfd.ui.fragment +import android.app.Activity import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -34,7 +35,8 @@ class StepFiveNiveshFDFragment : Fragment() { super.onViewCreated(view, savedInstanceState) binding.btnViewOrder.setOnClickListener { - + (activity as NiveshFdMainActivity).setResult(Activity.RESULT_OK) + (activity as NiveshFdMainActivity).finish() } binding.tvRetry.setOnClickListener { @@ -57,7 +59,7 @@ class StepFiveNiveshFDFragment : Fragment() { binding.tvSuccessMessage.text = arrOfStr[1] } finalizeFDApi() - finalizeKYCApi() + } else { if (paymentReQueryResponse.Response.Message.isNotEmpty()) { if (paymentReQueryResponse.Response.Message.isNotEmpty()) { @@ -102,7 +104,11 @@ class StepFiveNiveshFDFragment : Fragment() { finalizeFDResponse.Response.StatusCode.let { code -> when (code) { 200 -> { + if ( finalizeFDResponse.Response.KYCFlag == 0){ + finalizeKYCApi() + } else { + } } 650 -> "" else -> {