Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: improve webhook logging

Browse Source
This commit is contained in:
Shivam Mishra 2020-07-27 14:26:37 +05:30
parent e43d362d53
commit 9e3776e001
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/non_profit/doctype/member/member.py
View File

@ -121,7 +121,7 @@ def create_member_subscription_order(user_details):
'subscription_id': 'sub_EZycCvXFvqnC6p'
}
"""
# {"plan_id":"IFF Starter","fullname":"Shivam Mishra","mobile":"7506056962","email":"shivam@shivam.dev","pan":"Testing123"}
user_details = frappe._dict(user_details)
member = get_or_create_member(user_details)
if not member:

22
erpnext/non_profit/doctype/membership/membership.py
View File

@ -92,15 +92,11 @@ def trigger_razorpay_subscription(*args, **kwargs):
data = json.loads(data)
data = frappe._dict(data)
try:
subscription = data.payload.get("subscription", {}).get('entity', {})
subscription = frappe._dict(subscription)
subscription = data.payload.get("subscription", {}).get('entity', {})
subscription = frappe._dict(subscription)
payment = data.payload.get("payment", {}).get('entity', {})
payment = frappe._dict(payment)
except Exception as e:
frappe.log_error(e, "Webhook Data Parsing Error")
return False
payment = data.payload.get("payment", {}).get('entity', {})
payment = frappe._dict(payment)
try:
data_json = json.dumps(data, indent=4, sort_keys=True)
@ -108,10 +104,10 @@ def trigger_razorpay_subscription(*args, **kwargs):
except Exception as e:
error_log = frappe.log_error(frappe.get_traceback() + '\n' + data_json , _("Membership Webhook Failed"))
notify_failure(error_log)
return False
return { status: 'Failed' }
if not member:
return False
return { status: 'Failed' }
try:
if data.event == "subscription.activated":
member.customer_id = payment.customer_id
@ -137,9 +133,11 @@ def trigger_razorpay_subscription(*args, **kwargs):
member.subscription_activated = 1
member.save(ignore_permissions=True)
except Exception as e:
frappe.log_error(e, "Error creating membership entry")
log = frappe.log_error(e, "Error creating membership entry")
notify_failure(log)
return { status: 'Failed' }
return True
return { status: 'Success' }
def notify_failure(log):