terms and condition link fixes ,recipient label changed to beneficiary

SpinnerDatePickerLib-release/build/.transforms/3085e45905dc4e3d2dd1efaa087c2ec3.bin

@@ -0,0 +1 @@
+o/SpinnerDatePickerLib-release-runtime

SpinnerDatePickerLib-release/build/.transforms/ef3dd7c91f9ebd85bb04da5eb38afb40.bin

@@ -0,0 +1 @@
+i/jars/classes.jar

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientAddEditBasePresenter.java

@@ -20,6 +20,8 @@ import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel
 
 import java.util.List;
 
+import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS;
+
 
 public abstract class RecipientAddEditBasePresenter extends BasePresenter implements RecipientPresenterInterface {
 
@@ -50,7 +52,7 @@ public abstract class RecipientAddEditBasePresenter extends BasePresenter implem
 
     @Override
     public WebRequestModel getWebRequestDataForTermsAndCondition() {
-        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), "https://online.gmeremit.com/Terms", null);
+        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), JME_TERMS_N_CONDITIONS, null);
     }
 
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/RecipientDetailValidator.java

@@ -52,7 +52,7 @@ import static com.swifttech.remit.jmecustomer.features.recipientmanagement.prese
 
 /**
  * @author Preyea R. Regmi
- * Collaborator class to apply dynamic validation as well as manage state of recipient information during add/edit recipient process.
+ * Collaborator class to apply dynamic validation as well as manage state of beneficiary information during add/edit recipient process.
  * The dependent class should update the state through updateXXX methods. Updating to the reipeintInfo property directly is discouraged.
  */
 public class RecipientDetailValidator {

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/add/RecipientAddPresenter.java

@@ -29,7 +29,7 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 /**
- * Add Recipient Use Case, override any base class callback to adjust withCountdownTimer the add use case flow. Base case will handle default flow.
+ * Add Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the add use case flow. Base case will handle default flow.
  */
 public class RecipientAddPresenter extends RecipientAddEditBasePresenter {
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientlisting/presenter/recipientaddedit/edit/RecipientEditPresenter.java

@@ -37,7 +37,7 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 /**
- * Edit Recipient Use Case, override any base class callback to adjust withCountdownTimer the edit use case flow. Base case will handle default flow.
+ * Edit Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the edit use case flow. Base case will handle default flow.
  */
 public class RecipientEditPresenter extends RecipientAddEditBasePresenter {
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

@@ -52,7 +52,7 @@ import static com.swifttech.remit.jmecustomer.features.recipientmanagement.prese
 
 /**
  * @author Preyea R. Regmi
- * Collaborator class to apply dynamic validation as well as manage state of recipient information during add/edit recipient process.
+ * Collaborator class to apply dynamic validation as well as manage state of beneficiary information during add/edit recipient process.
  * The dependent class should update the state through updateXXX methods. Updating to the reipeintInfo property directly is discouraged.
  */
 public class RecipientDetailValidatorV3 {

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/RecipientPresenterInterface.java

@@ -8,6 +8,7 @@ import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipi
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PaymentBankModel;
 import com.swifttech.remit.jmecustomer.features.recipientmanagement.model.recipientaddeditV3.dynamicvalidation.PayoutProvincesModel;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO;
+import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
 
 import java.util.List;
 
@@ -27,6 +28,8 @@ public interface RecipientPresenterInterface extends BasePresenterInterface {
     void onIDTypeSelected(DropDownDTO selectedIDType);
     void onRelationSelected(DropDownDTO selectedRelation);
 
+    WebRequestModel getWebRequestDataForTermsAndCondition();
+
 
     List<CountryServiceModel> getAvailableCountryServiceData();
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java

@@ -18,6 +18,7 @@ import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.re
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO;
+import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
 import com.swifttech.remit.jmecustomer.utils.Constants;
 import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse;
 import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2;
@@ -30,8 +31,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
+import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS;
+
 /**
- * Add Recipient Use Case, override any base class callback to adjust withCountdownTimer the add use case flow. Base case will handle default flow.
+ * Add Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the add use case flow. Base case will handle default flow.
  */
 public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter {
 
@@ -116,6 +119,11 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter {
         getDynamicValidationAndDropDownList(validator.getRecipientDetail().getCountryId(), selectedServiceType.getId());
     }
 
+    @Override
+    public WebRequestModel getWebRequestDataForTermsAndCondition() {
+        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), JME_TERMS_N_CONDITIONS, null);
+    }
+
 
     @Override
     public String getMobilePrefixFromCountryCode(String countryCode) {

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java

@@ -23,6 +23,7 @@ import com.swifttech.remit.jmecustomer.features.recipientmanagement.presenter.re
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.AccountValidationApiResponse;
 import com.swifttech.remit.jmecustomer.features.sendmoney.model.payoutmode.BankBranchDTO;
+import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
 import com.swifttech.remit.jmecustomer.utils.Constants;
 import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponse;
 import com.swifttech.remit.jmecustomer.utils.https.GenericApiObserverResponseV2;
@@ -38,8 +39,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
+import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS;
+
 /**
- * Edit Recipient Use Case, override any base class callback to adjust withCountdownTimer the edit use case flow. Base case will handle default flow.
+ * Edit Beneficiary Use Case, override any base class callback to adjust withCountdownTimer the edit use case flow. Base case will handle default flow.
  */
 public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
 
@@ -94,6 +97,11 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
         getDynamicValidationAndDropDownList(validator.getRecipientDetail().getCountryId(), selectedServiceType.getId());
     }
 
+    @Override
+    public WebRequestModel getWebRequestDataForTermsAndCondition() {
+        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), JME_TERMS_N_CONDITIONS, null);
+    }
+
     @Override
     public String getMobilePrefixFromCountryCode(String countryCode) {
         if (countryCode == null)

app/src/main/java/com/swifttech/remit/jmecustomer/features/recipientmanagement/view/recipientaddeditV3/RecipientAddEditV3Activity.java

@@ -46,11 +46,14 @@ import com.swifttech.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activi
 import com.swifttech.remit.jmecustomer.features.sendmoney.view.payoutmode.PayoutModeBranchListingDialog;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
+import com.swifttech.remit.jmecustomer.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity;
+import com.swifttech.remit.jmecustomer.features.webbrowser.model.WebRequestModel;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 import static android.view.View.GONE;
+import static com.swifttech.remit.jmecustomer.features.webbrowser.WebBrowserV2Activity.WEB_BROWSWER_URL_BUNDLE_KEY;
 
 public class RecipientAddEditV3Activity extends BaseActivity implements RecipientAddV3ContractInterface, View.OnClickListener {
 
@@ -254,6 +257,9 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
     @BindView(R.id.btn_submit)
     Button submitBtn;
 
+    @BindView(R.id.txt_jme_terms_n_condition)
+    GmeTextView txvTermsAndConditions;
+
 
     GenericImageWithTextListingDialog<CountryServiceModel> countryListingDialog;
     GenericImageWithTextListingDialog<NativeCountry> nativeCountryListingDialog;
@@ -427,6 +433,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         registerClickListener(true);
         iv_back.setOnClickListener(this);
         submitBtn.setOnClickListener(this);
+        txvTermsAndConditions.setOnClickListener(this);
     }
 
 
@@ -436,6 +443,7 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
         registerClickListener(false);
         iv_back.setOnClickListener(null);
         submitBtn.setOnClickListener(null);
+        txvTermsAndConditions.setOnClickListener(null);
 
     }
 
@@ -1166,9 +1174,20 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
                     presenter.onSubmitBtnPressed();
                 break;
 
+            case R.id.txt_jme_terms_n_condition:
+             openJmeTermsAndCondition();
+                break;
+
         }
     }
 
+    private void openJmeTermsAndCondition() {
+        WebRequestModel requestModel = presenter.getWebRequestDataForTermsAndCondition();
+        Intent intent = new Intent(this, TermsAndConditionV2BrowserActivity.class);
+        intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY, requestModel);
+        startActivity(intent);
+    }
+
 
     public class CountrySelectionClickListener implements View.OnClickListener {
 

app/src/main/java/com/swifttech/remit/jmecustomer/features/sendmoney/presenter/SendMoneyV2Presenter.java

@@ -37,6 +37,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
+import static com.swifttech.remit.jmecustomer.utils.Constants.JME_TERMS_N_CONDITIONS;
+
 public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2PresenterInterface, SendMoneyV2InteractorInterface {
 
     private final ReceiverInfoV3Model selectedRecipient;
@@ -156,12 +158,12 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr
 
     @Override
     public WebRequestModel getWebRequestDataForTermsAndCondition() {
-        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), "https://online.gmeremit.com/Terms", null);
+        return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), JME_TERMS_N_CONDITIONS, null);
     }
 
     @Override
     public WebRequestModel getWebRequestDataForFraudWarning() {
-        return new WebRequestModel("", "https://online.gmeremit.com/Terms#Fraud", null);
+        return new WebRequestModel("", JME_TERMS_N_CONDITIONS, null);
     }
 
 

app/src/main/java/com/swifttech/remit/jmecustomer/utils/Constants.java

@@ -42,5 +42,7 @@ public class Constants {
 
     public static String MONGOLIA_CURRENCY ="JPY";
 
+    public static String JME_TERMS_N_CONDITIONS="https://www.japanremit.com/Website/TermsAndConditions";
+
 
 }

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

@@ -160,7 +160,7 @@
         android:orientation="horizontal">
         <com.swifttech.remit.jmecustomer.common.customwidgets.GmeTextView
             android:layout_weight="1"
-            android:text="Recipient Gets"
+            android:text="Beneficiary Gets"
             android:textColor="@color/darkgray"
             android:textSize="12sp"
             android:padding="8dp"

app/src/main/res/values-phi/strings.xml

@@ -268,7 +268,7 @@
     <string name="select_branch_text">Piliin ang Sangay</string>
     <string name="search_branch_text">Hanapin ang Sangay</string>
     <string name="no_branch_found_text">Walang Sangay na Mahanap</string>
-    <string name="recipient_listing_title_text">Piliin ang Recipient Native Country</string>
+    <string name="recipient_listing_title_text">Piliin ang Beneficiary Native Country</string>
     <string name="important_text">Importante</string>
     <string name="new_recipient_text">Bagong Tatanggap</string>
     <string name="recipient_no_text">Walang Tatanggap</string>

app/src/main/res/values/strings.xml

@@ -129,16 +129,16 @@
     <string name="exit_confirmation_text">Are you sure want to exit?</string>
     <string name="yes_text">Yes</string>
     <string name="no_text">No</string>
-    <string name="recipient_listing_title_text">Select Recipient</string>
-    <string name="new_recipient_text">New Recipient</string>
-    <string name="edit_delete_hint_ios_text">Swipe left to Edit or Delete recipient profile</string>
-    <string name="edit_delete_hint_android_text">Hold to Edit or Delete recipient profile</string>
+    <string name="recipient_listing_title_text">Select Beneficiary</string>
+    <string name="new_recipient_text">New Beneficiary</string>
+    <string name="edit_delete_hint_ios_text">Swipe left to Edit or Delete beneficiary profile</string>
+    <string name="edit_delete_hint_android_text">Hold to Edit or Delete beneficiary profile</string>
     <string name="delete_text">Delete</string>
     <string name="edit_text">Edit</string>
     <string name="delete_recipient_confirmation_text">Do you want to delete this receipient?</string>
 
-    <string name="add_recipient_text">Add Recipient</string>
-    <string name="edit_recipient_text">Edit Recipient</string>
+    <string name="add_recipient_text">Add Beneficiary</string>
+    <string name="edit_recipient_text">Edit Beneficiary</string>
     <string name="who_to_send_text">Who are you sending money to?</string>
     <string name="placeholder_enter_receiver_firstname_text">Enter receiver\'s first Name</string>
     <string name="enter_receiver_middlename_text">Middle Name (Optional)</string>
@@ -168,7 +168,7 @@
 
     <string name="todays_rate_title_text">Today\'s Rate</string>
     <string name="you_send_text">You Send</string>
-    <string name="recepient_gets_text">Recepient Gets</string>
+    <string name="recepient_gets_text">Beneficiary Gets</string>
     <string name="select_payment_mode_text">Select Payment Mode</string>
     <string name="transfer_fee_included_text">Transfer Fee Included</string>
     <string name="current_exchange_rate_text">Current Exchange Rate</string>
@@ -535,7 +535,7 @@ All the configurations are done from backend web application system which allows
 
     <!--Dynamic Reciever-->
     <string name="recipient_no_text">There are no recipients</string>
-    <string name="recipient_text">Recipient</string>
+    <string name="recipient_text">Beneficiary</string>
 
     <string name="payout_country_text">Payout Country</string>
     <string name="native_country_text">Native Country</string>
@@ -563,7 +563,7 @@ All the configurations are done from backend web application system which allows
     <string name="reason_text">Transfer Reason</string>
 
     <string name="payout_country_placeholder_text">Select Payout Country</string>
-    <string name="native_country_placeholder_text">Select Recipient Native Country</string>
+    <string name="native_country_placeholder_text">Select Beneficiary Native Country</string>
     <string name="payment_mode_placeholder_text">Select Payment Mode</string>
     <string name="bank_placeholder_text">Select Bank</string>
     <string name="branch_placeholder_text">Select Branch</string>
@@ -589,7 +589,7 @@ All the configurations are done from backend web application system which allows
     <string name="optional_hint_text">(Optional)</string>
 
     <string name="recipient_add_success_message_text">Do you want to send money to xxx?</string>
-    <string name="recipient_profile_update_prompt_text">Your recipient information is not up-to-date. Do you want to update it now?</string>
+    <string name="recipient_profile_update_prompt_text">Your beneficiary information is not up-to-date. Do you want to update it now?</string>
     <string name="recipient_bank_update_prompt_text">Your selected bank is not currently available at moment. Please select another bank inorder to proceed.</string>
     <string name="general_length_error_text">Field size must be in between xxx and ooo characters in length</string>
     <string name="min_length_error_text">Field size must be greater than xxx characters in length</string>
@@ -632,14 +632,14 @@ All the configurations are done from backend web application system which allows
     <string name="enter_send_amount_text">Enter Send Amount (KRW)</string>
     <string name="select_korea_bank">Select Mongolia Bank</string>
     <string name="enter_account_text">Enter Account Number</string>
-    <string name="recipient_name_text">Recipient Name</string>
+    <string name="recipient_name_text">Beneficiary Name</string>
     <string name="mobile_optional_text">Mobile Number (optional)</string>
     <string name="enter_mobile_optional_text">Enter Mobile Number (optional)</string>
     <string name="account_balance_button_text">View Account Balance</string>
     <string name="doesnt_have_auto_debit_text">Please register an auto-debit account inorder to use this service.</string>
     <string name="amount_bigger_error_text">Amount bigger than Balance.</string>
     <string name="amount_minimum_error_text">Minimum sending amount should be at least 10,000 KRW</string>
-    <string name="check_recipient_name_text">is recipient correct?</string>
+    <string name="check_recipient_name_text">is beneficiary correct?</string>
     <string name="min_length_account_error_text">Bank Account No. should be at least 9 digits</string>
     <string name="invalid_account_error_text">Invalid bank account number</string>
     <string name="recent_recipients_text">Recent Recipients</string>
@@ -914,7 +914,7 @@ All the configurations are done from backend web application system which allows
     <string name="visa_status_text">Visa Status</string>
     <string name="documents_text">Documents</string>
     <string name="private_text">Private</string>
-    <string name="longPressToEditOrDeleteProf_text">Long press to Edit or Delete recipient profile.</string>
+    <string name="longPressToEditOrDeleteProf_text">Long press to Edit or Delete beneficiary profile.</string>
     <string name="pending_invites_text">Pending Invites</string>
     <string name="refer_text">Refer</string>
     <string name="totalEarned_text">Total Earned</string>
@@ -1013,7 +1013,7 @@ All the configurations are done from backend web application system which allows
     <string name="selectPurposeOfRegistration_text">Select purpose of registration</string>
     <string name="invalidPuropseOfReg_text">Invalid Purpose of Registration</string>
     <string name="agree_and_submit_text">Agree and Submit</string>
-    <string name="jme_terms_n_conditions">1. JME Terms And Conditions</string>
+    <string name="jme_terms_n_conditions"><![CDATA[Terms & Conditions]]></string>
     <string name="send_money_success_header_text">We have received your remittance request for</string>
     <string name="send_money_success_body_text">Please make payment of</string>
     <string name="send_money_success_footer_text">to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number for this transfer.</string>