lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16505 from frederic34/fixmerge

Browse Source 
fix merge
This commit is contained in:
Laurent Destailleur 2021-03-02 12:42:12 +01:00 committed by GitHub
commit 2d200a523d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/public/payment/newpayment.php
View File

@ -2160,11 +2160,11 @@ if (preg_match('/^dopayment/', $action)) { // If we choosed/click on the payme
<?php } ?> <?php } ?>
} }
}, },
save_payment_method: <?php if ($stripecu) { save_payment_method:<?php if ($stripecu) {
print 'true'; print 'true';
} else { } else {
print 'false'; print 'false';
} ?> /* true when a customer was provided when creating payment intent. true ask to save the card */ } ?> /* true when a customer was provided when creating payment intent. true ask to save the card */
} }
).then(function(result) { ).then(function(result) {
console.log(result); console.log(result);
@ -2189,8 +2189,8 @@ if (preg_match('/^dopayment/', $action)) { // If we choosed/click on the payme
}); });
<?php <?php
} else // Old method (not SCA ready) } else {
{ // Old method (not SCA ready)
?> ?>
// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off // Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off