Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ui] payment request cleanup

Browse Source
This commit is contained in:
Rushabh Mehta 2016-01-18 14:21:45 +05:30
parent 34fb5cf0e2
commit 681c9dde84
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
View File

@ -12,22 +12,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "gateway_acount_details",
"fieldtype": "Section Break",
"fieldname": "gateway",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Gateway Acount Details",
"label": "Gateway",
"length": 0,
"no_copy": 0,
"options": "Payment Gateway",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@ -60,23 +61,21 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "gateway",
"fieldtype": "Link",
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Gateway",
"length": 0,
"no_copy": 0,
"options": "Payment Gateway",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@ -141,7 +140,7 @@
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Payment Request Message",
"label": "",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@ -159,12 +158,14 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"default": "Please click on the link below to make your payment",
"fieldname": "message",
"fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Default Payment Request Message",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@ -182,6 +183,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"default": "Click here to make a payment",
"fieldname": "payment_url_message",
"fieldtype": "Data",
"hidden": 0,
@ -236,7 +238,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-01-11 05:55:41.117089",
"modified": "2016-01-18 03:45:19.975481",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Gateway Account",

21
erpnext/accounts/doctype/payment_request/payment_request.js
View File

@ -13,31 +13,22 @@ frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
set_field_options("print_format", r.message["print_format"])
}
})
}
}
})
frappe.ui.form.on("Payment Request", "refresh", function(frm) {
frm.add_custom_button(__('Resend Payment Email'), function(){
frappe.call({
method:"erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
args: {"docname": frm.doc.name},
freeze: true,
freeze_message: __("Sending"),
callback:function(r){
callback: function(r){
if(!r.exc) {
frappe.msgprint(__("Message Sent"))
frappe.msgprint(__("Message Sent"));
}
}
})
})
frm.add_custom_button(__("Show Paypal Express Payment"), function() {
frappe.route_options = {
"Paypal Express Payment.reference_doctype": frm.doc.doctype,
"Paypal Express Payment.reference_docname": frm.doc.name
};
frappe.set_route("List", "Paypal Express Payment");
});
});
})
});