From 4b1ae0619a874584b9b40f5a3792070adec2aaa2 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 10 Jan 2023 17:48:23 +0530 Subject: [PATCH] added ckyc api in step two --- .../ui/activity/NiveshFdMainActivity.kt | 59 +------------------ .../ui/fragment/StepTwoNiveshFDFragment.kt | 51 ++++++++++++++++ 2 files changed, 52 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt index 6583c1f..0a4a4a2 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt @@ -179,9 +179,8 @@ class NiveshFdMainActivity : BaseActivity() { when (code) { 200 -> { setViewPager(stepsCount) - checkFDCKYCApi() } - // 650 -> refreshToken() + 650 -> "" else -> { showDialogValidation(this@NiveshFdMainActivity, response.message) } @@ -301,62 +300,6 @@ class NiveshFdMainActivity : BaseActivity() { } - private fun checkFDCKYCApi() { - if (Common.isNetworkAvailable(this@NiveshFdMainActivity)) { - if (getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CM_MOBILE?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN?.isNotEmpty()!! && getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE?.isNotEmpty()!!) { - val checkFDKYCRequest = CheckFDKYCRequest() - checkFDKYCRequest.Mobile = - getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CM_MOBILE - checkFDKYCRequest.DOB = - getDate(getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB!!) - checkFDKYCRequest.PAN = - getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_PAN - checkFDKYCRequest.NiveshClientCode = - getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE.toString() - viewModel.checkFDKYC(checkFDKYCRequest, token, this) - viewModel.getFDKYCMutableData.observe(this) { response -> - when (response) { - is Resource.Success -> { - Log.e("response", "-->${response.data.toString()}") - val getCodeResponse: GetCodeResponse = - Gson().fromJson( - response.data?.toString(), - GetCodeResponse::class.java - ) - getCodeResponse.Response.StatusCode.let { code -> - when (code) { - 200 -> { - - fdInvestmentDetails.CustomerType = "" - } - // 650 -> refreshToken() - else -> { - showDialogValidation( - this@NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) - } - } - } - } - - is Resource.Error -> { - response.message?.let { message -> - showDialogValidation(this@NiveshFdMainActivity, message) - } - } - is Resource.Loading -> { - - } - is Resource.DataError -> { - - } - } - } - } - } - - } // set background for selected/ default step private fun setBackground( diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt index c550aa4..d240bb0 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt @@ -31,6 +31,7 @@ import com.nivesh.production.niveshfd.adapter.RecommendedBankListAdapter import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepTwoBinding import com.nivesh.production.niveshfd.model.* import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.niveshfd.util.Common.Companion.commonSpinnerErrorMethod @@ -140,6 +141,7 @@ class StepTwoNiveshFDFragment : Fragment() { removeError(binding.tlPanNumber) if (s.toString().trim().length == 10) { panCheckApi() + checkFDCKYCApi() } } }) @@ -715,6 +717,55 @@ class StepTwoNiveshFDFragment : Fragment() { } + private fun checkFDCKYCApi() { + if ((activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CM_MOBILE?.isNotEmpty()!! && (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_DOB?.isNotEmpty()!! && binding.edtPANNumber.text.toString().isNotEmpty() && (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE?.isNotEmpty()!!) { + val checkFDKYCRequest = CheckFDKYCRequest() + checkFDKYCRequest.Mobile = binding.edtMobileNumber.text.toString() + checkFDKYCRequest.DOB = binding.edtDOB.text.toString() + checkFDKYCRequest.PAN = binding.edtPANNumber.text.toString() + checkFDKYCRequest.NiveshClientCode = (activity as NiveshFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE.toString() + (activity as NiveshFdMainActivity).viewModel.checkFDKYC(checkFDKYCRequest, token, activity as NiveshFdMainActivity) + (activity as NiveshFdMainActivity).viewModel.getFDKYCMutableData.observe(this) { response -> + when (response) { + is Resource.Success -> { + Log.e("response", "-->${response.data.toString()}") + val getCodeResponse: GetCodeResponse = + Gson().fromJson( + response.data?.toString(), + GetCodeResponse::class.java + ) + getCodeResponse.Response.StatusCode.let { code -> + when (code) { + 200 -> { + // fdInvestmentDetails.CustomerType = "" + } + 650 -> "" + else -> { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + } + } + } + } + + is Resource.Error -> { + response.message?.let { message -> + showDialogValidation(activity as NiveshFdMainActivity, message) + } + } + is Resource.Loading -> { + + } + is Resource.DataError -> { + + } + } + } + } + } + private fun createFDApi(data: CreateFDRequest) { ProgressUtil.showLoading(activity as NiveshFdMainActivity) (activity as NiveshFdMainActivity).viewModel.createFDApi(data, token, activity as NiveshFdMainActivity)