Merge pull request #78 from Corvus97/master

fixed bug with mobile-money-uganda

Author: corneliusyaovi

rave_python/rave_francophone.py

@@ -11,26 +11,35 @@ def __init__(self, publicKey, secretKey, production, usingEnv):
 
 
     # returns true if further action is required, false if it isn't    
-    def _handleChargeResponse(self, response, txRef, request=None):
-        """ This handles charge responses """
-        res =  self._preliminaryResponseChecks(response, MobileChargeError, txRef=txRef)
-
-        responseJson = res["json"]
-        flwRef = res["flwRef"]
-
-        # Checking if there is redirect url
-        if responseJson["data"]["data"].get("redirect_url", "N/A") == "N/A":
-            redirectUrl = None
-        else:
-            redirectUrl = responseJson["data"]["data"]["redirect_url"]
-
-        # If all preliminary checks passed
-        if not (responseJson["data"].get("chargeResponseCode", None) == "00"):
-            # Otherwise we return that further action is required, along with the response
-            suggestedAuth = responseJson["data"].get("suggested_auth", None)
-            return {"error": False,  "validationRequired": True, "txRef": txRef, "flwRef": flwRef, "suggestedAuth": suggestedAuth, "redirectUrl": redirectUrl}
-        else:
-            return {"error": False, "status": responseJson["status"],  "validationRequired": False, "txRef": txRef, "flwRef": flwRef, "suggestedAuth": None, "redirectUrl": redirectUrl}
+    # def _handleChargeResponse(self, response, txRef, request=None):
+    #     """ This handles charge responses """
+    #     res =  self._preliminaryResponseChecks(response, MobileChargeError, txRef=txRef)
+
+    #     responseJson = res["json"]
+    #     flwRef = res["flwRef"]
+
+    #     # Checking if there is redirect url
+
+    #     if responseJson["data"]["data"].get("redirect_url", "N/A") == "N/A":
+    #         redirectUrl = None
+    #     else:
+    #         redirectUrl = responseJson["data"]["data"]["redirect_url"]
+
+    #     # If all preliminary checks passed
+    #     if not (responseJson["data"].get("chargeResponseCode", None) == "00"):
+    #         # Otherwise we return that further action is required, along with the response
+    #         # suggestedAuth = responseJson["data"].get("suggested_auth", None)
+    #         return {
+    #                     "error": False, 
+    #                     "status": responseJson["status"],  
+    #                     "message": responseJson["message"],
+    #                     "code": responseJson["data"]["code"],
+    #                     "transaction status": responseJson["data"]["status"],
+    #                     "ts": responseJson["data"]["ts"],
+    #                     "link": responseJson["data"]["link"]
+    #                 }
+    #     else:
+    #         return {"error": False, "status": responseJson["status"],  "validationRequired": False, "txRef": txRef, "flwRef": flwRef, "suggestedAuth": None, "redirectUrl": redirectUrl}
 
     # Charge mobile money function
     def charge(self, accountDetails, hasFailed=False):
@@ -42,7 +51,7 @@ def charge(self, accountDetails, hasFailed=False):
 
         endpoint = self._baseUrl + self._endpointMap["account"]["charge"]
         # It is faster to add boilerplate than to check if each one is present
-        accountDetails.update({"payment_type": "mobilemoneyfrancophone", "is_mobile_money_franco":"1", "currency":"XOF"})
+        accountDetails.update({"payment_type": "mobilemoneyfrancophone", "is_mobile_money_franco":"1"})
 
         # If transaction reference is not set 
         if not ("txRef" in accountDetails):
@@ -51,5 +60,6 @@ def charge(self, accountDetails, hasFailed=False):
         if not ("orderRef" in accountDetails):
             accountDetails.update({"orderRef": generateTransactionReference()})
         # Checking for required account components
-        requiredParameters = ["amount", "email", "phonenumber", "IP", "redirect_url"]
+        # requiredParameters = ["amount", "email", "phonenumber", "IP", "redirect_url"]
+        requiredParameters = ["amount"]
         return super(Francophone, self).charge(accountDetails, requiredParameters, endpoint)

rave_python/rave_payment.py

@@ -68,6 +68,7 @@ def _handleChargeResponse(self, response, txRef, request=None, isMpesa=False):
         # If we cannot parse the json, it means there is a server error
         res = self._preliminaryResponseChecks(response, TransactionChargeError, txRef=txRef)
 
+        
         responseJson = res["json"]
 
         if isMpesa:

rave_python/rave_preauth.py

@@ -32,7 +32,7 @@ def charge(self, cardDetails, chargeWithToken=False, hasFailed=False):
 
 
     # capture payment
-    def capture(self, flwRef):
+    def capture(self, flwRef ):
         """ This is called to complete the transaction.\n
              Parameters include:
             flwRef (string) -- This is the flutterwave reference you receive from action["flwRef"]

rave_python/rave_ugmobile.py

@@ -27,6 +27,6 @@ def charge(self, accountDetails, hasFailed=False):
         if not ("orderRef" in accountDetails):
             accountDetails.update({"orderRef": generateTransactionReference()})
         # Checking for required account components
-        requiredParameters = ["amount", "email", "phonenumber", "network", "IP", "redirect_url"]
+        requiredParameters = ["amount", "email", "phonenumber", "network", "IP"]
         return super(UGMobile, self).charge(accountDetails, requiredParameters, endpoint)
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="rave_python",
-    version="1.0.1",
+    version="1.2.2",
     author="Flutterwave",
     author_email="[email protected]",
     description="Official Rave Python Wrapper By Flutterwave",

virtualCardTest.py

@@ -1,25 +1,33 @@
 from rave_python import Rave, RaveExceptions, Misc
 
 
-rave = Rave("FLWPUBK_TEST-********************************-X", "FLWSECK_TEST-********************************-X", production = False, usingEnv = False)
-
-# payload = {
-#     "currency": "NGN",
-# 	"amount": "100",
-# 	"billing_name": "Blessed Yahaya",
-# 	"billing_address": "8, Providence Street",
-# 	"billing_city": "Lekki",
-# 	"billing_state": "Lagos",
-# 	"billing_postal_code": "100001",
-# 	"billing_country": "NG",
-# }
+rave = Rave("FLWPUBK-94ac45ac8778fc8c6942eeaec7fdeb5d-X", "FLWSECK-3c90d25b67063699bdd1688caa14b56c-X", production = True, usingEnv = False)
+
+payload = {
+  "PBFPubKey": "FLWPUBK-94ac45ac8778fc8c6942eeaec7fdeb5d-X",
+  "currency": "UGX",
+  "payment_type": "mobilemoneyuganda",
+  "country": "NG",
+  "amount": "50",
+  "email": "[email protected]",
+  "phonenumber": "054709929220",
+  "network": "UGX",
+  "firstname": "Cornelius",
+  "lastname": "Ashley",
+  "IP": "355426087298442",
+  "txRef": "MC-02",
+  "orderRef": "MC_03",
+  "device_fingerprint": "69e6b7f0b72037aa8428b70fbe03986c"
+}
 
 try:
-	res = rave.VirtualCard.allCards()
+	res = rave.UGMobile.charge(payload)
 	print(res)
 
 except RaveExceptions.IncompleteCardDetailsError as e:
     print(e)
 
 except RaveExceptions.ServerError as e:
     print(e.err)
+
+