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

Merge pull request #39468 from blaggacao/feat/payment-request-failure-reason

Browse Source
This commit is contained in:
Raffael Meyer 2024-01-30 15:58:42 +01:00 committed by GitHub
commit 212d656d85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,10 @@ frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
})
frappe.ui.form.on("Payment Request", "refresh", function(frm) {
if(frm.doc.status == 'Failed'){
frm.set_intro(__("Failure: {0}", [frm.doc.failed_reason]), "red");
}
if(frm.doc.payment_request_type == 'Inward' && frm.doc.payment_channel !== "Phone" &&
!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal && frm.doc.docstatus==1){
frm.add_custom_button(__('Resend Payment Email'), function(){

14
erpnext/accounts/doctype/payment_request/payment_request.json
View File

@ -7,6 +7,7 @@
"field_order": [
"payment_request_type",
"transaction_date",
"failed_reason",
"column_break_2",
"naming_series",
"mode_of_payment",
@ -389,13 +390,22 @@
"options": "Payment Request",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "failed_reason",
"fieldtype": "Data",
"hidden": 1,
"label": "Reason for Failure",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
}
],
"in_create": 1,
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2023-09-27 09:51:42.277638",
"modified": "2024-01-20 00:37:06.988919",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Request",
@ -433,4 +443,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
}

3
erpnext/accounts/doctype/payment_request/payment_request_list.js
View File

@ -16,6 +16,9 @@ frappe.listview_settings['Payment Request'] = {
else if(doc.status == "Paid") {
return [__("Paid"), "blue", "status,=,Paid"];
}
else if(doc.status == "Failed") {
return [__("Failed"), "red", "status,=,Failed"];
}
else if(doc.status == "Cancelled") {
return [__("Cancelled"), "red", "status,=,Cancelled"];
}