From 7cbd734ffc9fdd7494257413065deefb171174a2 Mon Sep 17 00:00:00 2001 From: Youssef Restom Date: Wed, 26 Apr 2023 11:33:03 +0000 Subject: [PATCH 1/5] fix: log error in mpesa --- posawesome/posawesome/api/m_pesa.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/posawesome/posawesome/api/m_pesa.py b/posawesome/posawesome/api/m_pesa.py index 2a2d483f..7355ccdb 100644 --- a/posawesome/posawesome/api/m_pesa.py +++ b/posawesome/posawesome/api/m_pesa.py @@ -35,12 +35,11 @@ def confirmation(**kwargs): doc.middlename = args.get("MiddleName") doc.lastname = args.get("LastName") doc.insert(ignore_permissions=True) - frappe.log_error("confirmation" + " " + str(args), "confirmation") frappe.db.commit() context = {"ResultCode": 0, "ResultDesc": "Accepted"} return dict(context) except Exception as e: - frappe.log_error(frappe.get_traceback(), str(e)) + frappe.log_error(frappe.get_traceback(), str(e)[:140]) context = {"ResultCode": 1, "ResultDesc": "Rejected"} return dict(context) From dba8cdea9bdf563e82e0f7561b3f3dddc8b7ff64 Mon Sep 17 00:00:00 2001 From: Youssef Restom Date: Wed, 26 Apr 2023 11:41:00 +0000 Subject: [PATCH 2/5] update: mpesa validation & confirmation api --- posawesome/posawesome/api/m_pesa.py | 4 ++-- .../doctype/mpesa_c2b_register_url/mpesa_c2b_register_url.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/posawesome/posawesome/api/m_pesa.py b/posawesome/posawesome/api/m_pesa.py index 7355ccdb..8214edc1 100644 --- a/posawesome/posawesome/api/m_pesa.py +++ b/posawesome/posawesome/api/m_pesa.py @@ -17,7 +17,7 @@ def get_token(app_key, app_secret, base_url): @frappe.whitelist(allow_guest=True) -def confirmation(**kwargs): +def validation(**kwargs): try: args = frappe._dict(kwargs) doc = frappe.new_doc("Mpesa Payment Register") @@ -45,7 +45,7 @@ def confirmation(**kwargs): @frappe.whitelist(allow_guest=True) -def validation(**kwargs): +def confirmation(**kwargs): args = frappe._dict(kwargs) frappe.log_error("validation" + " " + str(args), "validation") context = {"ResultCode": 0, "ResultDesc": "Accepted"} diff --git a/posawesome/posawesome/doctype/mpesa_c2b_register_url/mpesa_c2b_register_url.py b/posawesome/posawesome/doctype/mpesa_c2b_register_url/mpesa_c2b_register_url.py index d446c38c..85ead661 100644 --- a/posawesome/posawesome/doctype/mpesa_c2b_register_url/mpesa_c2b_register_url.py +++ b/posawesome/posawesome/doctype/mpesa_c2b_register_url/mpesa_c2b_register_url.py @@ -39,8 +39,8 @@ def validate(self): payload = { "ShortCode": business_shortcode, "ResponseType": "Completed", - "ConfirmationURL": validation_url, - "ValidationURL": confirmation_url, + "ConfirmationURL": confirmation_url, + "ValidationURL": validation_url, } headers = { "Authorization": "Bearer {0}".format(token), From bb24ddd5e5e8bce3e5e394d9cf08ebba3f4068d5 Mon Sep 17 00:00:00 2001 From: Youssef Restom Date: Wed, 26 Apr 2023 11:59:09 +0000 Subject: [PATCH 3/5] update: remove log error from mpesa confirmation api --- posawesome/posawesome/api/m_pesa.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/posawesome/posawesome/api/m_pesa.py b/posawesome/posawesome/api/m_pesa.py index 8214edc1..00ecc08f 100644 --- a/posawesome/posawesome/api/m_pesa.py +++ b/posawesome/posawesome/api/m_pesa.py @@ -5,6 +5,7 @@ import frappe, requests from frappe import _ from requests.auth import HTTPBasicAuth +import json def get_token(app_key, app_secret, base_url): @@ -46,8 +47,6 @@ def validation(**kwargs): @frappe.whitelist(allow_guest=True) def confirmation(**kwargs): - args = frappe._dict(kwargs) - frappe.log_error("validation" + " " + str(args), "validation") context = {"ResultCode": 0, "ResultDesc": "Accepted"} return dict(context) From 6f109806739ce72b35ff295c9c73905b8a805355 Mon Sep 17 00:00:00 2001 From: Youssef Restom Date: Wed, 26 Apr 2023 12:00:23 +0000 Subject: [PATCH 4/5] Version: 4.3.1 --- posawesome/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posawesome/__init__.py b/posawesome/__init__.py index 4b0ff238..d8deac7a 100644 --- a/posawesome/__init__.py +++ b/posawesome/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = "4.3.0" +__version__ = "4.3.1" def console(*data): From 791fe6bad6c8aff14195706b6b8f83546df039f3 Mon Sep 17 00:00:00 2001 From: Youssef Restom Date: Wed, 26 Apr 2023 12:03:43 +0000 Subject: [PATCH 5/5] chore: remove unnecessary import --- posawesome/posawesome/api/m_pesa.py | 1 - 1 file changed, 1 deletion(-) diff --git a/posawesome/posawesome/api/m_pesa.py b/posawesome/posawesome/api/m_pesa.py index 00ecc08f..b8550388 100644 --- a/posawesome/posawesome/api/m_pesa.py +++ b/posawesome/posawesome/api/m_pesa.py @@ -5,7 +5,6 @@ import frappe, requests from frappe import _ from requests.auth import HTTPBasicAuth -import json def get_token(app_key, app_secret, base_url):