From 2934904a4183abe9250244b1bab8716d525f16c7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 21 May 2019 16:22:57 +0530 Subject: [PATCH 1/2] fix: before capturing payment first check payment status --- .../doctype/razorpay_settings/razorpay_settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py index cb66ed7..98b6a0b 100644 --- a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py +++ b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py @@ -312,9 +312,13 @@ def capture_payment(is_sandbox=False, sanbox_response=None): data = json.loads(doc.data) settings = controller.get_settings(data) - resp = make_post_request("https://api.razorpay.com/v1/payments/{0}/capture".format(data.get("razorpay_payment_id")), + resp = make_get_request("https://api.razorpay.com/v1/payments/{0}".format(data.get("razorpay_payment_id")), auth=(settings.api_key, settings.api_secret), data={"amount": data.get("amount")}) + if resp.get('status') == "authorized": + resp = make_post_request("https://api.razorpay.com/v1/payments/{0}/capture".format(data.get("razorpay_payment_id")), + auth=(settings.api_key, settings.api_secret), data={"amount": data.get("amount")}) + if resp.get("status") == "captured": frappe.db.set_value("Integration Request", doc.name, "status", "Completed") From 60b94573f80ca84be5a74fad63f7208c7807d666 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 31 May 2019 18:36:55 +0530 Subject: [PATCH 2/2] fix: ignore if profile already in cancelled state --- .../doctype/paypal_settings/paypal_settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py index de15650..3eacff0 100644 --- a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py +++ b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py @@ -367,7 +367,11 @@ def manage_recurring_payment_profile_status(profile_id, action, args, url): response = make_post_request(url, data=args) - if response.get("ACK")[0] != "Success": + # error code 11556 indicates profile is not in active state(or already cancelled) + # thus could not cancel the subscription. + # thus raise exception only if error code not quals to 11556 + + if response.get("ACK")[0] != "Success" and response.get("L_ERRORCODE0", [])[0] != '11556': frappe.throw(_("Failed while amending subscription")) @frappe.whitelist(allow_guest=True)