hemant.khadase
/
BajajFDLib
0
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 1 Wiki Activity
Browse Source

Merge branch 'HemantBranch' of https://git.nivesh.com:443/hemant.khadase/BajajFDLib into ManojBranch

Manoj 2 years ago
parent
6c607d854f 0059b5f9e4
commit
13f1317060
24 changed files with 346 additions and 202 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt
  2. +35
    -0
      app/src/main/java/com/nivesh/production/bajajfd/api/ApiCallback.kt
  3. +19
    -0
      app/src/main/java/com/nivesh/production/bajajfd/api/TokenAuthenticator.kt
  4. +2
    -2
      app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt
  5. +1
    -3
      app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt
  6. +3
    -1
      app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt
  7. +6
    -0
      app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt
  8. +5
    -0
      app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt
  9. +8
    -0
      app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt
  10. +4
    -4
      app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt
  11. +97
    -58
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  12. +12
    -13
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt
  13. +39
    -32
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  14. +1
    -0
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt
  15. +8
    -17
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt
  16. +67
    -50
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt
  17. +11
    -0
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt
  18. +2
    -5
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt
  19. +3
    -2
      app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt
  20. +1
    -1
      app/src/main/res/layout/fragment_bajajfd_step_five.xml
  21. +5
    -3
      app/src/main/res/layout/fragment_bajajfd_step_four.xml
  22. +8
    -10
      app/src/main/res/layout/fragment_bajajfd_step_two.xml
  23. +4
    -0
      app/src/main/res/values-hi-rIN/strings.xml
  24. +4
    -0
      app/src/main/res/values/strings.xml

+ 1
- 1
app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt View File

@ -28,7 +28,7 @@ class BankListAdapter(
viewType: Int
): BankListViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_bank_list_preview, parent, false)
.inflate(R.layout.item_bank_list_preview, parent, false);
view.layoutParams = width?.div(1.35)
?.let { ViewGroup.LayoutParams(it.toInt(), ViewGroup.LayoutParams.WRAP_CONTENT) }
return BankListViewHolder(view)


+ 35
- 0
app/src/main/java/com/nivesh/production/bajajfd/api/ApiCallback.kt View File

@ -0,0 +1,35 @@
package com.nivesh.production.bajajfd.api
import com.nivesh.production.bajajfd.util.Resource
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
abstract class ApiCallback<T : Any> : Callback<Resource<T>> {
abstract fun onSuccess(response: Resource<T>)
abstract fun onFailure(response: Resource<T>)
override fun onResponse(call: Call<Resource<T>>, response: Response<Resource<T>>) {
if (response.isSuccessful && response.body() != null && response.code() == 200) {
onSuccess(response.body()!!)
} else {
// handle 4xx & 5xx error codes here
// val resp = Resource<T>()
// resp.status = false
// resp.message = response.message()
// onFailure(resp)
}
}
override fun onFailure(call: Call<Resource<T>>, t: Throwable) {
// val response = Resource<T>()
// response.status = false
// response.message = t.message.toString()
// onFailure(response)
}
}

+ 19
- 0
app/src/main/java/com/nivesh/production/bajajfd/api/TokenAuthenticator.kt View File

@ -0,0 +1,19 @@
package com.nivesh.production.bajajfd.api
import okhttp3.Authenticator
import okhttp3.Request
import okhttp3.Response
import okhttp3.Route
class TokenAuthenticator {
// override fun authenticate(route: Route?, response: Response): Request? {
//// newAccessToken = service.refreshToken();
////
//// // Add new header to rejected request and retry it
//// return response.request().newBuilder()
//// .header(AUTHORIZATION, newAccessToken)
//// .build();
//
//
// }
}

+ 2
- 2
app/src/main/java/com/nivesh/production/bajajfd/interfaces/ApiInterface.kt View File

@ -64,7 +64,7 @@ interface ApiInterface {
@POST("PaymentRequery")
suspend fun paymentReQuery(
@Body requestBody: RequestBody,
@Body requestBody: PaymentReQueryRequest,
@Header("token") token: String
): Response<JsonObject>
@ -146,7 +146,7 @@ interface ApiInterface {
): Response<JsonObject>
@GET("GetFDBankList?FDProvider=Bajaj")
suspend fun bankListApi(@Header("token") token: String): Response<JsonObject>
suspend fun bankListApi(@Header("token") token: String, @Query("Language") language : String): Response<JsonObject>
@GET("GetIFSC_Autofill?")
suspend fun getIFSCApi(@Query("prefix") ifsc : String): Response<JsonObject>


+ 1
- 3
app/src/main/java/com/nivesh/production/bajajfd/model/CreateFDApplicationRequest.kt View File

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

+ 3
- 1
app/src/main/java/com/nivesh/production/bajajfd/model/FDInvestmentDetails.kt View File

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

+ 6
- 0
app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryRequest.kt View File

@ -0,0 +1,6 @@
package com.nivesh.production.bajajfd.model
data class PaymentReQueryRequest(
var NiveshClientCode: String? = "",
var UniqueId: String? = ""
)

+ 5
- 0
app/src/main/java/com/nivesh/production/bajajfd/model/PaymentReQueryResponse.kt View File

@ -0,0 +1,5 @@
package com.nivesh.production.bajajfd.model
data class PaymentReQueryResponse(
val Response: ResponseXXXXXXXXXXXXXXX
)

+ 8
- 0
app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXXXXX.kt View File

@ -0,0 +1,8 @@
package com.nivesh.production.bajajfd.model
data class ResponseXXXXXXXXXXXXXXX(
val Errors: List<Errors>,
val Message: String,
val Status: String,
val StatusCode: Int
)

+ 4
- 4
app/src/main/java/com/nivesh/production/bajajfd/repositories/MainRepository.kt View File

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


+ 97
- 58
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt View File

@ -31,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() {
@ -53,10 +52,12 @@ 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<Fragment>
var dialogWebView: Dialog? = null
var loginRole: Int = 0
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -74,6 +75,7 @@ class BajajFdMainActivity : BaseActivity() {
FDModelProviderFactory(MainRepository(ApiClient.getApiClient))
)[BajajFDViewModel::class.java]
loginRole = 5
if (Common.isNetworkAvailable(this)) {
getStepsCountApi()
}
@ -88,6 +90,7 @@ class BajajFdMainActivity : BaseActivity() {
val fdStepsCount = FDStepsCountRequest()
fdStepsCount.FDProvider = getString(R.string.bajaj)
fdStepsCount.NiveshClientCode = "8872"
// client code =8872 /60476
viewModel.getStepsCount(fdStepsCount, token, this)
viewModel.getStepsCountMutableData.observe(this) { response ->
when (response) {
@ -104,7 +107,7 @@ class BajajFdMainActivity : BaseActivity() {
stepCount = stepsCountResponse.Response.StepsCount
getClientDetailsApi(stepsCountResponse.Response.StepsCount)
}
650 -> refreshToken(fdStepsCount)
650 -> refreshToken("")
else -> {
showDialogValidation(
this@BajajFdMainActivity,
@ -130,10 +133,10 @@ class BajajFdMainActivity : BaseActivity() {
}
}
private fun refreshToken(fdStepsCount: FDStepsCountRequest) {
}
private fun refreshToken(fdStepsCount: String) {
}
private fun getClientDetailsApi(stepsCount: Int) {
if (Common.isNetworkAvailable(this@BajajFdMainActivity)) {
@ -141,13 +144,13 @@ class BajajFdMainActivity : BaseActivity() {
getClientDetailsRequest.client_code = "8872"
getClientDetailsRequest.AppOrWeb = getString(R.string.app)
getClientDetailsRequest.sub_broker_code = "1038"
// 8872/1038
val userRequest = UserRequest()
userRequest.UID = 19060
userRequest.UID = 0
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 = ""
@ -201,7 +204,6 @@ class BajajFdMainActivity : BaseActivity() {
}
}
private fun setViewPager(stepsCount: Int) {
// steps setting
setBackground(selectedShape(), defaultShape(), defaultShape(), defaultShape())
@ -347,7 +349,6 @@ class BajajFdMainActivity : BaseActivity() {
}
// set background for selected/ default step
private fun setBackground(
drawable: Drawable?,
@ -362,29 +363,24 @@ 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) {
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
fun stepFourApi(payUrl: String, value: String) {
fun stepFourApi(payUrl: String, value: String) {
paymentDialog(payUrl, value)
}
@ -392,49 +388,92 @@ 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())
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.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()
}
class MyWebViewClient : WebViewClient() {
override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
super.onPageStarted(view, url, favicon)
Log.e("onPageStarted", "-->$url")
if (url.isNotEmpty() && url.contains("CustomerPaymentResponse")) {
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(paymentReQueryResponse)
}
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 -> {
override fun onPageFinished(view: WebView, url: String) {
super.onPageFinished(view, url)
}
}
}
}
}
}

+ 12
- 13
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFiveBajajFDFragment.kt View File

@ -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,28 +23,26 @@ 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(paymentReQueryResponse: PaymentReQueryResponse) {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
stepFiveBajajFDViewModel = ViewModelProvider(
this,
StepFiveModelProviderFactory(MainRepository(ApiClient.getApiClient))
)[StepFiveBajajFDViewModel::class.java]
binding.btnViewOrder.setOnClickListener {
}
}
override fun onDestroyView() {


+ 39
- 32
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt View File

@ -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
@ -30,7 +31,6 @@ class StepFourBajajFDFragment : BaseFragment() {
private val binding get() = _binding!!
private lateinit var listOfCustomer: MutableList<GetCodes>
private var selectedList: String = ""
private var uniqueId: String = ""
private var payUrl: String = ""
private var value: String = ""
@ -54,32 +54,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 = (activity as BajajFdMainActivity).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 +114,6 @@ class StepFourBajajFDFragment : BaseFragment() {
when (code) {
200 -> {
(activity as BajajFdMainActivity).stepFourApi(payUrl, value)
// paymentDialog(payUrl, value)
}
// 650 -> refreshToken()
else -> {
@ -131,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()
@ -199,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,


+ 1
- 0
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt View File

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


+ 8
- 17
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt View File

@ -2,8 +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
import android.database.Cursor
@ -51,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<Uri>? = null
private var selectImageIntent: ActivityResultLauncher<String>? = null
@ -63,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
@ -213,7 +209,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(
@ -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 -> {
@ -566,25 +561,25 @@ class StepThreeBajajFDFragment : BaseFragment() {
if (panString.isEmpty()) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload PAN Document"
getString(R.string.uploadPanDoc)
)
return false
} else if (photoString.isEmpty()) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload Photo"
getString(R.string.uploadPhotoDoc)
)
return false
} else if (docString.isEmpty()) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload $docValue Image"
"Upload $docValue Document"
)
return false
} else if (docValue == "Aadhar" && docString2.isEmpty()) {
Common.showDialogValidation(
activity as BajajFdMainActivity,
"Upload Aadhar Back Image"
getString(R.string.uploadAadharBackDoc)
)
return false
}
@ -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 =


+ 67
- 50
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt View File

@ -133,7 +133,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
binding.edtDOB.setOnClickListener {
removeError(binding.tlDOB)
datePicker(binding.edtDOB)
datePicker(binding.edtDOB, 1)
}
@ -391,7 +391,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
binding.edtNomineeDOB.setOnClickListener {
removeError(binding.tlNomineeDOB)
datePicker(binding.edtNomineeDOB)
datePicker(binding.edtNomineeDOB, 2)
}
binding.spNomineeRelation.setText(
@ -402,9 +402,6 @@ class StepTwoBajajFDFragment : BaseFragment() {
binding.spNomineeRelation.setOnItemClickListener { _, _, _, _ ->
removeError(binding.tlNomineeRelation)
}
binding.cbNomineeSameAddress.setOnCheckedChangeListener { _, _ ->
}
// Guardian Details
binding.edtGuardianName.addTextChangedListener(object : TextWatcher {
@ -534,7 +531,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
.plus(binding.edtLastName.text.toString()),
binding.edtMobileNumber.text.toString(),
1
)
, (activity as BajajFdMainActivity).loginRole)
}
}
@ -550,7 +547,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
binding.addBankDetail.setOnClickListener {
if (bankListAdapter.itemCount == 5) {
showDialogValidation(mActivity, "You can not add more than five accounts")
showDialogValidation(mActivity, getString(R.string.fiveAccountValidation))
} else {
showHideBankDetail()
}
@ -664,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()) {
@ -686,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 =
@ -714,7 +710,6 @@ class StepTwoBajajFDFragment : BaseFragment() {
(activity as BajajFdMainActivity).createFDApplicantRequest.NomineeGuardianDetails =
(activity as BajajFdMainActivity).nomineeGuardianDetails
(activity as BajajFdMainActivity).createFDApplicantRequest.UniqueId = ""
(activity as BajajFdMainActivity).createFDRequest.CreateFDApplicationRequest =
(activity as BajajFdMainActivity).createFDApplicantRequest
@ -746,14 +741,13 @@ class StepTwoBajajFDFragment : BaseFragment() {
createFDApplicationResponse.Response.StatusCode.let { code ->
when (code) {
200 -> {
(activity as BajajFdMainActivity).stepTwoApi(
createFDApplicationResponse
)
(activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
(activity as BajajFdMainActivity).stepTwoApi()
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
createFDApplicationResponse.Response.Errors[0].ErrorMessage
)
@ -764,7 +758,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -815,7 +809,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getIFSCCodeListResponse.Response.message
)
@ -826,7 +820,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
message
)
@ -865,7 +859,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -882,14 +876,14 @@ class StepTwoBajajFDFragment : BaseFragment() {
private fun verifyAccountNo(
bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int
) {
,loginRole : Int) {
val bankValidationApiRequest = BankValidationApiRequest()
bankValidationApiRequest.BankAccountNo = bankAccount
bankValidationApiRequest.IFSC = Ifsc
bankValidationApiRequest.Name = name
bankValidationApiRequest.PhoneNo = phoneNumber
bankValidationApiRequest.RoleId = 5
bankValidationApiRequest.RoleId = loginRole
bankValidationApiRequest.BankNo = bankNo
stepTwoBajajFDViewModel.bankValidationApi(
bankValidationApiRequest,
@ -908,10 +902,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
if (binding.tvAcVerify.visibility == View.GONE) {
binding.tvAcVerify.visibility = View.VISIBLE
}
when (code) {
200 -> {
if (getBankValidationApiResponse.Message == "Account verified") {
if (getBankValidationApiResponse.Message == "Account Verified") {
val clientBankList = ClientBanklist()
clientBankList.AccountNumber = bankAccount
clientBankList.AccountType = "sb"
@ -932,6 +925,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
clientBankList.AccountNumber.toString()
)
showHideBankDetail()
} else {
showDialogValidation(
activity as BajajFdMainActivity,
@ -953,7 +947,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1018,7 +1012,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)
@ -1032,6 +1026,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
@ -1041,6 +1044,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 =
@ -1088,7 +1100,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1160,7 +1172,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1171,7 +1183,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1211,7 +1223,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1222,7 +1234,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1282,7 +1294,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1293,7 +1305,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1349,7 +1361,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1360,7 +1372,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1410,7 +1422,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1421,7 +1433,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1463,14 +1475,14 @@ class StepTwoBajajFDFragment : BaseFragment() {
)
binding.spOccupation.setAdapter(adapter)
binding.spOccupation.setText(
adapter.getItem(0)?.Value,
adapter.getItem(0)?.Label,
false
)
}
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1481,7 +1493,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1530,7 +1542,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getCodeResponse.Response.Errors[0].ErrorMessage
)
@ -1541,7 +1553,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1602,7 +1614,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
stateListResponse.response.message
)
@ -1613,7 +1625,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1633,7 +1645,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
cityRequest.Type = ""
cityRequest.ClientCode =
(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
cityRequest.RoleID = 5
cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole
cityRequest.APIName = ""
cityRequest.UID = 19060
cityRequest.Subbroker_Code =
@ -1680,7 +1692,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
// 650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
cityListResponse.response.message
)
@ -1691,7 +1703,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1705,7 +1717,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 -> {
@ -1722,9 +1734,9 @@ class StepTwoBajajFDFragment : BaseFragment() {
dialogForBankList(getFDBankListResponse.Response.BankList)
}
}
// 650 -> refreshToken()
650 -> refreshToken()
else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity,
getFDBankListResponse.Response.Errors[0].ErrorMessage
)
@ -1735,7 +1747,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
is Resource.Error -> {
response.message?.let { message ->
Common.showDialogValidation(activity as BajajFdMainActivity, message)
showDialogValidation(activity as BajajFdMainActivity, message)
}
}
is Resource.Loading -> {
@ -1748,6 +1760,11 @@ class StepTwoBajajFDFragment : BaseFragment() {
}
}
private fun refreshToken() {
}
private fun dialogForBankList(bankList: List<Bank>) {
val dialog = Dialog(activity as BajajFdMainActivity)
dialog.setContentView(R.layout.layout_bank_list)


+ 11
- 0
app/src/main/java/com/nivesh/production/bajajfd/viewModel/BajajFDViewModel.kt View File

@ -49,4 +49,15 @@ class BajajFDViewModel(private val mainRepository: MainRepository) : ViewModel()
}
}
val getPaymentReQueryMutableData: MutableLiveData<Resource<JsonObject>> = 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))
}
}
}

+ 2
- 5
app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepFourBajajFDViewModel.kt View File

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


+ 3
- 2
app/src/main/java/com/nivesh/production/bajajfd/viewModel/StepTwoBajajFDViewModel.kt View File

@ -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<Resource<JsonObject>> = 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))
}
}


+ 1
- 1
app/src/main/res/layout/fragment_bajajfd_step_five.xml View File

@ -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"


+ 5
- 3
app/src/main/res/layout/fragment_bajajfd_step_four.xml View File

@ -220,7 +220,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvTerms"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
tools:listitem="@layout/item_customer_list_preview"
/>
</LinearLayout>
@ -286,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"


+ 8
- 10
app/src/main/res/layout/fragment_bajajfd_step_two.xml View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/constraintLayout"
@ -703,16 +705,9 @@
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cbNomineeSameAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:text="@string/nomineeAddressSameAsPrimaryApplicantAddress"
android:textSize="@dimen/text_size_10" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianName"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -733,6 +728,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianAge"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -753,6 +749,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianRelation"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -778,9 +775,9 @@
android:textSize="@dimen/text_size_14" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianAddress"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -801,6 +798,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlGuardianPinCode"
android:visibility="gone"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"


+ 4
- 0
app/src/main/res/values-hi-rIN/strings.xml View File

@ -240,6 +240,10 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string>
<string name="uploadPanDoc">Upload PAN Document</string>
<string name="uploadPhotoDoc">Upload Photo Document</string>
<string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
<string name="fiveAccountValidation">You can not add more than five accounts</string>
<string name="panLabel">PAN</string>

+ 4
- 0
app/src/main/res/values/strings.xml View File

@ -241,6 +241,10 @@
<string name="Ok"><font fgcolor='#FF8E8E93'>OK</font></string>
<string name="cancel">Cancel</string>
<string name="aadhar">Aadhar</string>
<string name="uploadPanDoc">Upload PAN Document</string>
<string name="uploadPhotoDoc">Upload Photo Document</string>
<string name="uploadAadharBackDoc">Upload Aadhar Back Document</string>
<string name="fiveAccountValidation">You can not add more than five accounts</string>
</resources>

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.