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

Fix deletion of stripe card

Browse Source
This commit is contained in:
Laurent Destailleur 2018-05-17 13:51:17 +02:00
parent 200af6ea5c
commit 1645c14e25
1 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
View File

@ -119,13 +119,13 @@ class InterfaceStripe
$langs->load("mails"); $langs->load("mails");
$langs->load('other'); $langs->load('other');
$ok = 0;
require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
$stripe = new Stripe($db); $stripe = new Stripe($db);
if (empty($conf->stripe->enabled)) return 0; if (empty($conf->stripe->enabled)) return 0;
$ok = 1;
$service = 'StripeTest'; $service = 'StripeTest';
$servicestatus = 0; $servicestatus = 0;
if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha')) if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
@ -175,28 +175,38 @@ class InterfaceStripe
if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') { if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id); dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this if (! empty($object->stripe_card_ref))
$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this {
$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this
$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
if ($stripecu) { if (empty($stripeacc))
// Get customer (required to get a card)
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
$customer = \Stripe\Customer::retrieve($stripecu);
} else {
$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
}
if ($customer)
{ {
$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus); $ok = -1;
if ($card) { $this->error = "Stripe API keys are not defined into Stripe module setup for mode ".$service;
$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])); }
try { elseif ($stripecu)
$card->save($dataforcard); {
} // Get customer (required to get a card)
catch(Exception $e) if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
{ $customer = \Stripe\Customer::retrieve($stripecu);
$this->error = $e->getMessages(); } else {
$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
}
if ($customer)
{
$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
if ($card) {
$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
try {
$card->save($dataforcard);
}
catch(Exception $e)
{
$ok = -1;
$this->error = $e->getMessages();
}
} }
} }
} }
@ -205,24 +215,31 @@ class InterfaceStripe
if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') { if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id); dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this if (! empty($object->stripe_card_ref))
$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
if ($stripecu)
{ {
// Get customer (required to get a card) $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
$customer = \Stripe\Customer::retrieve($stripecu); if (empty($stripeacc))
} else {
$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
}
if ($customer)
{ {
$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus); $ok = -1;
if ($card) { $this->error = "Stripe API keys are not defined into Stripe module setup for mode ".$service;
if (method_exists($card, 'detach')) $card->detach(); }
else $card->delete(); elseif ($stripecu)
{
// Get customer (required to get a card)
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
$customer = \Stripe\Customer::retrieve($stripecu);
} else {
$customer = \Stripe\Customer::retrieve($stripecu, array("stripe_account" => $stripeacc));
}
if ($customer)
{
$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
if ($card) {
if (method_exists($card, 'detach')) $card->detach();
else $card->delete();
}
} }
} }
} }