Merge branch 'develop' into update-items-perm

This commit is contained in:
Marica 2020-09-30 12:51:35 +05:30 committed by GitHub
commit 8fbd960f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -224,7 +224,8 @@ def trigger_razorpay_subscription(*args, **kwargs):
member.subscription_activated = 1
member.save(ignore_permissions=True)
except Exception as e:
log = frappe.log_error(e, "Error creating membership entry")
message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id)
log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name))
notify_failure(log)
return { 'status': 'Failed', 'reason': e}
@ -250,4 +251,4 @@ def get_plan_from_razorpay_id(plan_id):
try:
return plan[0]['name']
except:
return None
return None