[ui] payment request cleanup
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
index c3a4772..b01d684 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -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",
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index b28a889..b519dee 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -13,31 +13,22 @@
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");
+ });
});
-})
+});