From b7ae17aaaf18be38be8ac53c826ff4f9a73a9058 Mon Sep 17 00:00:00 2001
From: Gursheen Anand <gursheen@frappe.io>
Date: Fri, 2 Feb 2024 22:01:42 +0530
Subject: [PATCH] fix(portal): context pay_amount for button

(cherry picked from commit 7efb5a8cb5d581d2ddfcc728f600bf5ba9649ad5)

# Conflicts:
#	erpnext/templates/pages/order.html
---
 erpnext/templates/pages/order.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 315478fc649..f5e7dadde7f 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -40,7 +40,11 @@
 					<p>
 						<a href="/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request?dn={{ doc.name }}&dt={{ doc.doctype }}&submit_doc=1&order_type=Shopping Cart"
 							class="btn btn-primary btn-sm" id="pay-for-order">
+<<<<<<< HEAD
 							{{ _("Pay", null, "Amount") }} {{doc.get_formatted("grand_total") }}
+=======
+							{{ _("Pay") }} {{ pay_amount }}
+>>>>>>> 7efb5a8cb5 (fix(portal): context pay_amount for button)
 						</a>
 					</p>
 				</div>