added verify method to MoMo superclasses and enabled meta in verify response

Author: corneliusyaovi

rave_python/rave_bills.py

@@ -57,7 +57,7 @@ def create(self, details):
             tracking_payload = {
                 "publicKey": self._getPublicKey(),
                 "language": "Python v2", 
-                "version": "1.2.10", 
+                "version": "1.2.12", 
                 "title": "Create-Bills-error", 
                 "message": responseTime
                 }
@@ -68,7 +68,7 @@ def create(self, details):
             tracking_payload = {
                 "publicKey": self._getPublicKey(),
                 "language": "Python v2", 
-                "version": "1.2.10", 
+                "version": "1.2.12", 
                 "title": "Create-Bills", 
                 "message": responseTime
                 }

rave_python/rave_francophone.py

@@ -9,37 +9,6 @@ class Francophone(Payment):
     def __init__(self, publicKey, secretKey, production, usingEnv):
         super(Francophone, self).__init__(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, 
-    #                     "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):
@@ -49,7 +18,7 @@ def charge(self, accountDetails, hasFailed=False):
             hasFailed (boolean) -- This is a flag to determine if the attempt had previously failed due to a timeout\n
         """
 
-        feature_name = "Initiate-Francophone-mobile-money-charge"
+        feature_name = "Francophone-MoMo-charge"
         endpoint = self._baseUrl + self._endpointMap["account"]["charge"]
 
         # It is faster to add boilerplate than to check if each one is present
@@ -69,6 +38,12 @@ def charge(self, accountDetails, hasFailed=False):
         return super(Francophone, self).charge(feature_name, accountDetails, requiredParameters, endpoint)
 
     def refund(self, flwRef, amount):
-        feature_name = "Francophone-charge-refund"
+        feature_name = "Francophone-MoMo-refund"
         endpoint = self._baseUrl + self._endpointMap["refund"]
         return super(Francophone, self).refund(feature_name, flwRef, amount)
+
+    def verify(self, txRef):
+        feature_name = "Francophone-MoMo-verify"
+        endpoint = self._baseUrl + self._endpointMap["verify"]
+        return super(Francophone, self).verify(feature_name, txRef)
+

rave_python/rave_ghmobile.py

@@ -18,7 +18,7 @@ def charge(self, accountDetails, hasFailed=False):
         """
 
         endpoint = self._baseUrl + self._endpointMap["account"]["charge"]
-        feature_name = "Initiate-Ghana-mobile-money-charge"
+        feature_name = "Ghana-MoMo-charge"
 
         # It is faster to add boilerplate than to check if each one is present
         accountDetails.update({"payment_type": "mobilemoneygh", "country":"GH", "is_mobile_money_gh":"1", "currency":"GHS"})
@@ -36,7 +36,12 @@ def charge(self, accountDetails, hasFailed=False):
         return super(GhMobile, self).charge(feature_name, accountDetails, requiredParameters, endpoint)
 
     def refund(self, flwRef, amount):
-        feature_name = "Ghana-mobile-money-charge-refund"
+        feature_name = "Ghana-MoMo-refund"
         endpoint = self._baseUrl + self._endpointMap["refund"]
         return super(GhMobile, self).refund(feature_name, flwRef, amount)
 
+    def verify(self, txRef):
+        feature_name = "Ghana-MoMo-verify"
+        endpoint = self._baseUrl + self._endpointMap["verify"]
+        return super(GhMobile, self).verify(feature_name, txRef)
+

rave_python/rave_mpesa.py

@@ -18,7 +18,7 @@ def charge(self, accountDetails, hasFailed=False):
         """
         ## feature logic
         # Setting the endpoint
-        feature_name = "Initiate-Mpesa-charge"
+        feature_name = "Mpesa-charge"
         endpoint = self._baseUrl + self._endpointMap["account"]["charge"]
 
         # Adding boilerplate mpesa requirements
@@ -38,11 +38,11 @@ def charge(self, accountDetails, hasFailed=False):
         return res
 
     def verify(self, txRef):
-        feature_name = "Verify-Mpesa_charge"
+        feature_name = "Verify-Mpesa"
         endpoint = self._baseUrl + self._endpointMap["account"]["verify"]
         return super(Mpesa, self).verify(feature_name, txRef, endpoint)
 
     def refund(self, flwRef, amount):
-        feature_name = "Mpesa-charge-refund"
+        feature_name = "Mpesa-refund"
         endpoint = self._baseUrl + self._endpointMap["account"]["refund"]
         return super(Mpesa, self).refund(feature_name, flwRef, amount)

rave_python/rave_payment.py

@@ -15,7 +15,8 @@
     "acctmessage": "",
     "currency": "",
     "chargedamount": 00,
-    "chargemessage": ""
+    "chargemessage": "",
+    "meta": ""
 }
 
 # All payment subclasses are encrypted classes
@@ -78,7 +79,7 @@ def _handleChargeResponse(self, response, txRef, request=None, isMpesa=False):
                 "validationRequired": True, 
                 "txRef": txRef, 
                 "flwRef": responseJson["data"]["flwRef"], 
-                "narration": responseJson["data"]["narration"]
+                "narration": responseJson["data"]["narration"],
                 }
         else:
             # if all preliminary tests pass
@@ -129,7 +130,7 @@ def _handleVerifyResponse(self, response, txRef):
         responseJson = res["json"]
         # retrieve necessary properties from response 
         verify_response["status"] = responseJson['status']
-        verify_response['flwRef'], verify_response["txRef"], verify_response["vbvcode"], verify_response["vbvmessage"], verify_response["acctmessage"], verify_response["currency"], verify_response["chargecode"], verify_response["amount"], verify_response["chargedamount"], verify_response["chargemessage"] = Payment.retrieve(responseJson['data'], "flwref", "txref", "vbvcode", "vbvmessage", "acctmessage", "currency", "chargecode", "amount", "chargedamount", "chargemessage")
+        verify_response['flwRef'], verify_response["txRef"], verify_response["vbvcode"], verify_response["vbvmessage"], verify_response["acctmessage"], verify_response["currency"], verify_response["chargecode"], verify_response["amount"], verify_response["chargedamount"], verify_response["chargemessage"], verify_response["meta"] = Payment.retrieve(responseJson['data'], "flwref", "txref", "vbvcode", "vbvmessage", "acctmessage", "currency", "chargecode", "amount", "chargedamount", "chargemessage", "meta")
 
         # Check if the chargecode is 00
         if verify_response['chargecode'] == "00":
@@ -218,12 +219,12 @@ def charge(self, feature_name, paymentDetails, requiredParameters, endpoint, sho
             if response.ok:
                 tracking_endpoint = self._trackingMap
                 responseTime = response.elapsed.total_seconds()
-                tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name, "message": responseTime}
+                tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name, "message": responseTime}
                 tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
             else:
                 tracking_endpoint = self._trackingMap
                 responseTime = response.elapsed.total_seconds()
-                tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name + "-error", "message": responseTime}
+                tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name + "-error", "message": responseTime}
                 tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
 
         if shouldReturnRequest:
@@ -265,12 +266,12 @@ def validate(self, feature_name, flwRef, otp, endpoint=None):
         if response.ok:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name, "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name, "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
         else:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name + "-error", "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name + "-error", "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
 
         return self._handleValidateResponse(response, flwRef)
@@ -300,12 +301,12 @@ def verify(self, feature_name, txRef, endpoint=None):
         if response.ok:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name, "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name, "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
         else:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name + "-error", "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name + "-error", "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
 
         return self._handleVerifyResponse(response, txRef)
@@ -332,12 +333,12 @@ def refund(self, feature_name, flwRef, amount, ):
         if response.ok:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name, "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name, "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
         else:
             tracking_endpoint = self._trackingMap
             responseTime = response.elapsed.total_seconds()
-            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.10", "title": feature_name + "-error", "message": responseTime}
+            tracking_payload = {"publicKey": self._getPublicKey(),"language": "Python v2", "version": "1.2.12", "title": feature_name + "-error", "message": responseTime}
             tracking_response = requests.post(tracking_endpoint, data=json.dumps(tracking_payload))
 
         try:

rave_python/rave_rwmobile.py

@@ -18,7 +18,7 @@ def charge(self, accountDetails, hasFailed=False):
         """
 
         #feature logic
-        feature_name = "Initiate-Rwanda-mobile-money-charge" 
+        feature_name = "Rwanda-MoMo-charge" 
         endpoint = self._baseUrl + self._endpointMap["account"]["charge"]
 
         # It is faster to add boilerplate than to check if each one is present
@@ -37,7 +37,12 @@ def charge(self, accountDetails, hasFailed=False):
         return super(RWMobile, self).charge(feature_name, accountDetails, requiredParameters, endpoint)
 
     def refund(self, flwRef, amount):
-        feature_name = "Rwanda-mobile-money-charge-refund"
+        feature_name = "Rwanda-MoMo-refund"
         endpoint = self._baseUrl + self._endpointMap["refund"]
         return super(RWMobile, self).refund(feature_name, flwRef, amount)
 
+    def verify(self, txRef):
+        feature_name = "Rwanda-MoMo-verify"
+        endpoint = self._baseUrl + self._endpointMap["verify"]
+        return super(RWMobile, self).verify(feature_name, txRef)
+