diff --git a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt index e8d3331b..59c5dc4a 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt @@ -61,6 +61,15 @@ class BeneficiaryDetailActivity : BaseActivity(), receiverInfoModel?.paymentMethod = paymentMethodV3Model receiverInfoModel?.receiverId = paymentMethodV3Model.receiverId receiverInfoModel?.agent = paymentMethodV3Model.agent + + receiverInfoModel?.payoutPartner = paymentMethodV3Model.payoutPartner + receiverInfoModel?.nativeCountry = paymentMethodV3Model.nativeCountry + receiverInfoModel?.nativeCountryCode = paymentMethodV3Model.nativeCountryCode + receiverInfoModel?.nativeCountryId = paymentMethodV3Model.nativeCountryId + receiverInfoModel?.hasVerifiedOTP = paymentMethodV3Model.hasVerifiedOTP + receiverInfoModel?.isPartnerChanged = paymentMethodV3Model.isPartnerChanged + receiverInfoModel?.isForceUpdate = paymentMethodV3Model.isForceUpdate +// receiverInfoModel?.fo = paymentMethodV3Model.forceUpdateMsg } override fun onItemDelete(paymentMethodV3Model: PaymentMethodV3Model) { diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java index 1113deee..540f4327 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/PaymentMethodV3Model.java @@ -34,6 +34,31 @@ public class PaymentMethodV3Model implements Parcelable { @Expose private AgentV3Model agent; + @SerializedName("payoutPartner") + @Expose + private String payoutPartner; + @SerializedName("nativeCountry") + @Expose + private String nativeCountry; + @SerializedName("nativeCountryCode") + @Expose + private String nativeCountryCode; + @SerializedName("nativeCountryId") + @Expose + private String nativeCountryId; + @SerializedName("hasVerifiedOTP") + @Expose + private Boolean hasVerifiedOTP; + @SerializedName("isPartnerChanged") + @Expose + private String isPartnerChanged; + @SerializedName("isForceUpdate") + @Expose + private String isForceUpdate; + @SerializedName("ForceUpdateMsg") + @Expose + private String forceUpdateMsg; + boolean selected; public String getReceiverId() { @@ -92,6 +117,70 @@ public class PaymentMethodV3Model implements Parcelable { this.agent = agent; } + public String getPayoutPartner() { + return payoutPartner; + } + + public void setPayoutPartner(String payoutPartner) { + this.payoutPartner = payoutPartner; + } + + public String getNativeCountry() { + return nativeCountry; + } + + public void setNativeCountry(String nativeCountry) { + this.nativeCountry = nativeCountry; + } + + public String getNativeCountryCode() { + return nativeCountryCode; + } + + public void setNativeCountryCode(String nativeCountryCode) { + this.nativeCountryCode = nativeCountryCode; + } + + public String getNativeCountryId() { + return nativeCountryId; + } + + public void setNativeCountryId(String nativeCountryId) { + this.nativeCountryId = nativeCountryId; + } + + public Boolean getHasVerifiedOTP() { + return hasVerifiedOTP; + } + + public void setHasVerifiedOTP(Boolean hasVerifiedOTP) { + this.hasVerifiedOTP = hasVerifiedOTP; + } + + public String getIsPartnerChanged() { + return isPartnerChanged; + } + + public void setIsPartnerChanged(String isPartnerChanged) { + this.isPartnerChanged = isPartnerChanged; + } + + public String getIsForceUpdate() { + return isForceUpdate; + } + + public void setIsForceUpdate(String isForceUpdate) { + this.isForceUpdate = isForceUpdate; + } + + public String getForceUpdateMsg() { + return forceUpdateMsg; + } + + public void setForceUpdateMsg(String forceUpdateMsg) { + this.forceUpdateMsg = forceUpdateMsg; + } + public PaymentMethodV3Model() { } @@ -120,6 +209,15 @@ public class PaymentMethodV3Model implements Parcelable { dest.writeString(this.localizedName); dest.writeStringList(this.currency); dest.writeParcelable(this.agent, flags); + dest.writeString(this.payoutPartner); + dest.writeString(this.nativeCountry); + dest.writeString(this.nativeCountryCode); + dest.writeString(this.nativeCountryId); + dest.writeValue(this.hasVerifiedOTP); + dest.writeString(this.isPartnerChanged); + dest.writeString(this.isForceUpdate); + dest.writeString(this.forceUpdateMsg); + dest.writeByte(this.selected ? (byte) 1 : (byte) 0); } protected PaymentMethodV3Model(Parcel in) { @@ -129,6 +227,15 @@ public class PaymentMethodV3Model implements Parcelable { this.localizedName = in.readString(); this.currency = in.createStringArrayList(); this.agent = in.readParcelable(AgentV3Model.class.getClassLoader()); + this.payoutPartner = in.readString(); + this.nativeCountry = in.readString(); + this.nativeCountryCode = in.readString(); + this.nativeCountryId = in.readString(); + this.hasVerifiedOTP = (Boolean) in.readValue(Boolean.class.getClassLoader()); + this.isPartnerChanged = in.readString(); + this.isForceUpdate = in.readString(); + this.forceUpdateMsg = in.readString(); + this.selected = in.readByte() != 0; } public static final Creator CREATOR = new Creator() { diff --git a/app/src/main/res/layout/row_all_beneficiary.xml b/app/src/main/res/layout/row_all_beneficiary.xml index 9e0f90b6..622f0418 100644 --- a/app/src/main/res/layout/row_all_beneficiary.xml +++ b/app/src/main/res/layout/row_all_beneficiary.xml @@ -22,9 +22,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:text="R" + android:text="WW" android:textColor="@color/light_blue" - android:textSize="@dimen/_24sdp" /> + android:textSize="@dimen/_20sdp" /> diff --git a/app/src/main/res/layout/row_fragment_beneficiaries.xml b/app/src/main/res/layout/row_fragment_beneficiaries.xml index a76682ed..1816adcf 100644 --- a/app/src/main/res/layout/row_fragment_beneficiaries.xml +++ b/app/src/main/res/layout/row_fragment_beneficiaries.xml @@ -23,7 +23,7 @@ android:layout_centerInParent="true" android:text="R" android:textColor="@color/light_blue" - android:textSize="@dimen/_24sdp" /> + android:textSize="@dimen/_20sdp" /> diff --git a/app/src/main/res/layout/row_recent_transactions.xml b/app/src/main/res/layout/row_recent_transactions.xml index 557d9499..7ee33d72 100644 --- a/app/src/main/res/layout/row_recent_transactions.xml +++ b/app/src/main/res/layout/row_recent_transactions.xml @@ -19,13 +19,13 @@ + android:textSize="@dimen/_20sdp" />