Merge SEPA payment using Stripe manually.
This commit is contained in:
Laurent Destailleur
parent
7c7ccc2393
commit
9a09e0f304
@ -111,8 +111,14 @@ if (empty($reshook)) {
|
|||||||
$sourcetype = 'supplier_invoice';
|
$sourcetype = 'supplier_invoice';
|
||||||
$newtype = 'bank-transfer';
|
$newtype = 'bank-transfer';
|
||||||
}
|
}
|
||||||
|
$paymentservice = GETPOST('paymentservice');
|
||||||
|
|
||||||
|
if (preg_match('/stripesepa/', $paymentservice)) {
|
||||||
|
$result = $object->demande_prelevement_stripe($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
|
||||||
|
} else {
|
||||||
|
$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
|
||||||
|
}
|
||||||
|
|
||||||
$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
|
|
||||||
if ($result > 0) {
|
if ($result > 0) {
|
||||||
$db->commit();
|
$db->commit();
|
||||||
|
|
||||||
@ -736,6 +742,22 @@ if ($object->id > 0) {
|
|||||||
print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
|
print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
|
||||||
print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
|
print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
|
||||||
print '</form>';
|
print '</form>';
|
||||||
|
|
||||||
|
if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
|
||||||
|
print "<br>";
|
||||||
|
//add stripe sepa button
|
||||||
|
$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");
|
||||||
|
print '<form method="POST" action="">';
|
||||||
|
print '<input type="hidden" name="token" value="'.newToken().'" />';
|
||||||
|
print '<input type="hidden" name="id" value="'.$object->id.'" />';
|
||||||
|
print '<input type="hidden" name="type" value="'.$type.'" />';
|
||||||
|
print '<input type="hidden" name="action" value="new" />';
|
||||||
|
print '<input type="hidden" name="paymenservice" value="stripesepa" />';
|
||||||
|
print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
|
||||||
|
print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
|
||||||
|
print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
|
||||||
|
print '</form>';
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
|
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,6 +42,7 @@ CreditTransferStatistics=Credit transfer statistics
|
|||||||
Rejects=Rejects
|
Rejects=Rejects
|
||||||
LastWithdrawalReceipt=Latest %s direct debit receipts
|
LastWithdrawalReceipt=Latest %s direct debit receipts
|
||||||
MakeWithdrawRequest=Make a direct debit payment request
|
MakeWithdrawRequest=Make a direct debit payment request
|
||||||
|
MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
|
||||||
MakeBankTransferOrder=Make a credit transfer request
|
MakeBankTransferOrder=Make a credit transfer request
|
||||||
WithdrawRequestsDone=%s direct debit payment requests recorded
|
WithdrawRequestsDone=%s direct debit payment requests recorded
|
||||||
BankTransferRequestsDone=%s credit transfer requests recorded
|
BankTransferRequestsDone=%s credit transfer requests recorded
|
||||||
|
|||||||
@ -434,8 +434,10 @@ class Stripe extends CommonObject
|
|||||||
|
|
||||||
// list of payment method types
|
// list of payment method types
|
||||||
$paymentmethodtypes = array("card");
|
$paymentmethodtypes = array("card");
|
||||||
|
$descriptor = dol_trunc($tag, 10, 'right', 'UTF-8', 1);
|
||||||
if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
|
if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
|
||||||
$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
|
$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
|
||||||
|
//$descriptor = preg_replace('/ref=[^:=]+/', '', $descriptor); // Clean ref
|
||||||
}
|
}
|
||||||
if (!empty($conf->global->STRIPE_KLARNA)) {
|
if (!empty($conf->global->STRIPE_KLARNA)) {
|
||||||
$paymentmethodtypes[] = "klarna";
|
$paymentmethodtypes[] = "klarna";
|
||||||
@ -463,7 +465,8 @@ class Stripe extends CommonObject
|
|||||||
"currency" => $currency_code,
|
"currency" => $currency_code,
|
||||||
"payment_method_types" => $paymentmethodtypes,
|
"payment_method_types" => $paymentmethodtypes,
|
||||||
"description" => $description,
|
"description" => $description,
|
||||||
"statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
|
"statement_descriptor_suffix" => $descriptor, // For card payment, 22 chars that appears on bank receipt (prefix into stripe setup + this suffix)
|
||||||
|
"statement_descriptor" => $descriptor, // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix
|
||||||
//"save_payment_method" => true,
|
//"save_payment_method" => true,
|
||||||
"setup_future_usage" => "on_session",
|
"setup_future_usage" => "on_session",
|
||||||
"metadata" => $metadata
|
"metadata" => $metadata
|
||||||
@ -589,131 +592,6 @@ class Stripe extends CommonObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the Stripe SEPA of a company payment mode
|
|
||||||
*
|
|
||||||
* @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 sepa and the link if the sepa is not yet linked to a stripe sepa. Deprecated with new Stripe API and SCA.
|
|
||||||
* @return \Stripe\PaymentMethod|null Stripe SEPA or null if not found
|
|
||||||
*/
|
|
||||||
public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
|
|
||||||
{
|
|
||||||
global $conf, $user, $langs;
|
|
||||||
$sepa = null;
|
|
||||||
|
|
||||||
$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
|
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
|
|
||||||
$sql .= " WHERE sa.rowid = '".$this->db->escape($object->id)."'"; // We get record from ID, no need for filter on entity
|
|
||||||
$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
|
|
||||||
|
|
||||||
$soc = new Societe($this->db);
|
|
||||||
$soc->fetch($object->fk_soc);
|
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
|
|
||||||
$resql = $this->db->query($sql);
|
|
||||||
if ($resql) {
|
|
||||||
$num = $this->db->num_rows($resql);
|
|
||||||
if ($num) {
|
|
||||||
$obj = $this->db->fetch_object($resql);
|
|
||||||
$cardref = $obj->stripe_card_ref;
|
|
||||||
dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
|
|
||||||
if ($cardref) {
|
|
||||||
try {
|
|
||||||
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
|
|
||||||
if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
|
|
||||||
$sepa = $cu->sources->retrieve($cardref);
|
|
||||||
} else {
|
|
||||||
$sepa = \Stripe\PaymentMethod::retrieve($cardref);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
|
|
||||||
//$sepa = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc)); // this API fails when array stripe_account is provided
|
|
||||||
$sepa = $cu->sources->retrieve($cardref);
|
|
||||||
} else {
|
|
||||||
//$sepa = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc)); // Don't know if this works
|
|
||||||
$sepa = \Stripe\PaymentMethod::retrieve($cardref);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->error = $e->getMessage();
|
|
||||||
dol_syslog($this->error, LOG_WARNING);
|
|
||||||
}
|
|
||||||
} elseif ($createifnotlinkedtostripe) {
|
|
||||||
$iban = $obj->iban_prefix; //prefix ?
|
|
||||||
$ipaddress = getUserRemoteIP();
|
|
||||||
|
|
||||||
$dataforcard = array(
|
|
||||||
'type'=>'sepa_debit',
|
|
||||||
"sepa_debit" => array('iban' => $iban),
|
|
||||||
'currency' => 'eur',
|
|
||||||
'usage' => 'reusable',
|
|
||||||
'owner' => array(
|
|
||||||
'name' => $soc->name,
|
|
||||||
),
|
|
||||||
"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
|
|
||||||
);
|
|
||||||
|
|
||||||
//$a = \Stripe\Stripe::getApiKey();
|
|
||||||
//var_dump($a);var_dump($stripeacc);exit;
|
|
||||||
try {
|
|
||||||
dol_syslog("Try to create sepa_debit 0");
|
|
||||||
|
|
||||||
$service = 'StripeTest';
|
|
||||||
$servicestatus = 0;
|
|
||||||
if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
|
|
||||||
$service = 'StripeLive';
|
|
||||||
$servicestatus = 1;
|
|
||||||
}
|
|
||||||
// Force to use the correct API key
|
|
||||||
global $stripearrayofkeysbyenv;
|
|
||||||
$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
|
|
||||||
|
|
||||||
dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
|
|
||||||
$s = new \Stripe\StripeClient($stripeacc);
|
|
||||||
$sepa = $s->sources->create($dataforcard);
|
|
||||||
if (!$sepa) {
|
|
||||||
$this->error = 'Creation of sepa_debit on Stripe has failed';
|
|
||||||
} else {
|
|
||||||
//association du client avec cette source de paimeent
|
|
||||||
$cs = $cu->createSource(
|
|
||||||
$cu->id,
|
|
||||||
[
|
|
||||||
'source' => $sepa->id,
|
|
||||||
]
|
|
||||||
);
|
|
||||||
if (!$cs) {
|
|
||||||
$this->error = 'Link SEPA <-> Customer failed';
|
|
||||||
} else {
|
|
||||||
dol_syslog("Try to create sepa_debit 3");
|
|
||||||
// print json_encode($sepa);
|
|
||||||
|
|
||||||
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
|
|
||||||
$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
|
|
||||||
$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
|
|
||||||
$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
|
|
||||||
$sql .= " AND type = 'ban'";
|
|
||||||
$resql = $this->db->query($sql);
|
|
||||||
if (!$resql) {
|
|
||||||
$this->error = $this->db->lasterror();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$this->error = $e->getMessage();
|
|
||||||
dol_syslog($this->error, LOG_WARNING);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
dol_print_error($this->db);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $sepa;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the Stripe payment intent. Create it with confirmnow=false
|
* Get the Stripe payment intent. Create it with confirmnow=false
|
||||||
* Warning. If a payment was tried and failed, a payment intent was created.
|
* Warning. If a payment was tried and failed, a payment intent was created.
|
||||||
@ -1012,6 +890,127 @@ class Stripe extends CommonObject
|
|||||||
return $card;
|
return $card;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the Stripe SEPA of a company payment mode
|
||||||
|
*
|
||||||
|
* @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 sepa and the link if the sepa is not yet linked to a stripe sepa. Deprecated with new Stripe API and SCA.
|
||||||
|
* @return \Stripe\PaymentMethod|null Stripe SEPA or null if not found
|
||||||
|
*/
|
||||||
|
public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
|
||||||
|
{
|
||||||
|
global $conf, $user, $langs;
|
||||||
|
$sepa = null;
|
||||||
|
|
||||||
|
$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
|
||||||
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
|
||||||
|
$sql .= " WHERE sa.rowid = '".$this->db->escape($object->id)."'"; // We get record from ID, no need for filter on entity
|
||||||
|
$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
|
||||||
|
|
||||||
|
$soc = new Societe($this->db);
|
||||||
|
$soc->fetch($object->fk_soc);
|
||||||
|
|
||||||
|
dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
|
||||||
|
$resql = $this->db->query($sql);
|
||||||
|
if ($resql) {
|
||||||
|
$num = $this->db->num_rows($resql);
|
||||||
|
if ($num) {
|
||||||
|
$obj = $this->db->fetch_object($resql);
|
||||||
|
$cardref = $obj->stripe_card_ref;
|
||||||
|
dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
|
||||||
|
if ($cardref) {
|
||||||
|
try {
|
||||||
|
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
|
||||||
|
if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
|
||||||
|
$sepa = $cu->sources->retrieve($cardref);
|
||||||
|
} else {
|
||||||
|
$sepa = \Stripe\PaymentMethod::retrieve($cardref);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
|
||||||
|
//$sepa = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc)); // this API fails when array stripe_account is provided
|
||||||
|
$sepa = $cu->sources->retrieve($cardref);
|
||||||
|
} else {
|
||||||
|
//$sepa = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc)); // Don't know if this works
|
||||||
|
$sepa = \Stripe\PaymentMethod::retrieve($cardref);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->error = $e->getMessage();
|
||||||
|
dol_syslog($this->error, LOG_WARNING);
|
||||||
|
}
|
||||||
|
} elseif ($createifnotlinkedtostripe) {
|
||||||
|
$iban = $obj->iban_prefix; //prefix ?
|
||||||
|
$ipaddress = getUserRemoteIP();
|
||||||
|
|
||||||
|
$dataforcard = array(
|
||||||
|
'type'=>'sepa_debit',
|
||||||
|
"sepa_debit" => array('iban' => $iban),
|
||||||
|
'currency' => 'eur',
|
||||||
|
'usage' => 'reusable',
|
||||||
|
'owner' => array(
|
||||||
|
'name' => $soc->name,
|
||||||
|
),
|
||||||
|
"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
|
||||||
|
);
|
||||||
|
|
||||||
|
//$a = \Stripe\Stripe::getApiKey();
|
||||||
|
//var_dump($a);var_dump($stripeacc);exit;
|
||||||
|
try {
|
||||||
|
dol_syslog("Try to create sepa_debit 0");
|
||||||
|
|
||||||
|
$service = 'StripeTest';
|
||||||
|
$servicestatus = 0;
|
||||||
|
if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
|
||||||
|
$service = 'StripeLive';
|
||||||
|
$servicestatus = 1;
|
||||||
|
}
|
||||||
|
// Force to use the correct API key
|
||||||
|
global $stripearrayofkeysbyenv;
|
||||||
|
$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
|
||||||
|
|
||||||
|
dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
|
||||||
|
$s = new \Stripe\StripeClient($stripeacc);
|
||||||
|
$sepa = $s->sources->create($dataforcard);
|
||||||
|
if (!$sepa) {
|
||||||
|
$this->error = 'Creation of sepa_debit on Stripe has failed';
|
||||||
|
} else {
|
||||||
|
// association du client avec cette source de paimeent
|
||||||
|
$cs = $cu->createSource($cu->id, array('source' => $sepa->id));
|
||||||
|
if (!$cs) {
|
||||||
|
$this->error = 'Link SEPA <-> Customer failed';
|
||||||
|
} else {
|
||||||
|
dol_syslog("Try to create sepa_debit 3");
|
||||||
|
// print json_encode($sepa);
|
||||||
|
|
||||||
|
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
|
||||||
|
$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
|
||||||
|
$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
|
||||||
|
$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
|
||||||
|
$sql .= " AND type = 'ban'";
|
||||||
|
$resql = $this->db->query($sql);
|
||||||
|
if (!$resql) {
|
||||||
|
$this->error = $this->db->lasterror();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->error = $e->getMessage();
|
||||||
|
dol_syslog($this->error, LOG_WARNING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dol_print_error($this->db);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $sepa;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create charge.
|
* Create charge.
|
||||||
* This is called by page htdocs/stripe/payment.php and may be deprecated.
|
* This is called by page htdocs/stripe/payment.php and may be deprecated.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user