diff --git a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py index f635cdd..d3eb684 100644 --- a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py +++ b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py @@ -198,7 +198,9 @@ class RazorpaySettings(Document): } if self.api_key and self.api_secret: try: - order = make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options) + order = make_post_request("https://api.razorpay.com/v1/orders", + auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), + data=payment_options) order['integration_request'] = integration_request.name return order # Order returned to be consumed by razorpay.js except Exception: @@ -365,7 +367,7 @@ def get_order(doctype, docname): # Do not use run_method here as it fails silently return doc.get_razorpay_order() except AttributeError: - error_log = frappe.log_error(frappe.get_traceback(), _("Controller method get_razorpay_order missing")) + frappe.log_error(frappe.get_traceback(), _("Controller method get_razorpay_order missing")) frappe.throw(_("Could not create Razorpay order. Please contact Administrator")) @frappe.whitelist(allow_guest=True) @@ -404,7 +406,6 @@ def order_payment_failure(integration_request, params): params (TYPE): error data to be updated """ frappe.log_error(params, 'Razorpay Payment Failure') - params = json.loads(params) integration = frappe.get_doc("Integration Request", integration_request) integration.update_status(params, integration.status) diff --git a/payments/public/js/razorpay.js b/payments/public/js/razorpay.js index 6b0dd0f..a950a3c 100644 --- a/payments/public/js/razorpay.js +++ b/payments/public/js/razorpay.js @@ -52,7 +52,7 @@ Razorpay Payment } */ -frappe.provide("frappe.checkout") +frappe.provide("frappe.checkout"); frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { frappe.checkout.razorpay = class RazorpayCheckout { @@ -67,21 +67,21 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { () => this.prepareOptions(), () => this.setupHandler(), () => this.show() - ]) + ]); } - show(callback=null) { + show() { this.razorpay = new Razorpay(this.options); this.razorpay.once('ready', (response) => { - this.onOpen && this.onOpen(response); + this.onOpen && this.onOpen(response); }) - this.razorpay.open(); + this.razorpay.open(); } getKey() { return new Promise(resolve => { frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => { - this.key = res.message + this.key = res.message; resolve(true); }) }); @@ -93,7 +93,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { doctype: this.doctype, docname: this.docname }).then(res => { - this.order = res.message + this.order = res.message; resolve(true); }) }); @@ -110,7 +110,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { }) } - orderFail() { + orderFail(response) { frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_failure", { integration_request: this.order.integration_request, params: response @@ -145,4 +145,4 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { } } } -}) \ No newline at end of file +}); \ No newline at end of file