|
|
@ -1,5 +1,7 @@ |
|
|
|
package com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd; |
|
|
|
|
|
|
|
import android.util.Log; |
|
|
|
|
|
|
|
import com.gmeremit.online.gmeremittance_native.R; |
|
|
|
import com.gmeremit.online.gmeremittance_native.base.BasePresenter; |
|
|
|
import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; |
|
|
@ -50,10 +52,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA |
|
|
|
@Override |
|
|
|
public void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, |
|
|
|
ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, |
|
|
|
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId) { |
|
|
|
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId,String city) { |
|
|
|
|
|
|
|
|
|
|
|
if(validateData(firstName,middleName,lastName,selectedCountry,selectedProvince,selectedDistrict,address,selectedRelation,mobileNo,email,selectedTransfer)) |
|
|
|
if(validateData(firstName,middleName,lastName,selectedCountry,selectedProvince,selectedDistrict,address,selectedRelation,mobileNo,email,selectedTransfer,city)) |
|
|
|
{ |
|
|
|
this.compositeDisposable.add(this.gateway.addRecipientAndSendToServer(gateway.getAuth(), |
|
|
|
gateway.getUserID(), |
|
|
@ -65,7 +67,8 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA |
|
|
|
mobileNo, |
|
|
|
email, |
|
|
|
selectedTransfer.getId(), |
|
|
|
selectedRecipientId |
|
|
|
selectedRecipientId, |
|
|
|
city |
|
|
|
) |
|
|
|
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) |
|
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
@ -79,9 +82,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA |
|
|
|
|
|
|
|
private boolean validateData(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, |
|
|
|
ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, |
|
|
|
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer) |
|
|
|
String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer,String city) |
|
|
|
{ |
|
|
|
boolean isValid= true; |
|
|
|
|
|
|
|
if(!validateFirstName(firstName)) |
|
|
|
isValid=false; |
|
|
|
if(!validateLastName(lastName)) |
|
|
@ -96,11 +100,24 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA |
|
|
|
isValid=false; |
|
|
|
if(!validatTransfer(selectedTransfer)) |
|
|
|
isValid=false; |
|
|
|
if(!validateCity(city)) |
|
|
|
isValid=false; |
|
|
|
|
|
|
|
|
|
|
|
return isValid; |
|
|
|
} |
|
|
|
|
|
|
|
private boolean validateCity(String city) { |
|
|
|
if(!checkStringNotEmpty(city)) |
|
|
|
{ |
|
|
|
view.setErrorOnCity(getStringfromStringId(R.string.city_error)); |
|
|
|
return false; |
|
|
|
} |
|
|
|
view.setErrorOnCity(null); |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private boolean validateFirstName(String firstName) |
|
|
|
{ |
|
|
@ -344,7 +361,8 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA |
|
|
|
selectedRelationDetailModel, |
|
|
|
editableData.getMobileNumber(), |
|
|
|
editableData.getEmail(), |
|
|
|
selectedTransferDetailModel); |
|
|
|
selectedTransferDetailModel, |
|
|
|
editableData.getCity()); |
|
|
|
|
|
|
|
view.showRelatedData(metaData); |
|
|
|
|
|
|
|