integrate ach payments

Author: biodunalfet

app/src/main/java/com/flutterwave/rave_android/MainActivity.java

@@ -46,6 +46,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat ghMobileMoneySwitch;
     SwitchCompat isLiveSwitch;
     SwitchCompat isMpesaSwitch;
+    SwitchCompat accountAchSwitch;
     SwitchCompat addSubAccountsSwitch;
     SwitchCompat isPreAuthSwitch;
     List<Meta> meta = new ArrayList<>();
@@ -71,6 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
         startPayBtn = findViewById(R.id.startPaymentBtn);
         cardSwitch = findViewById(R.id.cardPaymentSwitch);
         accountSwitch = findViewById(R.id.accountPaymentSwitch);
+        accountAchSwitch = findViewById(R.id.accountAchSwitch);
         isMpesaSwitch = findViewById(R.id.accountMpesaSwitch);
         isPreAuthSwitch = findViewById(R.id.isPreAuthSwitch);
         ghMobileMoneySwitch = findViewById(R.id.accountGHMobileMoneySwitch);
@@ -192,6 +194,7 @@ private void validateEntries() {
                     .acceptMpesaPayments(isMpesaSwitch.isChecked())
                     .acceptAccountPayments(accountSwitch.isChecked())
                     .acceptCardPayments(cardSwitch.isChecked())
+                    .acceptAchPayments(accountAchSwitch.isChecked())
                     .acceptGHMobileMoneyPayments(ghMobileMoneySwitch.isChecked())
                     .onStagingEnv(!isLiveSwitch.isChecked())
                     .setSubAccounts(subAccounts)

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

@@ -48,6 +48,15 @@
                     android:id="@+id/accountMpesaSwitch"
                     />
 
+                <android.support.v7.widget.SwitchCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="Accept ACH payments"
+                    android:checked="false"
+                    android:id="@+id/accountAchSwitch"
+                    />
+
                 <android.support.v7.widget.SwitchCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

raveandroid/src/main/java/com/flutterwave/raveandroid/Payload.java

@@ -18,6 +18,8 @@ public String getCardBIN() {
 
     private String cardBIN;
 
+    private boolean is_us_bank_charge;
+
     private String remember_device_mobile_key;
 
     private String remember_device_email;
@@ -224,7 +226,7 @@ public Payload(String phonenumber,
 
     public Payload(List<Meta> meta, List<SubAccount> subaccounts, String narration, String IP, String accountnumber, String accountbank,
                    String lastname, String firstname, String currency, String country, String amount,
-                   String email, String device_fingerprint, String txRef, String PBFPubKey,String bvn) {
+                   String email, String device_fingerprint, String txRef, String PBFPubKey, String bvn, boolean is_us_bank_charge) {
         this.meta = meta;
         this.subaccounts = subaccounts;
         this.narration = narration;
@@ -241,6 +243,7 @@ public Payload(List<Meta> meta, List<SubAccount> subaccounts, String narration,
         this.txRef = txRef;
         this.PBFPubKey = PBFPubKey;
         this.bvn = bvn;
+        this.is_us_bank_charge = is_us_bank_charge;
 
         if (meta == null) {
             meta = new ArrayList<>();
@@ -591,5 +594,13 @@ public void setVoucher(String voucher) {
     public void setIs_mobile_money_gh(String is_mobile_money_gh) {
         this.is_mobile_money_gh = is_mobile_money_gh;
     }
+
+    public boolean isIs_us_bank_charge() {
+        return is_us_bank_charge;
+    }
+
+    public void setIs_us_bank_charge(boolean is_us_bank_charge) {
+        this.is_us_bank_charge = is_us_bank_charge;
+    }
 }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/PayloadBuilder.java

@@ -23,6 +23,7 @@ public class PayloadBuilder {
     private String bvn;
     private String voucher;
     private boolean isPreAuth = false;
+    private boolean is_us_bank_charge = false;
 
     public PayloadBuilder setIs_mobile_money_gh(String is_mobile_money_gh) {
         this.is_mobile_money_gh = is_mobile_money_gh;
@@ -103,6 +104,11 @@ public PayloadBuilder setIsPreAuth(boolean isPreAuth){
         return this;
     }
 
+    public PayloadBuilder setIsUsBankCharge(boolean is_us_bank_charge){
+        this.is_us_bank_charge = is_us_bank_charge;
+        return this;
+    }
+
     public PayloadBuilder setCurrency(String currency) {
         this.currency = currency;
         return this;
@@ -184,7 +190,7 @@ public Payload createBankPayload() {
         List<Meta> metaObj = Utils.pojofyMetaString(meta);
         List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);
         Payload payload = new Payload(metaObj, subaccountsObj,narration, ip, accountnumber, accountbank, lastname,
-                firstname, currency, country, amount, email, device_fingerprint, txRef, pbfPubKey,bvn);
+                firstname, currency, country, amount, email, device_fingerprint, txRef, pbfPubKey,bvn, is_us_bank_charge);
         payload.setPayment_type("account");
 
         return payload;

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java

@@ -20,6 +20,7 @@
 import android.widget.RelativeLayout;
 
 import com.flutterwave.raveandroid.account.AccountFragment;
+import com.flutterwave.raveandroid.ach.AchFragment;
 import com.flutterwave.raveandroid.card.CardFragment;
 import com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment;
 import com.flutterwave.raveandroid.mpesa.MpesaFragment;
@@ -96,7 +97,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         if (ravePayInitializer.isWithAccount()) {
-            raveFragments.add(new RaveFragment(new AccountFragment(), "Account"));
+            if (ravePayInitializer.getCountry().equalsIgnoreCase("us") && ravePayInitializer.getCurrency().equalsIgnoreCase("usd")) {
+                raveFragments.add(new RaveFragment(new AchFragment(), "ACH"));
+            }
+            else if (ravePayInitializer.getCountry().equalsIgnoreCase("ng") && ravePayInitializer.getCurrency().equalsIgnoreCase("ngn")){
+                raveFragments.add(new RaveFragment(new AccountFragment(), "Account"));
+            }
         }
 
         if (ravePayInitializer.isWithMpesa()) {

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java

@@ -23,6 +23,7 @@ public class RavePayInitializer {
     String meta;
     String subAccounts;
     String payment_plan;
+    boolean withAch = false;
     boolean withMpesa = false;
     boolean withCard = true;
     boolean withAccount = true;
@@ -35,7 +36,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
                               String currency, String country, String fName,
                               String lName, boolean withCard,
-                              boolean withAccount, boolean withMpesa, boolean withGHMobileMoney, int theme,
+                              boolean withAccount, boolean withMpesa, boolean withGHMobileMoney, boolean withAch, int theme,
                               boolean staging, String meta, String subAccounts, String payment_plan, boolean isPreAuth) {
         this.email = email;
         this.amount = amount;
@@ -51,6 +52,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.withGHMobileMoney = withGHMobileMoney;
         this.withMpesa = withMpesa;
         this.withCard = withCard;
+        this.withAch = withAch;
         this.theme = theme;
         this.staging = staging;
         this.meta = meta;
@@ -118,6 +120,12 @@ public boolean isWithCard() {
         return withCard;
     }
 
+    public boolean isWithAch() { return withAch; }
+
+    public void setWithAch(boolean withAch) {
+        this.withAch = withAch;
+    }
+
     public void setWithCard(boolean withCard) {
         this.withCard = withCard;
     }

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayManager.java

@@ -31,6 +31,7 @@ public class RavePayManager {
     private Activity activity;
     boolean withCard = true;
     boolean withAccount = true;
+    boolean withAch = false;
     boolean withMpesa = false;
     boolean withGHMobileMoney = false;
     private int theme = R.style.DefaultTheme;
@@ -57,6 +58,11 @@ public RavePayManager(Activity activity) {
         this.activity = activity;
     }
 
+    public RavePayManager acceptAchPayments(boolean withAch) {
+        this.withAch = withAch;
+        return this;
+    }
+
     public RavePayManager acceptCardPayments(boolean withCard) {
         this.withCard = withCard;
         return this;
@@ -163,6 +169,6 @@ public void initialize() {
     }
 
     public RavePayInitializer createRavePayInitializer() {
-        return new RavePayInitializer(email, amount, publicKey, encryptionKey, txRef, narration, currency, country, fName, lName, withCard, withAccount, withMpesa, withGHMobileMoney, theme, staging, meta, subAccounts, payment_plan, isPreAuth);
+        return new RavePayInitializer(email, amount, publicKey, encryptionKey, txRef, narration, currency, country, fName, lName, withCard, withAccount, withMpesa, withGHMobileMoney, withAch, theme, staging, meta, subAccounts, payment_plan, isPreAuth);
        }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchContract.java

@@ -0,0 +1,43 @@
+package com.flutterwave.raveandroid.ach;
+
+import com.flutterwave.raveandroid.Payload;
+import com.flutterwave.raveandroid.RavePayInitializer;
+import com.flutterwave.raveandroid.responses.RequeryResponse;
+
+public interface AchContract {
+
+    interface View {
+        void showProgressIndicator(boolean active);
+
+        void showAmountField(boolean active);
+
+        void showRedirectMessage(boolean b);
+
+        void onPaymentError(String message);
+
+        void showWebView(String authUrl, String flwRef);
+
+        void onRequerySuccessful(RequeryResponse response, String responseAsJSONString, String flwRef);
+
+        void onPaymentFailed(String message, String responseAsJSONString);
+
+        void onPaymentSuccessful(String status, String flwRef, String responseAsJSONString);
+
+        void showAmountError(String msg);
+
+        void showFee(String authUrl, String flwRef, String chargedAmount, String currency);
+    }
+
+    interface UserActionsListener {
+        void onStartAchPayment(RavePayInitializer ravePayInitializer);
+
+        void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount);
+
+        void chargeAccount(Payload payload, String encryptionKey);
+
+        void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);
+
+        void onFeeConfirmed(String authUrl, String flwRef);
+    }
+
+}