From 6c87982838d8010af3b7368dca24b67d1fe55246 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 22 Oct 2022 19:42:44 +0200
Subject: [PATCH 1/2] Fix newpayment.php with stripeconnect

---
 htdocs/public/payment/newpayment.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 14d455b5496..c0cfc869e9b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2390,7 +2390,17 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			   // Code for payment with option STRIPE_USE_NEW_CHECKOUT set
 
 			// Create a Stripe client.
+				<?php
+				if (empty($stripeacc)) {
+				?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+				<?php
+				} else {
+				?>
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
+				<?php
+				}
+				?>
 
 			// Create an instance of Elements
 			var elements = stripe.elements();
@@ -2433,9 +2443,19 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 				?>
 			// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set to 1 or 2
-
+			
 			// Create a Stripe client.
+				<?php
+				if (empty($stripeacc)) {
+				?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+				<?php
+				} else {
+				?>
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
+				<?php
+				}
+				?>
 
 				<?php
 				if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {

From 3cd11fefe9901f66a9342c629a816b1be27d40a1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 22 Oct 2022 17:43:17 +0000
Subject: [PATCH 2/2] Fixing style errors.

---
 htdocs/public/payment/newpayment.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index c0cfc869e9b..e9b402b08dd 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2392,13 +2392,13 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			// Create a Stripe client.
 				<?php
 				if (empty($stripeacc)) {
-				?>
+					?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-				<?php
+					<?php
 				} else {
-				?>
+					?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
-				<?php
+					<?php
 				}
 				?>
 
@@ -2447,13 +2447,13 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			// Create a Stripe client.
 				<?php
 				if (empty($stripeacc)) {
-				?>
+					?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-				<?php
+					<?php
 				} else {
-				?>
+					?>
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
-				<?php
+					<?php
 				}
 				?>