From 0e5bfb54a75e24ff18a197cef38bf9442530a695 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 29 Nov 2018 09:07:38 +0530
Subject: [PATCH] Customize payment success message (#6460)

* Provision to set custom payment success message

* typo fix

* Fix formatting
---
 .../doctype/paypal_settings/paypal_settings.py    |  6 +++---
 .../razorpay_settings/razorpay_settings.py        |  4 ++--
 payments/templates/pages/payment-success.html     | 15 +++++++++++----
 payments/templates/pages/payment_success.py       |  8 +++++++-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py
index 3d4be38..83a1cb0 100644
--- a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py
+++ b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py
@@ -203,7 +203,7 @@ def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True):
 		redirect_to = custom_redirect_to
 
 	if redirect_to:
-		redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+		redirect_url += '&' + urlencode({'redirect_to': redirect_to})
 	if 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")
 				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:
 			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)
 				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:
 			redirect_url = "/integrations/payment-failed"
 
diff --git a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py
index bca9291..cb66ed7 100644
--- a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py
+++ b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py
@@ -255,12 +255,12 @@ class RazorpaySettings(Document):
 				if 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:
 			redirect_url = 'payment-failed'
 
 		if redirect_to:
-			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+			redirect_url += '&' + urlencode({'redirect_to': redirect_to})
 		if redirect_message:
 			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
diff --git a/payments/templates/pages/payment-success.html b/payments/templates/pages/payment-success.html
index ce382cd..45bc303 100644
--- a/payments/templates/pages/payment-success.html
+++ b/payments/templates/pages/payment-success.html
@@ -8,9 +8,16 @@
 		<span class='indicator green'>
 			{{ _("Success") }}</span>
 	</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>
 <style>
 {% include "templates/styles/card_style.css" %}
@@ -20,7 +27,7 @@
 		if('{{ frappe.form_dict.redirect_to or "" }}'){
 			setTimeout(function(){
 				window.location.href = '{{ frappe.form_dict.redirect_to }}';
-			}, 6000);
+			}, 4000);
 		}
 	})
 </script>
diff --git a/payments/templates/pages/payment_success.py b/payments/templates/pages/payment_success.py
index 4ece359..bdc14db 100644
--- a/payments/templates/pages/payment_success.py
+++ b/payments/templates/pages/payment_success.py
@@ -7,4 +7,10 @@ import frappe
 no_cache = True
 
 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()
+