Merge branch 'develop' of https://github.com/frappe/frappe into web-form-refactor

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)

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")