From 65b21f3c3702852647a95fd78592da0b609e2a1f Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 3 May 2019 15:14:20 +0200
Subject: [PATCH 1/2] Fix JS for payment intent

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

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 374556c3342..13cfeb3ab0a 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2,7 +2,8 @@
 /* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.e>
+ * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2006,16 +2007,15 @@ if (preg_match('/^dopayment/', $action))
                 	payment_method_data: {
     			        billing_details: {
     			        	name: cardholderName.value
-    			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>',<?php } ?>
-    			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, phone: <?php echo $object->thirdparty->phone; ?>',<?php } ?>
-    			        	<?php if (is_object($object) && is_object($object->thirdparty)) {
-    			        	    print ', address: {'."\n";
-    			        	    print '    city: '.$object->thirdparty->town.',';
-    			        	    print '    country: '.$object->thirdparty->country_code.',';
-    			        	    print '    line1: '.$object->thirdparty->address.',';
-    			        	    print '    postal_code: '.$object->thirdparty->zip;
-    			        	    print '}'."\n";
-    			        	} ?>
+    			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>'<?php } ?>
+    			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
+    			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, address: {
+    			        	    city: '<?php echo $object->thirdparty->town; ?>',
+    			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
+    			        	    line1: '<?php echo $object->thirdparty->address; ?>',
+    			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'
+                    }
+                    <?php } ?>
     			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
           			},
           			save_payment_method: false

From 140cc934904e1df94da84aeb46d4d362ace2f1c8 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Fri, 3 May 2019 15:41:15 +0200
Subject: [PATCH 2/2] Update newpayment.php

---
 htdocs/public/payment/newpayment.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 13cfeb3ab0a..83acf5d400e 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2013,9 +2013,7 @@ if (preg_match('/^dopayment/', $action))
     			        	    city: '<?php echo $object->thirdparty->town; ?>',
     			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
     			        	    line1: '<?php echo $object->thirdparty->address; ?>',
-    			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'
-                    }
-                    <?php } ?>
+    			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'}<?php } ?>
     			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
           			},
           			save_payment_method: false