Merge pull request #171 from jeremiahVaris/sa-bank-integration

Sa bank integration

Author: bolaware

README.md

@@ -60,6 +60,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
                         .acceptUgMobileMoneyPayments(boolean)
                         .acceptZmMobileMoneyPayments(boolean)
                         .acceptRwfMobileMoneyPayments(boolean)
+                        .acceptSaBankPayments(boolean)
                         .acceptUkPayments(boolean)
                         .acceptBankTransferPayments(boolean)
                         .acceptUssdPayments(boolean)
@@ -95,6 +96,7 @@ Set the public key, encryption key and other required parameters. The `RavePayMa
 | acceptUgMobileMoneyPayments(boolean) | Set to `true` if you want to accept Uganda mobile money payments, else set to `false` . For this option to work, you should set your country to `UG` and your currency to `UGX`| `boolean` | Not Required |
 | acceptZmMobileMoneyPayments(boolean) | Set to `true` if you want to accept Zambia mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `ZMW`. `MTN` is the only available network at the moment, see more details in the [API documentation](https://developer.flutterwave.com/reference#zambia-mobile-money).| `boolean` | Not Required |
 | acceptRwfMobileMoneyPayments(boolean) | Set to `true` if you want to accept Rwanda mobile money payments, else set to `false` . For this option to work, you should set your country to `NG` and your currency to `RWF`. See more details in the [API documentation](https://developer.flutterwave.com/reference#rwanda-mobile-money).| `boolean` | Not Required |
+| acceptSaBankPayments(boolean) | Set to `true` if you want to accept South African direct bank account payments, else set to `false` . For this option to work, you should set your country to `ZA` and your currency to `ZAR`.| `boolean` | Not Required |
 | acceptUkPayments(boolean) | Set to `true` if you want to accept UK Bank Account payments, else set to `false` . For this option to work, you should set your country to `NG`, set currency to `GBP`, set accountbank `String`, set accountname `String`, set accountnumber `String`, set is_uk_bank_charge2 `true`, set payment_type `account`. `Please use your live credentials for this` | `boolean` | Not Required |
 | acceptAchPayments(boolean) | Set to `true` if you want to accept US ACH charges from your customers, else set to `false` . For this option to work, you should set your country to `US` and your currency to `USD`. You also have to set `acceptAccountPayments(true)`| `boolean` | Not Required |
 | acceptBankTransferPayments(boolean) | Set to `true` if you want to accept payments via bank transfer from your customers, else set to `false`. This option is currently only available for Nigerian Naira. <br/><br/><strong>Note:</strong> By default, the account numbers generated are dynamic. This method has been overloaded for more options as shown below:<br><ul><li>To generate static (permanent) accounts instead, pass in `true` as a second parameter. E.g. <br/>```acceptBankTransferPayments(true, true)```</li><li>To generate accounts that expire at a certain date, or after a certain number of payments, pass in integer values for `duration` and `frequency` as such: <br/>```acceptBankTransferPayments(true, duration, frequency)``` </li></ul>You can get more details in the [API documentation](https://developer.flutterwave.com/v2.0/reference#pay-with-bank-transfer-nigeria).| `boolean`<br/><br/>Optional overloads:<br/>`boolean`, `boolean`<br/><br/>`boolean`, `int`, `int` | Not Required |

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

@@ -49,6 +49,7 @@ public class MainActivity extends AppCompatActivity {
     SwitchCompat ghMobileMoneySwitch;
     SwitchCompat ugMobileMoneySwitch;
     SwitchCompat ukbankSwitch;
+    SwitchCompat saBankSwitch;
     SwitchCompat francMobileMoneySwitch;
     SwitchCompat rwfMobileMoneySwitch;
     SwitchCompat zmMobileMoneySwitch;
@@ -100,6 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ghMobileMoneySwitch = findViewById(R.id.accountGHMobileMoneySwitch);
         ugMobileMoneySwitch = findViewById(R.id.accountUgMobileMoneySwitch);
         ukbankSwitch = findViewById(R.id.accountUkbankSwitch);
+        saBankSwitch = findViewById(R.id.accountSaBankSwitch);
         francMobileMoneySwitch = findViewById(R.id.accountfrancMobileMoneySwitch);
         zmMobileMoneySwitch = findViewById(R.id.accountZmMobileMoneySwitch);
         rwfMobileMoneySwitch = findViewById(R.id.accountRwfMobileMoneySwitch);
@@ -288,6 +290,7 @@ private void validateEntries() {
                     .acceptZmMobileMoneyPayments(zmMobileMoneySwitch.isChecked())
                     .acceptRwfMobileMoneyPayments(rwfMobileMoneySwitch.isChecked())
                     .acceptUkPayments(ukbankSwitch.isChecked())
+                    .acceptSaBankPayments(saBankSwitch.isChecked())
                     .acceptFrancMobileMoneyPayments(francMobileMoneySwitch.isChecked())
                     .acceptBankTransferPayments(bankTransferSwitch.isChecked())
                     .acceptUssdPayments(ussdSwitch.isChecked())

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

@@ -233,6 +233,15 @@
                 android:checked="false"
                 android:text="@string/uk_bank" />
 
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/accountSaBankSwitch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:checked="false"
+                android:text="@string/sa_bank" />
+
+
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/cardPaymentSwitch"
                 android:layout_width="match_parent"

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

@@ -17,6 +17,7 @@
     <string name="encryption_key">Encryption key</string>
     <string name="francophone">Accept Franc Mobile Money Payments</string>
     <string name="uk_bank">Accept UK Bank Payments</string>
+    <string name="sa_bank">Accept South Africa Bank Payments</string>
     <string name="live">Live</string>
     <string name="bank_transfer">Accept Bank Transfer Payments</string>
     <string name="zambia">Accept ZM Mobile money payments</string>

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

@@ -430,6 +430,16 @@ public void setIs_mobile_money_franco(boolean is_mobile_money_franco) {
         this.is_mobile_money_franco = is_mobile_money_franco;
     }
 
+    private String is_sa_call_pay;
+
+    public void setIs_sa_call_pay(String is_sa_call_pay){
+        this.is_sa_call_pay = is_sa_call_pay;
+    }
+
+    private String getIs_sa_call_pay(){
+        return is_sa_call_pay;
+    }
+
     public String getPhonenumber() {
         return phonenumber;
     }

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

@@ -300,6 +300,19 @@ public Payload createUKPayload() {
         return payload;
     }
 
+
+    public Payload createSaBankAccountPayload() {
+        List<Meta> metaObj = Utils.pojofyMetaString(meta);
+        List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);
+        Payload payload = new Payload(phonenumber, metaObj, subaccountsObj, narration, ip, lastname,
+                firstname, currency, country, amount, email, device_fingerprint, txRef, pbfPubKey);
+        payload.setPayment_type("account");
+        payload.setIs_sa_call_pay("1");
+        payload.setAccountnumber("00000");
+        payload.setAccountbank("093");
+        return payload;
+    }
+
     public Payload createBarterPayload() {
         List<Meta> metaObj = Utils.pojofyMetaString(meta);
         List<SubAccount> subaccountsObj = Utils.pojofySubaccountString(subAccounts);

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

@@ -9,6 +9,7 @@
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_GH_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_MPESA;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_RW_MOBILE_MONEY;
+import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_SA_BANK_ACCOUNT;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UG_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UK;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_USSD;
@@ -65,6 +66,10 @@ public ArrayList<Integer> applyCurrencyChecks(
                     if (acceptedCurrency.equalsIgnoreCase("GBP"))
                         currencyCheckedPaymentTypesList.add(orderedPaymentTypesList.get(index));
                     break;
+                case PAYMENT_TYPE_SA_BANK_ACCOUNT:
+                    if (acceptedCurrency.equalsIgnoreCase("ZAR"))
+                        currencyCheckedPaymentTypesList.add(orderedPaymentTypesList.get(index));
+                    break;
                 default:
                     currencyCheckedPaymentTypesList.add(orderedPaymentTypesList.get(index));
             }

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

@@ -63,6 +63,7 @@ public class RaveConstants {
     public static String invalidBvnMessage = "Enter a valid BVN";
     public static String invalidBankCodeMessage = "You need to select bank";
     public static String defaultAccounNumber = "0000000000";
+    public static String inValidRedirectUrl = "Invalid redirect url returned";
 
     public static String response = "response";
     public static String mtn = "mtn";
@@ -125,6 +126,7 @@ public class RaveConstants {
     public static final int PAYMENT_TYPE_USSD = 111;
     public static final int PAYMENT_TYPE_FRANCO_MOBILE_MONEY = 112;
     public static final int PAYMENT_TYPE_BARTER = 113;
+    public static final int PAYMENT_TYPE_SA_BANK_ACCOUNT = 114;
 
     public static HashMap<Integer, String> paymentTypesNamesList = new HashMap<Integer, String>() {{
         put(PAYMENT_TYPE_CARD, "Card");
@@ -140,6 +142,7 @@ public class RaveConstants {
         put(PAYMENT_TYPE_UK, "UK Bank Account");
         put(PAYMENT_TYPE_BARTER, "Barter");
         put(PAYMENT_TYPE_USSD, "USSD");
+        put(PAYMENT_TYPE_SA_BANK_ACCOUNT, "South Africa Bank Account");
     }};
 
 

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

@@ -41,6 +41,7 @@
 import com.flutterwave.raveandroid.ghmobilemoney.GhMobileMoneyFragment;
 import com.flutterwave.raveandroid.mpesa.MpesaFragment;
 import com.flutterwave.raveandroid.rwfmobilemoney.RwfMobileMoneyFragment;
+import com.flutterwave.raveandroid.sabankaccount.SaBankAccountFragment;
 import com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyFragment;
 import com.flutterwave.raveandroid.uk.UkFragment;
 import com.flutterwave.raveandroid.ussd.UssdFragment;
@@ -64,6 +65,7 @@
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_GH_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_MPESA;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_RW_MOBILE_MONEY;
+import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_SA_BANK_ACCOUNT;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UG_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UK;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_USSD;
@@ -434,6 +436,9 @@ private void addFragmentToLayout(PaymentTile foundPaymentTile) {
             case PAYMENT_TYPE_ZM_MOBILE_MONEY:
                 transaction.replace(R.id.payment_fragment_container, new ZmMobileMoneyFragment());
                 break;
+            case PAYMENT_TYPE_SA_BANK_ACCOUNT:
+                transaction.replace(R.id.payment_fragment_container, new SaBankAccountFragment());
+                break;
             default:
                 Log.d("Adding Payment Fragment", "Payment type does not exist in payment types list");
                 render();// Show default view

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

@@ -26,6 +26,7 @@
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_GH_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_MPESA;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_RW_MOBILE_MONEY;
+import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_SA_BANK_ACCOUNT;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UG_MOBILE_MONEY;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_UK;
 import static com.flutterwave.raveandroid.RaveConstants.PAYMENT_TYPE_USSD;
@@ -149,6 +150,12 @@ public RavePayManager acceptUkPayments(boolean withUk) {
         return this;
     }
 
+    public RavePayManager acceptSaBankPayments(boolean withSaBankAccount) {
+        if (!orderedPaymentTypesList.contains(PAYMENT_TYPE_SA_BANK_ACCOUNT) && withSaBankAccount)
+            orderedPaymentTypesList.add(PAYMENT_TYPE_SA_BANK_ACCOUNT);
+        return this;
+    }
+
     public RavePayManager acceptFrancMobileMoneyPayments(boolean withFrancMobileMoney) {
         if (!orderedPaymentTypesList.contains(PAYMENT_TYPE_FRANCO_MOBILE_MONEY) && withFrancMobileMoney)
             orderedPaymentTypesList.add(PAYMENT_TYPE_FRANCO_MOBILE_MONEY);