diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 19649e6..8281066 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -369,18 +369,14 @@ class BajajFdMainActivity : BaseActivity() { } // step 2 response - fun stepTwoApi(data: CreateFDApplicationResponse) { - Log.e("stepTwoApi", " response ---> " + Gson().toJson(data)) + fun stepTwoApi() { binding.viewPager.currentItem = 2 - stepThreeBajajFDFragment.displayReceivedData(data) } // step 3 response - fun stepThreeApi(data: CreateFDApplicationResponse) { - Log.e("stepThreeApi", " response --->" + Gson().toJson(data)) - // call create fd api + fun stepThreeApi() { binding.viewPager.currentItem = 3 - stepFourBajajFDFragment.displayReceivedData(data) + stepFourBajajFDFragment.displayReceivedData() } // step 4 response diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt index 0b8ea91..8c31288 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt @@ -31,7 +31,6 @@ class StepFourBajajFDFragment : BaseFragment() { private val binding get() = _binding!! private lateinit var listOfCustomer: MutableList private var selectedList: String = "" - private var uniqueId: String = "" private var payUrl: String = "" private var value: String = "" @@ -78,7 +77,7 @@ class StepFourBajajFDFragment : BaseFragment() { if (binding.checkBox.isChecked && selectedList.isNotEmpty()) { val saveFDOtherDataRequest = SaveFDOtherDataRequest() saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) - saveFDOtherDataRequest.UniqueId = uniqueId + saveFDOtherDataRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId saveFDOtherDataRequest.Values = selectedList saveFDOtherDataRequest.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE @@ -142,14 +141,11 @@ class StepFourBajajFDFragment : BaseFragment() { } } - - fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) { - uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId - getFDDetailsApi(createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId) + fun displayReceivedData() { + getFDDetailsApi() customerListApi() } - private fun customerListApi() { val getCodeRequest = GetCodeRequest() @@ -210,13 +206,13 @@ class StepFourBajajFDFragment : BaseFragment() { } - private fun getFDDetailsApi(uniqueId: String) { + private fun getFDDetailsApi() { if (Common.isNetworkAvailable(mActivity!!)) { val getFDDetailsRequest = GetFDDetailsRequest() getFDDetailsRequest.FDProvider = mActivity!!.getString(R.string.bajaj) getFDDetailsRequest.NiveshClientCode = (mActivity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - getFDDetailsRequest.UniqueId = uniqueId + getFDDetailsRequest.UniqueId = (activity as BajajFdMainActivity).uniqueId stepFourBajajFDViewModel.getFDDetails( getFDDetailsRequest, Constants.token, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt index 687bed2..d5a4ad5 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt @@ -154,7 +154,7 @@ class StepOneBajajFDFragment : BaseFragment() { } (activity as BajajFdMainActivity).fdInvestmentDetails.CustomerType = "" (activity as BajajFdMainActivity).fdInvestmentDetails.CKYCNumber = "" - (activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = (activity as BajajFdMainActivity).UniqueId + (activity as BajajFdMainActivity).fdInvestmentDetails.UniqueId = (activity as BajajFdMainActivity).uniqueId (activity as BajajFdMainActivity).createFDApplicantRequest.FDInvestmentDetails = (activity as BajajFdMainActivity).fdInvestmentDetails diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index 74c782d..455916a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -2,7 +2,6 @@ package com.nivesh.production.bajajfd.ui.fragment import android.Manifest import android.annotation.SuppressLint -import android.app.Dialog import android.content.DialogInterface import android.content.pm.PackageManager import android.database.Cursor @@ -50,7 +49,6 @@ class StepThreeBajajFDFragment : BaseFragment() { private val binding get() = _binding!! private lateinit var stepThreeBajajFDViewModel: StepThreeBajajFDViewModel - private lateinit var dialog: Dialog private var takeImageResult: ActivityResultLauncher? = null private var selectImageIntent: ActivityResultLauncher? = null @@ -62,7 +60,6 @@ class StepThreeBajajFDFragment : BaseFragment() { private var photoFileExt: String? = "" private var doc1FileExt: String? = "" private var doc2fileExt: String? = "" - private var uniqueId: String? = "" private var docValue: String = "" private val mainPANUpload: Int = 1 private val mainPhotoUpload: Int = 2 @@ -399,7 +396,7 @@ class StepThreeBajajFDFragment : BaseFragment() { du.ImageEncodeToBase64 = imageBase64 du.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - du.UniqueId = uniqueId + du.UniqueId = (activity as BajajFdMainActivity).uniqueId stepThreeBajajFDViewModel.documentsUpload( du, Constants.token, @@ -468,9 +465,7 @@ class StepThreeBajajFDFragment : BaseFragment() { createFDApplicationResponse.Response.StatusCode.let { code -> when (code) { 200 -> { - (activity as BajajFdMainActivity).stepThreeApi( - createFDApplicationResponse - ) + (activity as BajajFdMainActivity).stepThreeApi() } // 650 -> refreshToken() else -> { @@ -614,10 +609,6 @@ class StepThreeBajajFDFragment : BaseFragment() { ) } - fun displayReceivedData(createFDApplicationResponse: CreateFDApplicationResponse) { - uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId - } - private fun uriToBitmap(selectedFileUri: Uri): Bitmap? { try { val parcelFileDescriptor = diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index f52a906..7faae89 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -742,9 +742,7 @@ class StepTwoBajajFDFragment : BaseFragment() { when (code) { 200 -> { (activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId - (activity as BajajFdMainActivity).stepTwoApi( - createFDApplicationResponse - ) + (activity as BajajFdMainActivity).stepTwoApi() } // 650 -> refreshToken()