瀏覽代碼

style: liting fixes

pull/2/head
Shivam Mishra 5 年之前
父節點
當前提交
0be3dc9265
共有 2 個文件被更改,包括 13 次插入12 次删除
  1. +4
    -3
      payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py
  2. +9
    -9
      payments/public/js/razorpay.js

+ 4
- 3
payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py 查看文件

@@ -198,7 +198,9 @@ class RazorpaySettings(Document):
} }
if self.api_key and self.api_secret: if self.api_key and self.api_secret:
try: 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 order['integration_request'] = integration_request.name
return order # Order returned to be consumed by razorpay.js return order # Order returned to be consumed by razorpay.js
except Exception: except Exception:
@@ -365,7 +367,7 @@ def get_order(doctype, docname):
# Do not use run_method here as it fails silently # Do not use run_method here as it fails silently
return doc.get_razorpay_order() return doc.get_razorpay_order()
except AttributeError: 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.throw(_("Could not create Razorpay order. Please contact Administrator"))


@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
@@ -404,7 +406,6 @@ def order_payment_failure(integration_request, params):
params (TYPE): error data to be updated params (TYPE): error data to be updated
""" """
frappe.log_error(params, 'Razorpay Payment Failure') frappe.log_error(params, 'Razorpay Payment Failure')
params = json.loads(params) params = json.loads(params)
integration = frappe.get_doc("Integration Request", integration_request) integration = frappe.get_doc("Integration Request", integration_request)
integration.update_status(params, integration.status) integration.update_status(params, integration.status)


+ 9
- 9
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.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
frappe.checkout.razorpay = class RazorpayCheckout { frappe.checkout.razorpay = class RazorpayCheckout {
@@ -67,21 +67,21 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
() => this.prepareOptions(), () => this.prepareOptions(),
() => this.setupHandler(), () => this.setupHandler(),
() => this.show() () => this.show()
])
]);
} }


show(callback=null) {
show() {
this.razorpay = new Razorpay(this.options); this.razorpay = new Razorpay(this.options);
this.razorpay.once('ready', (response) => { this.razorpay.once('ready', (response) => {
this.onOpen && this.onOpen(response);
this.onOpen && this.onOpen(response);
}) })
this.razorpay.open();
this.razorpay.open();
} }


getKey() { getKey() {
return new Promise(resolve => { return new Promise(resolve => {
frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => { frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => {
this.key = res.message
this.key = res.message;
resolve(true); resolve(true);
}) })
}); });
@@ -93,7 +93,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
doctype: this.doctype, doctype: this.doctype,
docname: this.docname docname: this.docname
}).then(res => { }).then(res => {
this.order = res.message
this.order = res.message;
resolve(true); 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", { frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_failure", {
integration_request: this.order.integration_request, integration_request: this.order.integration_request,
params: response params: response
@@ -145,4 +145,4 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
} }
} }
} }
})
});

Loading…
取消
儲存