diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index ca72293365a..6e6d6305106 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -8,7 +8,7 @@ if (empty($conf) || !is_object($conf))
}
// Loop to complete $param for extrafields
-if (!empty($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($search_array_options) && is_array($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
{
if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index cfc0620db5c..5541250d9a6 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -68,3 +68,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
ClickHereToTryAgain=Click here to try again...
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
\ No newline at end of file
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 1952fb8304c..21602dae3c4 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -546,16 +546,14 @@ if (empty($reshook))
if (!$error)
{
// Creation of Stripe card + update of societe_account
+ // Note that with the new Stripe API, option to create a card is no more available, instead an error message will be returned to
+ // ask to create the crdit card from Stripe backoffice.
$card = $stripe->cardStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
if (!$card)
{
$error++;
setEventMessages($stripe->error, $stripe->errors, 'errors');
}
- else
- {
- $stripecard = $card->id;
- }
}
}
}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index c26f1ea709c..838cc5ca37a 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -467,7 +467,7 @@ $token = '';
include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
-print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000000000003220 (3DSecure2 required)', '4000000000000101', '4000000000000069', '4000000000000341'));
+print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000002760003184 (3DSecure2 required on all transaction) or 4000003800000446 (3DSecure2 required the off-seesion allowed)', '4000000000000101', '4000000000000069', '4000000000000341'));
if (!empty($conf->use_javascript_ajax))
{
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 931cfbfa83e..f5656387192 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -680,18 +680,18 @@ class Stripe extends CommonObject
/**
- * Get the Stripe card of a company payment mode (with option to create it on Stripe if not linked yet)
+ * Get the Stripe card of a company payment mode (option to create it on Stripe if not linked yet is no more available on new Stripe API)
*
* @param \Stripe\StripeCustomer $cu Object stripe customer
* @param CompanyPaymentMode $object Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
* @param string $stripeacc ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
* @param int $status Status (0=test, 1=live)
- * @param int $createifnotlinkedtostripe 1=Create the stripe card and the link if the card is not yet linked to a stripe card
+ * @param int $createifnotlinkedtostripe 1=Create the stripe card and the link if the card is not yet linked to a stripe card. Deprecated with new Stripe API and SCA.
* @return \Stripe\StripeCard|\Stripe\PaymentMethod|null Stripe Card or null if not found
*/
public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
{
- global $conf, $user;
+ global $conf, $user, $langs;
$card = null;
@@ -754,27 +754,54 @@ class Stripe extends CommonObject
//$a = \Stripe\Stripe::getApiKey();
//var_dump($a);var_dump($stripeacc);exit;
- dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
try {
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{
+ dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
$card = $cu->sources->create($dataforcard);
+ if (! $card)
+ {
+ $this->error = 'Creation of card on Stripe has failed';
+ }
}
else
{
- // TODO
- dol_syslog("Error: This case is not supported", LOG_ERR);
+ $connect = '';
+ if (!empty($stripeacc)) $connect = $stripeacc.'/';
+ $url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
+ if ($status)
+ {
+ $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$cu->id;
+ }
+ $urtoswitchonstripe = ' '.img_picto($langs->trans('ShowInStripe'), 'globe').'';
+
+ //dol_syslog("Error: This case is not supported", LOG_ERR);
+ $this->error = $langs->trans('CreationOfPaymentModeMustBeDoneFromStripeInterface', $urtoswitchonstripe);
}
} else {
if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{
+ dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
+ if (! $card)
+ {
+ $this->error = 'Creation of card on Stripe has failed';
+ }
}
else
{
- // TODO
- dol_syslog("Error: This case is not supported", LOG_ERR);
+ $connect = '';
+ if (!empty($stripeacc)) $connect = $stripeacc.'/';
+ $url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
+ if ($status)
+ {
+ $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$cu->id;
+ }
+ $urtoswitchonstripe = ' '.img_picto($langs->trans('ShowInStripe'), 'globe').'';
+
+ //dol_syslog("Error: This case is not supported", LOG_ERR);
+ $this->error = $langs->trans('CreationOfPaymentModeMustBeDoneFromStripeInterface', $urtoswitchonstripe);
}
}
@@ -792,10 +819,6 @@ class Stripe extends CommonObject
$this->error = $this->db->lasterror();
}
}
- else
- {
- $this->error = 'Call to cu->source->create return empty card';
- }
}
catch (Exception $e)
{