From ca798b96a89a1c99366168a3f26a332569b19ac4 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 14:47:08 +0530 Subject: [PATCH 1/5] added manoj code --- .../ui/fragment/StepThreeBajajFDFragment.kt | 73 +++++++++---------- .../ui/fragment/StepTwoBajajFDFragment.kt | 2 +- 2 files changed, 36 insertions(+), 39 deletions(-) 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 fadd1e1..056b57c 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 @@ -4,6 +4,7 @@ import android.Manifest import android.annotation.SuppressLint import android.app.ActionBar.LayoutParams import android.app.Dialog +import android.content.DialogInterface import android.content.pm.PackageManager import android.database.Cursor import android.graphics.Bitmap @@ -72,6 +73,8 @@ class StepThreeBajajFDFragment : BaseFragment() { private val mapImage: HashMap = HashMap() private lateinit var listOfDocType: List + private val check = arrayOf("Take Photo", "Choose from Gallery", "Cancel") + private val requestPermission = registerForActivityResult( ActivityResultContracts.RequestPermission() ) { isGranted: Boolean -> @@ -205,48 +208,42 @@ class StepThreeBajajFDFragment : BaseFragment() { } private fun selectImage() { - dialog = Dialog(activity as BajajFdMainActivity) - dialog.setContentView(R.layout.camera_gallery_layout) - val ivCut: ImageView = dialog.findViewById(R.id.ivCut) - val tvGallery: TextView = dialog.findViewById(R.id.tvGallery) - val tvCamera: TextView = dialog.findViewById(R.id.tvCamera) - - ivCut.setOnClickListener { - dialog.cancel() - } - - tvGallery.setOnClickListener { - dialog.cancel() - val permission = ContextCompat.checkSelfPermission( - activity as BajajFdMainActivity, - Manifest.permission.READ_EXTERNAL_STORAGE - ) - if (permission == PackageManager.PERMISSION_GRANTED) { - selectImageIntent?.launch("image/*") - } else { - requestPermission.launch( - Manifest.permission.READ_EXTERNAL_STORAGE - ) - } - } - - tvCamera.setOnClickListener { - dialog.cancel() - val permission = ContextCompat.checkSelfPermission( - activity as BajajFdMainActivity, - Manifest.permission.CAMERA - ) - if (permission == PackageManager.PERMISSION_GRANTED) { - takeImage() - } else { - requestPermission.launch( + val builder = AlertDialog.Builder( + mActivity!! + ) + builder.setTitle("Add Photo!") + builder.setItems(check + ) { dialog: DialogInterface, item: Int -> + if (check[item] == "Take Photo") { + val permission = ContextCompat.checkSelfPermission( + activity as BajajFdMainActivity, Manifest.permission.CAMERA ) + if (permission == PackageManager.PERMISSION_GRANTED) { + takeImage() + } else { + requestPermission.launch( + Manifest.permission.CAMERA + ) + } + dialog.dismiss() + } else if (check[item] == "Choose from Gallery") { + val permission = ContextCompat.checkSelfPermission( + activity as BajajFdMainActivity, + Manifest.permission.READ_EXTERNAL_STORAGE + ) + if (permission == PackageManager.PERMISSION_GRANTED) { + selectImageIntent?.launch("image/*") + } else { + requestPermission.launch( + Manifest.permission.READ_EXTERNAL_STORAGE + ) + } + } else if (check[item] == "Cancel") { + dialog.dismiss() } } - - dialog.show() - dialog.window?.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) + builder.show() } private fun setOtherUploadLayout(itemName: String?) { 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 c8d0056..f44458e 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 @@ -909,7 +909,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } when (code) { 200 -> { - if (getBankValidationApiResponse.Message.equals("Account Verified")) { + if (getBankValidationApiResponse.Message == "Account Verified") { val clientBankList = ClientBanklist() clientBankList.AccountNumber = bankAccount clientBankList.AccountType = "sb" From b03ab207f4b568d1bd001c6fe6c1cf79507e0216 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 15:45:03 +0530 Subject: [PATCH 2/5] api working of eligible bank --- .../bajajfd/interfaces/ApiInterface.kt | 2 +- .../bajajfd/repositories/MainRepository.kt | 4 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 43 ++++++++++++++----- .../viewModel/StepTwoBajajFDViewModel.kt | 5 ++- .../res/layout/fragment_bajajfd_step_two.xml | 14 +++--- 5 files changed, 43 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt index ece5279..740db9c 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt @@ -146,7 +146,7 @@ interface ApiInterface { ): Response @GET("GetFDBankList?FDProvider=Bajaj") - suspend fun bankListApi(@Header("token") token: String): Response + suspend fun bankListApi(@Header("token") token: String, @Query("Language") language : String): Response @GET("GetIFSC_Autofill?") suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt index 5ba37a4..dae4441 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt @@ -74,8 +74,8 @@ class MainRepository constructor(private val apiInterface: ApiInterface) { suspend fun cityCheck(cityRequest: CityRequest, token: String) = apiInterface.cityApi(cityRequest, token) - suspend fun bankListCheck(token: String) = - apiInterface.bankListApi(token) + suspend fun bankListCheck(token: String, language: String) = + apiInterface.bankListApi(token, language) suspend fun ifscCodeCheck(str: String) = apiInterface.getIFSCApi(str) 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 f44458e..829ed81 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 @@ -33,6 +33,7 @@ import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity import com.nivesh.production.bajajfd.ui.providerfactory.StepTwoModelProviderFactory +import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.bajajfd.util.Common.Companion.commonSpinnerErrorMethod @@ -132,7 +133,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } binding.edtDOB.setOnClickListener { removeError(binding.tlDOB) - datePicker(binding.edtDOB) + datePicker(binding.edtDOB, 1) } @@ -390,7 +391,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } binding.edtNomineeDOB.setOnClickListener { removeError(binding.tlNomineeDOB) - datePicker(binding.edtNomineeDOB) + datePicker(binding.edtNomineeDOB, 2) } binding.spNomineeRelation.setText( @@ -401,9 +402,6 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ -> removeError(binding.tlNomineeRelation) } - binding.cbNomineeSameAddress.setOnCheckedChangeListener { _, _ -> - - } // Guardian Details binding.edtGuardianName.addTextChangedListener(object : TextWatcher { @@ -663,7 +661,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).nomineeDetails.NomineePincode = 0 // Applicant Nominee Guardian Details - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = "" + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianSalutation = binding.spGuardianRelation.text.toString() (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianName = binding.edtGuardianName.text.toString() if (binding.edtGuardianAge.text.toString().isEmpty()) { @@ -685,8 +683,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress1 = binding.edtGuardianAddress.text.toString() (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress2 = "" - (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = - binding.spGuardianRelation.text.toString() + (activity as BajajFdMainActivity).nomineeGuardianDetails.GuardianAddress3 = "" // Applicant Bank Details (activity as BajajFdMainActivity).fdBankDetails.AccountType = @@ -930,6 +927,7 @@ class StepTwoBajajFDFragment : BaseFragment() { clientBankList.AccountNumber.toString() ) showHideBankDetail() + } else { showDialogValidation( activity as BajajFdMainActivity, @@ -1016,7 +1014,7 @@ class StepTwoBajajFDFragment : BaseFragment() { binding.rvClientBankList.adapter = bankListAdapter } - private fun datePicker(edtDOB: TextInputEditText) { + private fun datePicker(edtDOB: TextInputEditText, number : Int) { val year = cal.get(Calendar.YEAR) val month = cal.get(Calendar.MONTH) val day = cal.get(Calendar.DAY_OF_MONTH) @@ -1030,6 +1028,15 @@ class StepTwoBajajFDFragment : BaseFragment() { .plus(dayOfMonth.toString()) ) edtDOB.setSelection(edtDOB.text.toString().length) + if (number == 2){ + if (isMinor(years.toString().plus("-").plus(monthOfYear + 1).plus("-") + .plus(dayOfMonth.toString())) + ){ + guardianCodeVisibility(View.VISIBLE) + }else{ + guardianCodeVisibility(View.GONE) + } + } }, year, month, day ) datePickerDialog.datePicker.maxDate = cal.timeInMillis @@ -1039,6 +1046,15 @@ class StepTwoBajajFDFragment : BaseFragment() { datePickerDialog.show() } + private fun guardianCodeVisibility(visibility: Int) { + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + binding.tlGuardianName.visibility = visibility + + } + private fun panCheckApi() { val panCheck = PanCheckRequest() panCheck.clientCode = @@ -1703,7 +1719,7 @@ class StepTwoBajajFDFragment : BaseFragment() { } private fun apiForEligibleBankList() { - stepTwoBajajFDViewModel.bankListApi(token, activity as BajajFdMainActivity) + stepTwoBajajFDViewModel.bankListApi(token,getString(R.string.language), activity as BajajFdMainActivity) stepTwoBajajFDViewModel.getFDBankListMutableData.observe(viewLifecycleOwner) { response -> when (response) { is Resource.Success -> { @@ -1720,7 +1736,7 @@ class StepTwoBajajFDFragment : BaseFragment() { dialogForBankList(getFDBankListResponse.Response.BankList) } } - // 650 -> refreshToken() + 650 -> refreshToken() else -> { showDialogValidation( activity as BajajFdMainActivity, @@ -1746,6 +1762,11 @@ class StepTwoBajajFDFragment : BaseFragment() { } } + private fun refreshToken() { + + + } + private fun dialogForBankList(bankList: List) { val dialog = Dialog(activity as BajajFdMainActivity) dialog.setContentView(R.layout.layout_bank_list) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt index 2f957dc..7a8d89a 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt @@ -13,6 +13,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse1 import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import kotlinx.coroutines.launch +import org.intellij.lang.annotations.Language class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() { @@ -117,12 +118,12 @@ class StepTwoBajajFDViewModel(private val mainRepository: MainRepository) : View } val getFDBankListMutableData: MutableLiveData> = MutableLiveData() - fun bankListApi( token: String,activity : Activity) = viewModelScope.launch( + fun bankListApi( token: String,language: String, activity : Activity) = viewModelScope.launch( Common.handleError(activity) ) { if (Common.isNetworkAvailable(activity)) { getFDBankListMutableData.postValue(Resource.Loading()) - val response = mainRepository.bankListCheck(token) + val response = mainRepository.bankListCheck(token, language) getFDBankListMutableData.postValue(handleResponse(response)) } } diff --git a/app/src/main/res/layout/fragment_bajajfd_step_two.xml b/app/src/main/res/layout/fragment_bajajfd_step_two.xml index bb1be44..bc5145b 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_two.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_two.xml @@ -705,16 +705,9 @@ - - - Date: Fri, 6 Jan 2023 16:11:38 +0530 Subject: [PATCH 3/5] added paymentrequery api after trasaction --- .../bajajfd/interfaces/ApiInterface.kt | 2 +- .../bajajfd/model/PaymentReQueryRequest.kt | 6 ++ .../bajajfd/model/PaymentReQueryResponse.kt | 5 ++ .../bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt | 8 ++ .../bajajfd/repositories/MainRepository.kt | 4 +- .../ui/activity/BajajFdMainActivity.kt | 83 ++++++++++++++----- .../ui/fragment/StepFiveBajajFDFragment.kt | 4 + .../bajajfd/viewModel/BajajFDViewModel.kt | 11 +++ 8 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt create mode 100644 app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt diff --git a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt index 740db9c..4a7b331 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt @@ -64,7 +64,7 @@ interface ApiInterface { @POST("PaymentRequery") suspend fun paymentReQuery( - @Body requestBody: RequestBody, + @Body requestBody: PaymentReQueryRequest, @Header("token") token: String ): Response diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt new file mode 100644 index 0000000..b7391d7 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt @@ -0,0 +1,6 @@ +package com.nivesh.production.bajajfd.model + +data class PaymentReQueryRequest( + var NiveshClientCode: String? = "", + var UniqueId: String? = "" +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt new file mode 100644 index 0000000..82d78d9 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt @@ -0,0 +1,5 @@ +package com.nivesh.production.bajajfd.model + +data class PaymentReQueryResponse( + val Response: ResponseXXXXXXXXXXXXXXX +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt new file mode 100644 index 0000000..02339b2 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt @@ -0,0 +1,8 @@ +package com.nivesh.production.bajajfd.model + +data class ResponseXXXXXXXXXXXXXXX( + val Errors: List, + val Message: String, + val Status: String, + val StatusCode: Int +) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt index dae4441..81ab7a2 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt @@ -44,8 +44,8 @@ class MainRepository constructor(private val apiInterface: ApiInterface) { suspend fun finaliseKYCResponse(getRatesRequest: GetRatesRequest, token: String) = apiInterface.getRates(getRatesRequest, token) - suspend fun paymentReQueryResponse(getRatesRequest: GetRatesRequest, token: String) = - apiInterface.getRates(getRatesRequest, token) + suspend fun paymentReQueryResponse(getRatesRequest: PaymentReQueryRequest, token: String) = + apiInterface.paymentReQuery(getRatesRequest, token) suspend fun panCheck(panCheck: PanCheckRequest, token: String) = apiInterface.panCheckApi(panCheck, token) 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 598740c..4083daf 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 @@ -1,15 +1,12 @@ package com.nivesh.production.bajajfd.ui.activity import android.annotation.SuppressLint -import android.app.Dialog import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.os.Bundle import android.util.Log -import android.view.WindowManager import android.webkit.WebView import android.webkit.WebViewClient -import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.viewpager.widget.ViewPager @@ -88,8 +85,7 @@ class BajajFdMainActivity : BaseActivity() { val fdStepsCount = FDStepsCountRequest() fdStepsCount.FDProvider = getString(R.string.bajaj) fdStepsCount.NiveshClientCode = "8872" - //hemant client code =8872 /60476 - + // client code =8872 /60476 viewModel.getStepsCount(fdStepsCount, token, this) viewModel.getStepsCountMutableData.observe(this) { response -> when (response) { @@ -106,7 +102,7 @@ class BajajFdMainActivity : BaseActivity() { stepCount = stepsCountResponse.Response.StepsCount getClientDetailsApi(stepsCountResponse.Response.StepsCount) } - 650 -> refreshToken(fdStepsCount) + 650 -> refreshToken("") else -> { showDialogValidation( this@BajajFdMainActivity, @@ -132,10 +128,63 @@ class BajajFdMainActivity : BaseActivity() { } } - private fun refreshToken(fdStepsCount: FDStepsCountRequest) { + private fun paymentReQueryApi() { + if (Common.isNetworkAvailable(this)) { + val paymentReQueryRequest = PaymentReQueryRequest() + paymentReQueryRequest.UniqueId = "" + paymentReQueryRequest.NiveshClientCode = + getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + // client code =8872 /60476 + + viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) + viewModel.getPaymentReQueryMutableData.observe(this) { response -> + when (response) { + is Resource.Success -> { + Log.e("response", "-->$response") + val paymentReQueryResponse: PaymentReQueryResponse = + Gson().fromJson( + response.data?.toString(), + PaymentReQueryResponse::class.java + ) + paymentReQueryResponse.Response.StatusCode.let { code -> + when (code) { + 200 -> { + if (stepCount == 4) { + binding.viewPager.currentItem = 4 + } else { + binding.viewPager.currentItem = 3 + } + stepFiveBajajFDFragment.getData() + } + 650 -> refreshToken("") + else -> { + showDialogValidation( + this@BajajFdMainActivity, + paymentReQueryResponse.Response.Errors[0].ErrorMessage + ) + } + } + } + } + is Resource.Error -> { + response.message?.let { message -> + showDialogValidation(this@BajajFdMainActivity, message) + } + } + is Resource.Loading -> { + + } + is Resource.DataError -> { + } + } + } + } } + private fun refreshToken(fdStepsCount: String) { + + } private fun getClientDetailsApi(stepsCount: Int) { if (Common.isNetworkAvailable(this@BajajFdMainActivity)) { @@ -143,10 +192,7 @@ class BajajFdMainActivity : BaseActivity() { getClientDetailsRequest.client_code = "8872" getClientDetailsRequest.AppOrWeb = getString(R.string.app) getClientDetailsRequest.sub_broker_code = "1038" - - //hemant 8872/1038 - - + // 8872/1038 val userRequest = UserRequest() userRequest.UID = 0 userRequest.IPAddress = "" @@ -206,7 +252,6 @@ class BajajFdMainActivity : BaseActivity() { } } - private fun setViewPager(stepsCount: Int) { // steps setting setBackground(selectedShape(), defaultShape(), defaultShape(), defaultShape()) @@ -352,7 +397,6 @@ class BajajFdMainActivity : BaseActivity() { } - // set background for selected/ default step private fun setBackground( drawable: Drawable?, @@ -367,13 +411,13 @@ class BajajFdMainActivity : BaseActivity() { } // step 1 response - fun stepOneApi(data: String?) { + fun stepOneApi(data: String?) { Log.e("stepOneApi", " response ---> $data") binding.viewPager.currentItem = 1 } // step 2 response - fun stepTwoApi(data: CreateFDApplicationResponse) { + fun stepTwoApi(data: CreateFDApplicationResponse) { Log.e("stepTwoApi", " response ---> " + Gson().toJson(data)) binding.viewPager.currentItem = 2 stepThreeBajajFDFragment.displayReceivedData(data) @@ -381,7 +425,7 @@ class BajajFdMainActivity : BaseActivity() { // step 3 response - fun stepThreeApi(data: CreateFDApplicationResponse) { + fun stepThreeApi(data: CreateFDApplicationResponse) { Log.e("stepThreeApi", " response --->" + Gson().toJson(data)) // call create fd api binding.viewPager.currentItem = 3 @@ -389,7 +433,7 @@ class BajajFdMainActivity : BaseActivity() { } // step 4 response - fun stepFourApi(payUrl: String, value: String) { + fun stepFourApi(payUrl: String, value: String) { paymentDialog(payUrl, value) } @@ -431,15 +475,10 @@ class BajajFdMainActivity : BaseActivity() { override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { super.onPageStarted(view, url, favicon) Log.e("onPageStarted", "-->$url") - if (url.isNotEmpty() && url.contains("CustomerPaymentResponse")) { - - } } override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) } - } - } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt index cbde8cb..ceb6f7d 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt @@ -38,6 +38,10 @@ class StepFiveBajajFDFragment : Fragment() { return root } + fun getData(){ + + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) stepFiveBajajFDViewModel = ViewModelProvider( diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt index 5cee438..732aba4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt @@ -49,4 +49,15 @@ class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel() } } + + val getPaymentReQueryMutableData: MutableLiveData> = MutableLiveData() + fun getPaymentReQuery(requestBody: PaymentReQueryRequest, token : String, activity: Activity) = viewModelScope.launch(handleError(activity)) { + if (Common.isNetworkAvailable(activity)) { + getPaymentReQueryMutableData.postValue(Resource.Loading()) + val response = mainRepository.paymentReQueryResponse(requestBody, token) + getPaymentReQueryMutableData.postValue(handleResponse(response)) + } + } + + } \ No newline at end of file From ee12b51ad9b031652f5136cdb43fec15ded9eb7d Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 16:28:23 +0530 Subject: [PATCH 4/5] unique id handling --- .../ui/activity/BajajFdMainActivity.kt | 107 +++++++++--------- .../ui/fragment/StepThreeBajajFDFragment.kt | 4 +- .../ui/fragment/StepTwoBajajFDFragment.kt | 3 +- 3 files changed, 57 insertions(+), 57 deletions(-) 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 4083daf..70a50f4 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 @@ -50,7 +50,7 @@ class BajajFdMainActivity : BaseActivity() { var nomineeDetails: NomineeDetails = NomineeDetails() var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails() var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse() - + var UniqueId :String = "" private var stepCount: Int = 0 private lateinit var sectionsPagerAdapter: SectionsPagerAdapter private lateinit var fragments: Array @@ -128,59 +128,6 @@ class BajajFdMainActivity : BaseActivity() { } } - private fun paymentReQueryApi() { - if (Common.isNetworkAvailable(this)) { - val paymentReQueryRequest = PaymentReQueryRequest() - paymentReQueryRequest.UniqueId = "" - paymentReQueryRequest.NiveshClientCode = - getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - // client code =8872 /60476 - - viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) - viewModel.getPaymentReQueryMutableData.observe(this) { response -> - when (response) { - is Resource.Success -> { - Log.e("response", "-->$response") - val paymentReQueryResponse: PaymentReQueryResponse = - Gson().fromJson( - response.data?.toString(), - PaymentReQueryResponse::class.java - ) - paymentReQueryResponse.Response.StatusCode.let { code -> - when (code) { - 200 -> { - if (stepCount == 4) { - binding.viewPager.currentItem = 4 - } else { - binding.viewPager.currentItem = 3 - } - stepFiveBajajFDFragment.getData() - } - 650 -> refreshToken("") - else -> { - showDialogValidation( - this@BajajFdMainActivity, - paymentReQueryResponse.Response.Errors[0].ErrorMessage - ) - } - } - } - } - is Resource.Error -> { - response.message?.let { message -> - showDialogValidation(this@BajajFdMainActivity, message) - } - } - is Resource.Loading -> { - - } - is Resource.DataError -> { - - } - } - } - } - } private fun refreshToken(fdStepsCount: String) { @@ -481,4 +428,56 @@ class BajajFdMainActivity : BaseActivity() { super.onPageFinished(view, url) } } + + private fun paymentReQueryApi() { + if (Common.isNetworkAvailable(this)) { + val paymentReQueryRequest = PaymentReQueryRequest() + paymentReQueryRequest.UniqueId = UniqueId + paymentReQueryRequest.NiveshClientCode = getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) + viewModel.getPaymentReQueryMutableData.observe(this) { response -> + when (response) { + is Resource.Success -> { + Log.e("response", "-->$response") + val paymentReQueryResponse: PaymentReQueryResponse = + Gson().fromJson( + response.data?.toString(), + PaymentReQueryResponse::class.java + ) + paymentReQueryResponse.Response.StatusCode.let { code -> + when (code) { + 200 -> { + if (stepCount == 4) { + binding.viewPager.currentItem = 4 + } else { + binding.viewPager.currentItem = 3 + } + stepFiveBajajFDFragment.getData() + } + 650 -> refreshToken("") + else -> { + showDialogValidation( + this@BajajFdMainActivity, + paymentReQueryResponse.Response.Errors[0].ErrorMessage + ) + } + } + } + } + is Resource.Error -> { + response.message?.let { message -> + showDialogValidation(this@BajajFdMainActivity, message) + } + } + is Resource.Loading -> { + + } + is Resource.DataError -> { + + } + } + } + } + } + } \ No newline at end of file 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 a936bba..74c782d 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.ActionBar.LayoutParams import android.app.Dialog import android.content.DialogInterface import android.content.pm.PackageManager @@ -213,7 +212,8 @@ class StepThreeBajajFDFragment : BaseFragment() { mActivity!! ) builder.setTitle("Add Photo!") - builder.setItems(check + builder.setItems( + check ) { dialog: DialogInterface, item: Int -> if (check[item] == "Take Photo") { val permission = ContextCompat.checkSelfPermission( 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 829ed81..bb96c60 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 @@ -710,7 +710,7 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = (activity as BajajFdMainActivity).nomineeGuardianDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = "" + (activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = (activity as BajajFdMainActivity).UniqueId (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest = (activity as BajajFdMainActivity).createFDApplicantRequest @@ -742,6 +742,7 @@ class StepTwoBajajFDFragment : BaseFragment() { createFDApplicationResponse.Response.StatusCode.let { code -> when (code) { 200 -> { + (activity as BajajFdMainActivity).UniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId (activity as BajajFdMainActivity).stepTwoApi( createFDApplicationResponse ) From 35e4eab36fc1343765d79e23cafe020f8bda0974 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 19:48:27 +0530 Subject: [PATCH 5/5] added minor changes --- .../model/CreateFDApplicationRequest.kt | 4 +- .../bajajfd/model/FDInvestmentDetails.kt | 4 +- .../ui/activity/BajajFdMainActivity.kt | 88 +++++++++---------- .../ui/fragment/StepFiveBajajFDFragment.kt | 23 ++--- .../ui/fragment/StepFourBajajFDFragment.kt | 59 ++++++++----- .../ui/fragment/StepOneBajajFDFragment.kt | 1 + .../ui/fragment/StepTwoBajajFDFragment.kt | 1 - .../viewModel/StepFourBajajFDViewModel.kt | 7 +- .../res/layout/fragment_bajajfd_step_five.xml | 2 +- .../res/layout/fragment_bajajfd_step_four.xml | 2 - 10 files changed, 96 insertions(+), 95 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt index 5c0e70e..a5c8d1e 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt @@ -6,7 +6,5 @@ data class CreateFDApplicationRequest( var FDInvestmentDetails: FDInvestmentDetails? = null, var FdBankDetails: FdBankDetails? = null, var NomineeDetails: NomineeDetails? = null, - var NomineeGuardianDetails: NomineeGuardianDetails ? = null, - var UniqueId: String? = "" - + var NomineeGuardianDetails: NomineeGuardianDetails ? = null ) \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt index 060bb45..276ca56 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt @@ -12,5 +12,7 @@ data class FDInvestmentDetails( var NiveshClientCode: String? = null, var Provider: String? = null, var Source: String? = null, - var Tenure: Int? = 0 + var Tenure: Int? = 0, + var UniqueId: String? = "" + ) \ No newline at end of file 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 70a50f4..3758c57 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 @@ -1,12 +1,15 @@ package com.nivesh.production.bajajfd.ui.activity import android.annotation.SuppressLint +import android.app.Dialog import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.os.Bundle import android.util.Log +import android.view.WindowManager import android.webkit.WebView import android.webkit.WebViewClient +import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.viewpager.widget.ViewPager @@ -28,7 +31,6 @@ import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.* -import java.net.URLEncoder class BajajFdMainActivity : BaseActivity() { @@ -50,10 +52,12 @@ class BajajFdMainActivity : BaseActivity() { var nomineeDetails: NomineeDetails = NomineeDetails() var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails() var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse() - var UniqueId :String = "" + var UniqueId: String = "" private var stepCount: Int = 0 private lateinit var sectionsPagerAdapter: SectionsPagerAdapter private lateinit var fragments: Array + var dialogWebView: Dialog? = null + var LoginRole: Int = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -71,6 +75,7 @@ class BajajFdMainActivity : BaseActivity() { FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) )[BajajFDViewModel::class.java] + LoginRole = 5 if (Common.isNetworkAvailable(this)) { getStepsCountApi() } @@ -145,7 +150,7 @@ class BajajFdMainActivity : BaseActivity() { userRequest.IPAddress = "" userRequest.Source = getString(R.string.source) userRequest.AppOrWeb = getString(R.string.app) - userRequest.LoggedInRoleId = 5 + userRequest.LoggedInRoleId = LoginRole val deviceInfo = DeviceInfo() deviceInfo.device_id = "" @@ -370,7 +375,6 @@ class BajajFdMainActivity : BaseActivity() { stepThreeBajajFDFragment.displayReceivedData(data) } - // step 3 response fun stepThreeApi(data: CreateFDApplicationResponse) { Log.e("stepThreeApi", " response --->" + Gson().toJson(data)) @@ -388,52 +392,48 @@ class BajajFdMainActivity : BaseActivity() { fun paymentDialog(payUrl: String, value: String) { Log.e("payUrl", "-->$payUrl") Log.e("value", "-->$value") -// val dialogWebView = Dialog(this@BajajFdMainActivity) -// dialogWebView.setContentView(R.layout.row_fd_pay) -// dialogWebView.setCancelable(true) -// -// val tvCancel = dialogWebView.findViewById(R.id.tvCancel) -// tvCancel.setOnClickListener { -// dialogWebView.dismiss() -// } -// -// val lp = WindowManager.LayoutParams() -// lp.copyFrom(dialogWebView.window?.attributes) -// lp.width = WindowManager.LayoutParams.MATCH_PARENT -// lp.height = WindowManager.LayoutParams.MATCH_PARENT -// dialogWebView.window?.attributes = lp -// val wVPay = dialogWebView.findViewById(R.id.wVPay) -// wVPay.webViewClient = MyWebViewClient() -// wVPay.settings.javaScriptEnabled = true -// wVPay.settings.domStorageEnabled = true -// val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" + -// "&value=${URLEncoder.encode(value, "UTF-8")}" -// wVPay.postUrl(payUrl, postData.toByteArray()) -// dialogWebView.show() - - val webView = WebView(this@BajajFdMainActivity) - setContentView(webView) - val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" + - "&value=${URLEncoder.encode(value, "UTF-8")}" - webView.postUrl(payUrl, postData.toByteArray()) - } - - class MyWebViewClient : WebViewClient() { - override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { - super.onPageStarted(view, url, favicon) - Log.e("onPageStarted", "-->$url") + dialogWebView = Dialog(this@BajajFdMainActivity) + dialogWebView!!.setContentView(R.layout.row_fd_pay) + dialogWebView!!.setCancelable(true) + val tvCancel = dialogWebView!!.findViewById(R.id.tvCancel) + tvCancel.setOnClickListener { + dialogWebView!!.dismiss() } - - override fun onPageFinished(view: WebView, url: String) { - super.onPageFinished(view, url) + val lp = WindowManager.LayoutParams() + lp.copyFrom(dialogWebView!!.window?.attributes) + lp.width = WindowManager.LayoutParams.MATCH_PARENT + lp.height = WindowManager.LayoutParams.MATCH_PARENT + dialogWebView!!.window?.attributes = lp + val wVPay = dialogWebView!!.findViewById(R.id.wVPay) + wVPay.settings.javaScriptEnabled = true + wVPay.settings.domStorageEnabled = true + wVPay.loadData( + "
\n" + " \n" + "
\n" + + "", + "text/html", + "UTF-8" + ) + wVPay.webViewClient = object : WebViewClient() { + override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { + super.onPageStarted(view, url, favicon) + Log.e("onPageStarted", "-->$url") + if (url.isNotEmpty() && url.contains("https://uat.nivesh.com/bajajFD/OrderStatus")) { + if (dialogWebView != null && dialogWebView!!.isShowing) { + dialogWebView!!.dismiss() + paymentReQueryApi() + } + } + } } + dialogWebView!!.show() } - private fun paymentReQueryApi() { + fun paymentReQueryApi() { if (Common.isNetworkAvailable(this)) { val paymentReQueryRequest = PaymentReQueryRequest() paymentReQueryRequest.UniqueId = UniqueId - paymentReQueryRequest.NiveshClientCode = getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + paymentReQueryRequest.NiveshClientCode = + getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) viewModel.getPaymentReQueryMutableData.observe(this) { response -> when (response) { @@ -452,7 +452,7 @@ class BajajFdMainActivity : BaseActivity() { } else { binding.viewPager.currentItem = 3 } - stepFiveBajajFDFragment.getData() + stepFiveBajajFDFragment.getData(paymentReQueryResponse) } 650 -> refreshToken("") else -> { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt index ceb6f7d..aba6808 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt @@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.nivesh.production.bajajfd.api.ApiClient import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepFiveBinding +import com.nivesh.production.bajajfd.model.PaymentReQueryResponse import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.ui.providerfactory.StepFiveModelProviderFactory import com.nivesh.production.bajajfd.viewModel.StepFiveBajajFDViewModel @@ -22,23 +23,12 @@ class StepFiveBajajFDFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - _binding = FragmentBajajfdStepFiveBinding.inflate(inflater, container, false) - val root = binding.root - -// val textView: TextView = binding.sectionLabel -// stepFourViewModel.text.observe(viewLifecycleOwner) { -// textView.text = it -// } -// -// binding.btnClick.setOnClickListener { -// bajajFDInterface.stepFourApi("stepFourResponse") -// } - - return root + return binding.root } - fun getData(){ + fun getData(paymentReQueryResponse: PaymentReQueryResponse) { + } @@ -48,6 +38,11 @@ class StepFiveBajajFDFragment : Fragment() { this, StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient)) )[StepFiveBajajFDViewModel::class.java] + + binding.btnViewOrder.setOnClickListener { + + } + } override fun onDestroyView() { 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 6237cc2..8ca4229 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 @@ -5,6 +5,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.google.gson.Gson @@ -54,32 +55,43 @@ class StepFourBajajFDFragment : BaseFragment() { } + if ((activity as BajajFdMainActivity).LoginRole == 5) { + binding.btnNext.text = getString(R.string.pay) + binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null)) + }else{ + binding.btnNext.text = getString(R.string.viewOrder) + binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.red, null)) + } + binding.btnNext.setOnClickListener { - selectedList = "" - for (getCodes in listOfCustomer) { - if (getCodes.isSelected) { - selectedList = if (selectedList.isEmpty()) { - getCodes.Value - } else { - selectedList.plus(",").plus(getCodes.Value) + if ((activity as BajajFdMainActivity).LoginRole == 5) { + selectedList = "" + for (getCodes in listOfCustomer) { + if (getCodes.isSelected) { + selectedList = if (selectedList.isEmpty()) { + getCodes.Value + } else { + selectedList.plus(",").plus(getCodes.Value) + } } } - } - Log.e("selectedList", "-->$selectedList") - if (binding.checkBox.isChecked) { - val saveFDOtherDataRequest = SaveFDOtherDataRequest() - saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) - saveFDOtherDataRequest.UniqueId = uniqueId - saveFDOtherDataRequest.Values = selectedList - saveFDOtherDataRequest.NiveshClientCode = - (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE - // bajajFDInterface.stepFourApi(saveFDOtherDataRequest, payUrl, Value) - saveFDOtherData(saveFDOtherDataRequest, payUrl, value) - } else { - showDialogValidation( - activity as BajajFdMainActivity, - resources.getString(R.string.validTermsConditions) - ) + if (binding.checkBox.isChecked && selectedList.isNotEmpty()) { + val saveFDOtherDataRequest = SaveFDOtherDataRequest() + saveFDOtherDataRequest.FDProvider = getString(R.string.bajaj) + saveFDOtherDataRequest.UniqueId = uniqueId + saveFDOtherDataRequest.Values = selectedList + saveFDOtherDataRequest.NiveshClientCode = + (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + // bajajFDInterface.stepFourApi(saveFDOtherDataRequest, payUrl, Value) + saveFDOtherData(saveFDOtherDataRequest, payUrl, value) + } else { + showDialogValidation( + activity as BajajFdMainActivity, + resources.getString(R.string.validTermsConditions) + ) + } + }else{ + // go to view order } } @@ -103,7 +115,6 @@ class StepFourBajajFDFragment : BaseFragment() { when (code) { 200 -> { (activity as BajajFdMainActivity).stepFourApi(payUrl, value) - // paymentDialog(payUrl, value) } // 650 -> refreshToken() else -> { 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 7e4f9ba..687bed2 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,6 +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).createFDApplicantRequest.FDInvestmentDetails = (activity as BajajFdMainActivity).fdInvestmentDetails 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 bb96c60..b097ecf 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 @@ -710,7 +710,6 @@ class StepTwoBajajFDFragment : BaseFragment() { (activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails = (activity as BajajFdMainActivity).nomineeGuardianDetails - (activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = (activity as BajajFdMainActivity).UniqueId (activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest = (activity as BajajFdMainActivity).createFDApplicantRequest diff --git a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt index b5347e5..74af264 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt @@ -5,10 +5,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.gson.JsonObject -import com.nivesh.production.bajajfd.model.GetCodeRequest -import com.nivesh.production.bajajfd.model.GetFDDetailsRequest -import com.nivesh.production.bajajfd.model.GetRatesRequest -import com.nivesh.production.bajajfd.model.SaveFDOtherDataRequest +import com.nivesh.production.bajajfd.model.* import com.nivesh.production.bajajfd.repositories.MainRepository import com.nivesh.production.bajajfd.util.Common import com.nivesh.production.bajajfd.util.Common.Companion.handleResponse @@ -67,7 +64,7 @@ class StepFourBajajFDViewModel(private val mainRepository: MainRepository) : Vie } } - fun paymentReQuery(getRatesRequest: GetRatesRequest, token: String, + fun paymentReQuery(getRatesRequest: PaymentReQueryRequest, token: String, activity: Activity) = viewModelScope.launch(Common.handleError(activity)) { if (Common.isNetworkAvailable(activity)) { getRatesMutableData.postValue(Resource.Loading()) diff --git a/app/src/main/res/layout/fragment_bajajfd_step_five.xml b/app/src/main/res/layout/fragment_bajajfd_step_five.xml index effefb9..d507a95 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_five.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_five.xml @@ -156,7 +156,7 @@