diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 85a3fdad..31d469c9 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 864fdb05..2287286a 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 3848881c..e9261433 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,8 @@ android { manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.uat.fileprovider" applicationIdSuffix ".uat" signingConfig signingConfigs.debug - buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"' +// buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"' + buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5029/api/"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' debuggable true minifyEnabled false diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index ed9bdbde..ff151b9d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -404,12 +404,12 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra if(action) { withdrawView.setVisibility(View.VISIBLE); manageAccountDivider.setVisibility(View.VISIBLE); - manageAccountViewGroup.setVisibility(View.VISIBLE); +// manageAccountViewGroup.setVisibility(View.VISIBLE); } else { withdrawView.setVisibility(View.INVISIBLE); manageAccountDivider.setVisibility(View.GONE); - manageAccountViewGroup.setVisibility(View.GONE); +// manageAccountViewGroup.setVisibility(View.GONE); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java index 6c08dc12..11ef50e2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientlisting/RecipientListingV2Activity.java @@ -166,9 +166,19 @@ public class RecipientListingV2Activity extends BaseActivity implements Recipien @Override public void onRecipientSelected(RecipientInfoModel recipientInfoModel) { + this.recipientListingV2PresenterInterface.saveSelectedRecipientInfomation(recipientInfoModel); + //Proceed to send money - this.recipientListingV2PresenterInterface.saveSelectedRecipientInfomation(recipientInfoModel); - this.recipientListingV2PresenterInterface.getAllAutoDebitAccounts(); +// this.recipientListingV2PresenterInterface.getAllAutoDebitAccounts(); + + //TODO payment through wallet only + AutoDebitAccount selectedAccount=new AutoDebitAccount(); + selectedAccount.setType("Wallet"); + selectedAccount.setKftcAccountId(""); + SendMoneyRequiredData sendMoneyRequiredData=recipientListingV2PresenterInterface.getSendMoneyRequiredData(selectedAccount); + Intent intent = new Intent(RecipientListingV2Activity.this, SendMoneyV2Activity.class); + intent.putExtra(RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY, sendMoneyRequiredData); + startActivity(intent); } diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 0e855a23..ea37b2c3 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1,5 +1,5 @@ - + लग इन नयाँ युजर बिना झनझट आफ्नो मान्छेलाई पैसा पठाउनुहोस diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 507603d5..f9ecaad9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -357,6 +357,8 @@ Success OUT We are there to help you \n(Available time 10:00AM - 12:00AM) + State/Province + District