added minor changes

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
 )

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? =  ""
+
 )

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<Fragment>
+    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<TextView>(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<WebView>(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<TextView>(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<WebView>(R.id.wVPay)
+        wVPay.settings.javaScriptEnabled = true
+        wVPay.settings.domStorageEnabled = true
+        wVPay.loadData(
+            "<form name=\"frm\" action=\"$payUrl\" method=\"post\"> \n" + " <input type=\"hidden\" name=\"msg\" value=\"$value\"> \n" + " </form> \n" +
+                    "<script type=\"text/javascript\"> \n" + "document.forms[\"frm\"].submit(); \n" + "</script>",
+            "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 -> {

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() {

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 -> {

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

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

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())

app/src/main/res/layout/fragment_bajajfd_step_five.xml

@@ -156,7 +156,7 @@
 <!--        app:layout_constraintStart_toStartOf="parent" />-->
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnNext"
+        android:id="@+id/btnViewOrder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"

app/src/main/res/layout/fragment_bajajfd_step_four.xml

@@ -290,8 +290,6 @@
         android:layout_gravity="center_vertical"
         android:layout_marginTop="@dimen/margin_5"
         android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/green"
-        android:text="@string/pay"
         android:textColor="@color/white"
         android:textSize="@dimen/text_size_14"
         app:layout_constraintBottom_toBottomOf="parent"