Browse Source

added modification in code

PankajBranch
Hemant Khadase 2 years ago
parent
commit
abe4571a4b
3 changed files with 12 additions and 12 deletions
  1. +5
    -5
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  2. +2
    -2
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepFourBajajFDFragment.kt
  3. +5
    -5
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

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

@ -52,12 +52,12 @@ class BajajFdMainActivity : BaseActivity() {
var nomineeDetails: NomineeDetails = NomineeDetails() var nomineeDetails: NomineeDetails = NomineeDetails()
var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails() var nomineeGuardianDetails: NomineeGuardianDetails = NomineeGuardianDetails()
var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse() var getClientDetailsResponse: getClientDetailsResponse = getClientDetailsResponse()
var UniqueId: String = ""
var uniqueId: String = ""
private var stepCount: Int = 0 private var stepCount: Int = 0
private lateinit var sectionsPagerAdapter: SectionsPagerAdapter private lateinit var sectionsPagerAdapter: SectionsPagerAdapter
private lateinit var fragments: Array<Fragment> private lateinit var fragments: Array<Fragment>
var dialogWebView: Dialog? = null var dialogWebView: Dialog? = null
var LoginRole: Int = 0
var loginRole: Int = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -75,7 +75,7 @@ class BajajFdMainActivity : BaseActivity() {
FDModelProviderFactory(MainRepository(ApiClient.getApiClient)) FDModelProviderFactory(MainRepository(ApiClient.getApiClient))
)[BajajFDViewModel::class.java] )[BajajFDViewModel::class.java]
LoginRole = 5
loginRole = 5
if (Common.isNetworkAvailable(this)) { if (Common.isNetworkAvailable(this)) {
getStepsCountApi() getStepsCountApi()
} }
@ -150,7 +150,7 @@ class BajajFdMainActivity : BaseActivity() {
userRequest.IPAddress = "" userRequest.IPAddress = ""
userRequest.Source = getString(R.string.source) userRequest.Source = getString(R.string.source)
userRequest.AppOrWeb = getString(R.string.app) userRequest.AppOrWeb = getString(R.string.app)
userRequest.LoggedInRoleId = LoginRole
userRequest.LoggedInRoleId = loginRole
val deviceInfo = DeviceInfo() val deviceInfo = DeviceInfo()
deviceInfo.device_id = "" deviceInfo.device_id = ""
@ -431,7 +431,7 @@ class BajajFdMainActivity : BaseActivity() {
fun paymentReQueryApi() { fun paymentReQueryApi() {
if (Common.isNetworkAvailable(this)) { if (Common.isNetworkAvailable(this)) {
val paymentReQueryRequest = PaymentReQueryRequest() val paymentReQueryRequest = PaymentReQueryRequest()
paymentReQueryRequest.UniqueId = UniqueId
paymentReQueryRequest.UniqueId = uniqueId
paymentReQueryRequest.NiveshClientCode = paymentReQueryRequest.NiveshClientCode =
getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
viewModel.getPaymentReQuery(paymentReQueryRequest, token, this) viewModel.getPaymentReQuery(paymentReQueryRequest, token, this)


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

@ -55,7 +55,7 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
if ((activity as BajajFdMainActivity).LoginRole == 5) {
if ((activity as BajajFdMainActivity).loginRole == 5) {
binding.btnNext.text = getString(R.string.pay) binding.btnNext.text = getString(R.string.pay)
binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null)) binding.btnNext.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null))
}else{ }else{
@ -64,7 +64,7 @@ class StepFourBajajFDFragment : BaseFragment() {
} }
binding.btnNext.setOnClickListener { binding.btnNext.setOnClickListener {
if ((activity as BajajFdMainActivity).LoginRole == 5) {
if ((activity as BajajFdMainActivity).loginRole == 5) {
selectedList = "" selectedList = ""
for (getCodes in listOfCustomer) { for (getCodes in listOfCustomer) {
if (getCodes.isSelected) { if (getCodes.isSelected) {


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

@ -531,7 +531,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
.plus(binding.edtLastName.text.toString()), .plus(binding.edtLastName.text.toString()),
binding.edtMobileNumber.text.toString(), binding.edtMobileNumber.text.toString(),
1 1
)
, (activity as BajajFdMainActivity).loginRole)
} }
} }
@ -741,7 +741,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
createFDApplicationResponse.Response.StatusCode.let { code -> createFDApplicationResponse.Response.StatusCode.let { code ->
when (code) { when (code) {
200 -> { 200 -> {
(activity as BajajFdMainActivity).UniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
(activity as BajajFdMainActivity).uniqueId = createFDApplicationResponse.Response.FDCreationDetailsResponse.UniqueId
(activity as BajajFdMainActivity).stepTwoApi( (activity as BajajFdMainActivity).stepTwoApi(
createFDApplicationResponse createFDApplicationResponse
) )
@ -878,14 +878,14 @@ class StepTwoBajajFDFragment : BaseFragment() {
private fun verifyAccountNo( private fun verifyAccountNo(
bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int bankAccount: String, Ifsc: String, name: String, phoneNumber: String, bankNo: Int
) {
,loginRole : Int) {
val bankValidationApiRequest = BankValidationApiRequest() val bankValidationApiRequest = BankValidationApiRequest()
bankValidationApiRequest.BankAccountNo = bankAccount bankValidationApiRequest.BankAccountNo = bankAccount
bankValidationApiRequest.IFSC = Ifsc bankValidationApiRequest.IFSC = Ifsc
bankValidationApiRequest.Name = name bankValidationApiRequest.Name = name
bankValidationApiRequest.PhoneNo = phoneNumber bankValidationApiRequest.PhoneNo = phoneNumber
bankValidationApiRequest.RoleId = 5
bankValidationApiRequest.RoleId = loginRole
bankValidationApiRequest.BankNo = bankNo bankValidationApiRequest.BankNo = bankNo
stepTwoBajajFDViewModel.bankValidationApi( stepTwoBajajFDViewModel.bankValidationApi(
bankValidationApiRequest, bankValidationApiRequest,
@ -1647,7 +1647,7 @@ class StepTwoBajajFDFragment : BaseFragment() {
cityRequest.Type = "" cityRequest.Type = ""
cityRequest.ClientCode = cityRequest.ClientCode =
(activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE
cityRequest.RoleID = 5
cityRequest.RoleID = (activity as BajajFdMainActivity).loginRole
cityRequest.APIName = "" cityRequest.APIName = ""
cityRequest.UID = 19060 cityRequest.UID = 19060
cityRequest.Subbroker_Code = cityRequest.Subbroker_Code =


Loading…
Cancel
Save

Powered by TurnKey Linux.