* Provision to set custom payment success message * typo fix * Fix formattingpull/2/head
@@ -203,7 +203,7 @@ def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True): | |||||
redirect_to = custom_redirect_to | redirect_to = custom_redirect_to | ||||
if redirect_to: | if redirect_to: | ||||
redirect_url += '?' + urlencode({'redirect_to': redirect_to}) | |||||
redirect_url += '&' + urlencode({'redirect_to': redirect_to}) | |||||
if redirect_message: | if redirect_message: | ||||
redirect_url += '&' + urlencode({'redirect_message': redirect_message}) | redirect_url += '&' + urlencode({'redirect_message': redirect_message}) | ||||
@@ -274,7 +274,7 @@ def confirm_payment(token): | |||||
data.get("reference_docname")).run_method("on_payment_authorized", "Completed") | data.get("reference_docname")).run_method("on_payment_authorized", "Completed") | ||||
frappe.db.commit() | frappe.db.commit() | ||||
redirect_url = '/integrations/payment-success' | |||||
redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname")) | |||||
else: | else: | ||||
redirect_url = "/integrations/payment-failed" | redirect_url = "/integrations/payment-failed" | ||||
@@ -332,7 +332,7 @@ def create_recurring_profile(token, payerid): | |||||
data.get("reference_docname")).run_method("on_payment_authorized", status_changed_to) | data.get("reference_docname")).run_method("on_payment_authorized", status_changed_to) | ||||
frappe.db.commit() | frappe.db.commit() | ||||
redirect_url = '/integrations/payment-success' | |||||
redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname")) | |||||
else: | else: | ||||
redirect_url = "/integrations/payment-failed" | redirect_url = "/integrations/payment-failed" | ||||
@@ -255,12 +255,12 @@ class RazorpaySettings(Document): | |||||
if custom_redirect_to: | if custom_redirect_to: | ||||
redirect_to = custom_redirect_to | redirect_to = custom_redirect_to | ||||
redirect_url = 'payment-success' | |||||
redirect_url = 'payment-success?doctype={0}&docname={1}'.format(self.data.reference_doctype, self.data.reference_docname) | |||||
else: | else: | ||||
redirect_url = 'payment-failed' | redirect_url = 'payment-failed' | ||||
if redirect_to: | if redirect_to: | ||||
redirect_url += '?' + urlencode({'redirect_to': redirect_to}) | |||||
redirect_url += '&' + urlencode({'redirect_to': redirect_to}) | |||||
if redirect_message: | if redirect_message: | ||||
redirect_url += '&' + urlencode({'redirect_message': redirect_message}) | redirect_url += '&' + urlencode({'redirect_message': redirect_message}) | ||||
@@ -8,9 +8,16 @@ | |||||
<span class='indicator green'> | <span class='indicator green'> | ||||
{{ _("Success") }}</span> | {{ _("Success") }}</span> | ||||
</div> | </div> | ||||
<p>{{ _("Your payment was successfully accepted") }}</p> | |||||
<div><a href='{{ frappe.form_dict.redirect_to or "/" }}' class='btn btn-primary btn-sm'> | |||||
{{ _("Continue") }}</a></div> | |||||
<p>{{ payment_message or _("Your payment was successfully accepted") }}</p> | |||||
{% if not payment_message %} | |||||
<div> | |||||
<a | |||||
href='{{ frappe.form_dict.redirect_to or "/" }}' | |||||
class='btn btn-primary btn-sm'> | |||||
{{ _("Continue") }} | |||||
</a> | |||||
</div> | |||||
{% endif %} | |||||
</div> | </div> | ||||
<style> | <style> | ||||
{% include "templates/styles/card_style.css" %} | {% include "templates/styles/card_style.css" %} | ||||
@@ -20,7 +27,7 @@ | |||||
if('{{ frappe.form_dict.redirect_to or "" }}'){ | if('{{ frappe.form_dict.redirect_to or "" }}'){ | ||||
setTimeout(function(){ | setTimeout(function(){ | ||||
window.location.href = '{{ frappe.form_dict.redirect_to }}'; | window.location.href = '{{ frappe.form_dict.redirect_to }}'; | ||||
}, 6000); | |||||
}, 4000); | |||||
} | } | ||||
}) | }) | ||||
</script> | </script> | ||||
@@ -7,4 +7,10 @@ import frappe | |||||
no_cache = True | no_cache = True | ||||
def get_context(context): | def get_context(context): | ||||
token = frappe.local.form_dict.token | |||||
token = frappe.local.form_dict.token | |||||
doc = frappe.get_doc(frappe.local.form_dict.doctype, frappe.local.form_dict.docname) | |||||
context.payment_message = '' | |||||
if hasattr(doc, 'get_payment_success_message'): | |||||
context.payment_message = doc.get_payment_success_message() | |||||