From 7b836e9a92f6aa47ff546df04678089fbc1ad7f5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 15:43:04 +0530 Subject: [PATCH 1/2] refactor: update susbcription values all the time --- erpnext/non_profit/doctype/membership/membership.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py index a523a238e4b..e163f399280 100644 --- a/erpnext/non_profit/doctype/membership/membership.py +++ b/erpnext/non_profit/doctype/membership/membership.py @@ -62,10 +62,8 @@ def get_member_based_on_subscription(subscription_id, email): 'subscription_id': subscription_id, 'email_id': email }, order_by="creation desc") - return frappe.get_doc("Member", members[0]['name']) - @frappe.whitelist() def trigger_razorpay_subscription(data): if isinstance(data, six.string_types): @@ -88,10 +86,13 @@ def trigger_razorpay_subscription(data): if data.event == "subscription.activated": member.customer_id = payment.customer_id - member.subscription_start = datetime.fromtimestamp(subscription.start_at) - member.subscription_end = datetime.fromtimestamp(subscription.end_at) - member.subscription_activated = 1 - member.save(ignore_permissions=True) + + # Update these values anyway + member.subscription_start = datetime.fromtimestamp(subscription.start_at) + member.subscription_end = datetime.fromtimestamp(subscription.end_at) + member.subscription_activated = 1 + member.save(ignore_permissions=True) + elif data.event == "subscription.charged": membership = frappe.new_doc("Membership") membership.update({ From d445ffc45801f219d5404904cb77e1ff9bc86e79 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 16:04:31 +0530 Subject: [PATCH 2/2] feat: whitelist api --- erpnext/non_profit/doctype/membership/membership.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py index e163f399280..a81bf302c25 100644 --- a/erpnext/non_profit/doctype/membership/membership.py +++ b/erpnext/non_profit/doctype/membership/membership.py @@ -64,7 +64,7 @@ def get_member_based_on_subscription(subscription_id, email): }, order_by="creation desc") return frappe.get_doc("Member", members[0]['name']) -@frappe.whitelist() +@frappe.whitelist(allow_guest=True) def trigger_razorpay_subscription(data): if isinstance(data, six.string_types): data = json.loads(data)