nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14945 from chdecultot/gocardless_corrections

Browse Source 
Gocardless improvement and  payment request correction
This commit is contained in:
Saurabh
2018-07-26 11:41:43 +05:30
committed by GitHub
parent 195436093d 6321a6b908
commit f86224e6f7
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/templates/pages/integrations/gocardless_checkout.html
View File

@@ -9,7 +9,7 @@
{% endblock %}
{%- block page_content -%}
<p class='lead text-center centered'>
<p class='lead text-center'>
<span class='gocardless-loading'>{{ _("Loading Payment System") }}</span>
</p>

2
erpnext/templates/pages/integrations/gocardless_confirmation.html
View File

@@ -9,7 +9,7 @@
{% endblock %}
{%- block page_content -%}
<p class='lead text-center centered'>
<p class='lead text-center'>
<span class='gocardless-loading'>{{ _("Payment Confirmation") }}</span>
</p>

9
erpnext/templates/pages/integrations/gocardless_confirmation.py
View File

@@ -36,10 +36,15 @@ def confirm_payment(redirect_flow_id, reference_doctype, reference_docname):
"session_token": frappe.session.user
})
confirmation_url = redirect_flow.confirmation_url
gocardless_success_page = frappe.get_hooks('gocardless_success_page')
if gocardless_success_page:
confirmation_url = frappe.get_attr(gocardless_success_page[-1])(reference_doctype, reference_docname)
data = {
"mandate": redirect_flow.links.mandate,
"customer": redirect_flow.links.customer,
"redirect_to": redirect_flow.confirmation_url,
"redirect_to": confirmation_url,
"redirect_message": "Mandate successfully created",
"reference_doctype": reference_doctype,
"reference_docname": reference_docname
@@ -53,7 +58,7 @@ def confirm_payment(redirect_flow_id, reference_doctype, reference_docname):
gateway_controller = get_gateway_controller(reference_docname)
frappe.get_doc("GoCardless Settings", gateway_controller).create_payment_request(data)
return {"redirect_to": redirect_flow.confirmation_url}
return {"redirect_to": confirmation_url}
except Exception as e:
frappe.log_error(e, "GoCardless Payment Error")