Merge pull request #254 from mikelis135/checkCardAllowed

check card country not currency

Author: jeremiahAI

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

@@ -25,6 +25,7 @@ public class RavePayInitializer {
     String narration;
     String currency;
     String country;
+    String barterCountry;
     String fName;
     String lName;
     String meta;
@@ -41,7 +42,7 @@ public class RavePayInitializer {
 
     public RavePayInitializer(String email, double amount, String publicKey,
                               String encryptionKey, String txRef, String narration,
-                              String currency, String country, String fName,
+                              String currency, String country, String barterCountry, String fName,
                               String lName, int theme, String phoneNumber,
                               boolean isPhoneEditable, boolean saveCardFeatureAllowed, boolean usePhoneAndEmailSuppliedToSaveCards,
                               boolean isPermanent, int duration, int frequency,
@@ -55,6 +56,7 @@ public RavePayInitializer(String email, double amount, String publicKey,
         this.narration = narration;
         this.currency = currency;
         this.country = country;
+        this.barterCountry = barterCountry;
         this.fName = fName;
         this.lName = lName;
         this.isPermanent = isPermanent;
@@ -184,6 +186,14 @@ public void setCountry(String country) {
         this.country = country;
     }
 
+    public String getBarterCountry() {
+        return barterCountry;
+    }
+
+    public void setBarterCountry(String barterCountry) {
+        this.barterCountry = barterCountry;
+    }
+
     public String getfName() {
         return fName;
     }

rave_android/src/main/java/com/flutterwave/raveandroid/RaveUiManager.java

@@ -128,12 +128,16 @@ public RaveUiManager setCurrency(String currency) {
         return this;
     }
 
-    @Deprecated
     public RaveUiManager setCountry(String country) {
         this.country = country;
         return this;
     }
 
+    public RaveUiManager setBarterCountry(String barterCountry) {
+        this.barterCountry = barterCountry;
+        return this;
+    }
+
     public RaveUiManager setfName(String fName) {
         this.fName = fName;
         return this;
@@ -348,6 +352,7 @@ private RavePayInitializer createRavePayInitializer() {
                 getNarration(),
                 getCurrency(),
                 getCountry(),
+                getBarterCountry(),
                 getfName(),
                 getlName(),
                 theme,

rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java

@@ -239,7 +239,7 @@ public void processTransaction(HashMap<String, ViewObject> dataHashMap, RavePayI
             Payload body = builder.createPayload();
 
             if (ravePayInitializer.getNarration().equalsIgnoreCase("barterRavePay")){
-                checkCard(cardFirstSix, body, ravePayInitializer.getIsDisplayFee(), ravePayInitializer.getEncryptionKey());
+                checkCard(cardFirstSix, body, ravePayInitializer.getIsDisplayFee(), ravePayInitializer.getEncryptionKey(), ravePayInitializer.getBarterCountry());
             }else{
                 if (ravePayInitializer.getIsDisplayFee()) {
                     fetchFee(body);
@@ -287,8 +287,8 @@ public void processSavedCardTransaction(SavedCard savedCard, RavePayInitializer
                 cardFirstSix = savedCard.getMasked_pan().substring(0, 6);
             }
 
-            if (ravePayInitializer.getNarration().equalsIgnoreCase("barterRavePay")){
-                checkCard(cardFirstSix, body, ravePayInitializer.getIsDisplayFee(), ravePayInitializer.getEncryptionKey());
+            if (ravePayInitializer.getBarterCountry()!= null){
+                checkCard(cardFirstSix, body, ravePayInitializer.getIsDisplayFee(), ravePayInitializer.getEncryptionKey(), ravePayInitializer.getBarterCountry());
             }else{
                 if (ravePayInitializer.getIsDisplayFee()) {
                     fetchFee(body);

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

@@ -9,6 +9,7 @@ abstract public class RavePayManager  {
     protected String narration = "";
     protected String currency = "NGN";
     protected String country = "NG";
+    protected String barterCountry = "NG";
     protected String fName = "";
     protected String lName = "";
     protected String meta = "";
@@ -57,6 +58,10 @@ public String getCountry() {
         return country;
     }
 
+    public String getBarterCountry() {
+        return barterCountry;
+    }
+
     public String getfName() {
         return fName;
     }

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/card/CardContract.java

@@ -161,7 +161,7 @@ interface CardPaymentHandler {
 
         void chargeCard(Payload payload, String encryptionKey);
 
-        void checkCard(String cardFirstSix, Payload body, Boolean isDisplayFee, String encryptionKey);
+        void checkCard(String cardFirstSix, Payload body, Boolean isDisplayFee, String encryptionKey, String barterCountry);
 
         void validateCardCharge(String flwRef, String otp, String publicKey);
 

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/card/CardPaymentHandler.java

@@ -189,7 +189,7 @@ public void onError(String message) {
     }
 
     @Override
-    public void checkCard(String cardFirstSix, final Payload body, final Boolean isDisplayFee, final String encryptionKey) {
+    public void checkCard(String cardFirstSix, final Payload body, final Boolean isDisplayFee, final String encryptionKey, final String barterCountry) {
 
         mCardInteractor.showProgressIndicator(true);
 
@@ -198,8 +198,8 @@ public void checkCard(String cardFirstSix, final Payload body, final Boolean isD
             public void onSuccess(CheckCardResponse response) {
                 mCardInteractor.showProgressIndicator(false);
 
-                if (response != null && response.getCountry() != null && response.getCountry().getCurrency() != null) {
-                    if (response.getCountry().getCurrency().equalsIgnoreCase(body.getCurrency())) {
+                if (response != null && response.getCountry() != null && response.getCountry().getAlpha2() != null) {
+                    if (response.getCountry().getAlpha2().equalsIgnoreCase(barterCountry)) {
                         continueCharge( isDisplayFee,  body,  encryptionKey);
                     } else {
                         mCardInteractor.onPaymentError(cardNotAllowed);

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/CheckCardResponse.java

@@ -111,6 +111,14 @@ public String getCurrency() {
         public void setCurrency(@Nullable String currency) {
             this.currency = currency;
         }
+
+        public String getAlpha2() {
+            return alpha2;
+        }
+
+        public void setAlpha2(String alpha2) {
+            this.alpha2 = alpha2;
+        }
     }
 
 }