浏览代码

Merge pull request #2072 from saurabh6790/razorpay_payment_page

[minor][fix] razorpay payment
version-14
Nabin Hait 8 年前
committed by GitHub
父节点
当前提交
c8ca79bda5
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. +1
    -1
      frappe/integrations/razorpay.py
  2. +3
    -5
      frappe/templates/includes/integrations/razorpay_checkout.js

+ 1
- 1
frappe/integrations/razorpay.py 查看文件

@@ -115,7 +115,7 @@ class Controller(IntegrationController):
if hasattr(self, "parameters"): if hasattr(self, "parameters"):
return frappe._dict(self.parameters) return frappe._dict(self.parameters)


custom_settings_json = frappe.db.get_value("Integration Service", "Razorpay", "custom_settings_json", debug=1)
custom_settings_json = frappe.db.get_value("Integration Service", "Razorpay", "custom_settings_json")


if custom_settings_json: if custom_settings_json:
return frappe._dict(json.loads(custom_settings_json)) return frappe._dict(json.loads(custom_settings_json))


+ 3
- 5
frappe/templates/includes/integrations/razorpay_checkout.js 查看文件

@@ -11,9 +11,8 @@ $(document).ready(function(){
}, },
"prefill": { "prefill": {
"name": "{{ payer_name }}", "name": "{{ payer_name }}",
"email": "saurabh@erpnext.com",
"order_id": "{{ order_id }}",
"phone": "9773595372"
"email": "{{ payer_email }}",
"order_id": "{{ order_id }}"
}, },
"notes": { "notes": {
"doctype": "{{ doctype }}", "doctype": "{{ doctype }}",
@@ -26,7 +25,6 @@ $(document).ready(function(){
}; };


var rzp = new Razorpay(options); var rzp = new Razorpay(options);
console.log(options)
rzp.open(); rzp.open();
// e.preventDefault(); // e.preventDefault();
})(); })();
@@ -39,7 +37,7 @@ razorpay.make_payment_log = function(response, options, doctype, docname){
$('.razorpay-confirming').removeClass('hidden'); $('.razorpay-confirming').removeClass('hidden');


frappe.call({ frappe.call({
method:"frappe.templates.pages.razorpay_checkout.make_payment",
method:"frappe.templates.pages.integrations.razorpay_checkout.make_payment",
freeze:true, freeze:true,
headers: {"X-Requested-With": "XMLHttpRequest"}, headers: {"X-Requested-With": "XMLHttpRequest"},
args: { args: {


正在加载...
取消
保存