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

Fix : stripe sepa payment process

Browse Source
This commit is contained in:
hystepik 2023-01-31 10:43:58 +01:00
parent b84bd58fdc
commit 5b52dc9f04
4 changed files with 129 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
htdocs/core/class/commoninvoice.class.php
View File

@ -92,6 +92,10 @@ abstract class CommonInvoice extends CommonObject
*/ */
const STATUS_ABANDONED = 3; const STATUS_ABANDONED = 3;
/**
* Classified processing because payment requested
*/
const STATUS_PROCESSING = 4;
public $totalpaid; // duplicate with sumpayed public $totalpaid; // duplicate with sumpayed
public $totaldeposits; // duplicate with sumdeposit public $totaldeposits; // duplicate with sumdeposit
@ -610,6 +614,10 @@ abstract class CommonInvoice extends CommonObject
$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially'); $labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially'); $labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
$statusType = 'status9'; $statusType = 'status9';
} elseif ($status == 4) {
$labelStatus = $langs->transnoentitiesnoconv('BillStatusRequestProcessing');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusRequestProcessing');
$statusType = 'status3';
} elseif ($alreadypaid == 0) { } elseif ($alreadypaid == 0) {
$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid'); $labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid'); $labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
@ -900,9 +908,9 @@ abstract class CommonInvoice extends CommonObject
$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn"; $sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
$sql .= " FROM ".$this->db->prefix()."prelevement_demande"; $sql .= " FROM ".$this->db->prefix()."prelevement_demande";
$sql .= " AND fk_facture = ".((int) $this->fk_facture); // Add a protection to not pay another invoice than current one
$sql .= " AND traite = 0"; // Add a protection to not process twice
$sql .= " WHERE rowid = ".((int) $did); $sql .= " WHERE rowid = ".((int) $did);
$sql .= " AND fk_facture = ".((int) $this->id); // Add a protection to not pay another invoice than current one
$sql .= " AND traite = 0"; // Add a protection to not process twice
dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG); dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -1186,126 +1194,11 @@ abstract class CommonInvoice extends CommonObject
// Default description used for label of event. Will be overwrite by another value later. // Default description used for label of event. Will be overwrite by another value later.
$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG; $description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
$result =$this->setStatut($this::STATUS_PROCESSING);
// @TODO LMR Save request to status pending instead of done. Done should be set with a webhook. if ($result < 0) {
$db = $this->db;
$ipaddress = getUserRemoteIP();
$TRANSACTIONID = $charge->id;
$currency = $conf->currency;
$paymentmethod = 'stripe';
$emetteur_name = $charge->customer;
// Same code than into paymentok.php...
$paymentTypeId = 0;
if ($paymentmethod == 'paybox') {
$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
}
if ($paymentmethod == 'paypal') {
$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
}
if ($paymentmethod == 'stripe') {
$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
}
if (empty($paymentTypeId)) {
//erics
if ($sepaMode) {
$paymentType = 'PRE';
} else {
$paymentType = $_SESSION["paymentType"];
if (empty($paymentType)) {
$paymentType = 'CB';
}
}
$paymentTypeId = dol_getIdFromCode($this->db, $paymentType, 'c_paiement', 'code', 'id', 1);
}
$currencyCodeType = $currency;
$ispostactionok = 1;
// Creation of payment line
// TODO LMR This must be move into the stripe server listening hooks public/stripe/ipn.php
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$paiement = new Paiement($this->db);
$paiement->datepaye = $now;
$paiement->date = $now;
if ($currencyCodeType == $conf->currency) {
$paiement->amounts = [$this->id => $amounttopay]; // Array with all payments dispatching with invoice id
} else {
$paiement->multicurrency_amounts = [$this->id => $amounttopay]; // Array with all payments dispatching
$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
$ispostactionok = -1;
// Not yet supported, so error
$error++; $error++;
$errorforinvoice++; $errorforinvoice++;
} $this->errors[] = 'Error on invoice status change to processing';
$paiement->paiementid = $paymentTypeId;
$paiement->num_paiement = '';
$paiement->num_payment = '';
// Add a comment with keyword 'SellYourSaas' in text. Used by trigger.
$paiement->note_public = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
$paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
$paiement->ext_payment_id = $charge->id . ':' . $customer->id . '@' . $stripearrayofkeys['publishable_key'];
$paiement->ext_payment_site = 'stripe';
if (!$errorforinvoice) {
dol_syslog('* Record payment for invoice id ' . $this->id . '. It includes closing of invoice and regenerating document');
// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
$paiement_id = $paiement->create($user, 1);
if ($paiement_id < 0) {
$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
$errorforinvoice++;
} else {
$postactionmessages[] = 'Payment created';
}
dol_syslog("The payment has been created for invoice id " . $this->id);
}
if (!$errorforinvoice && isModEnabled('banque')) {
dol_syslog('* Add payment to bank');
// The bank used is the one defined into Stripe setup
$bankaccountid = 0;
if ($paymentmethod == 'stripe') {
$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
}
if ($bankaccountid > 0) {
$label = '(CustomerInvoicePayment)';
if ($this->type == Facture::TYPE_CREDIT_NOTE) {
$label = '(CustomerInvoicePaymentBack)';
} // Refund of a credit note
$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $emetteur_name, '');
if ($result < 0) {
$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
$errorforinvoice++;
} else {
$postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
}
} else {
$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
$ispostactionok = -1;
$error++;
$errorforinvoice++;
}
}
if ($ispostactionok < 1) {
$description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from makeStripeSepaRequest: ' . $FULLTAG;
} else {
$description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from makeStripeSepaRequest: ' . $FULLTAG;
} }
} }
@ -1563,13 +1456,13 @@ abstract class CommonInvoice extends CommonObject
$idtransferfile = 0; $idtransferfile = 0;
// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon // Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
$sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
$sql .= " traite = 1,"; // TODO Remove this $sql .= " traite = 1,"; // TODO Remove this
$sql .= " date_traite = '".$this->db->idate(dol_now())."'"; // TODO Remove this $sql .= " date_traite = '".$this->db->idate(dol_now())."'"; // TODO Remove this
if ($idtransferfile > 0) { if ($idtransferfile > 0) {
$sql .= " fk_prelevement_bons = ".((int) $idtransferfile); $sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
} }
$sql .= "WHERE rowid = ".((int) $did); $sql .= " WHERE rowid = ".((int) $did);
dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG); dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);

2
htdocs/langs/en_US/bills.lang
View File

@ -148,6 +148,8 @@ BillShortStatusNotPaid=Not paid
BillShortStatusNotRefunded=Not refunded BillShortStatusNotRefunded=Not refunded
BillShortStatusClosedUnpaid=Closed BillShortStatusClosedUnpaid=Closed
BillShortStatusClosedPaidPartially=Paid (partially) BillShortStatusClosedPaidPartially=Paid (partially)
BillStatusRequestProcessing=Payment request processing
BillShortStatusRequestProcessing=Processing
PaymentStatusToValidShort=To validate PaymentStatusToValidShort=To validate
ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this. ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.

101
htdocs/public/stripe/ipn.php
View File

@ -72,7 +72,9 @@ if (isset($_GET['connect'])) {
$servicestatus = 1; $servicestatus = 1;
} }
} }
$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
$service = 'StripeTest';
$servicestatus = 0;
if (empty($conf->stripe->enabled)) { if (empty($conf->stripe->enabled)) {
httponly_accessforbidden('Module Stripe not enabled'); httponly_accessforbidden('Module Stripe not enabled');
} }
@ -300,6 +302,103 @@ if ($event->type == 'payout.created') {
} elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). } elseif ($event->type == 'payment_intent.succeeded') { // Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
// TODO: create fees // TODO: create fees
// TODO: Redirect to paymentok.php // TODO: Redirect to paymentok.php
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$object = $event->data->object;
$invoice_id = $object->metadata->dol_id;
$ipaddress = $object->metadata->ipaddress;
$invoice_amount = $object->amount / 100;
$TRANSACTIONID = $object->id;
$customer_id = $object->customer;
$errorforinvoice = 0;
$paymentmethod = 'stripe';
$now = dol_now();
$currencyCodeType = strtoupper($object->currency);
$paymentmethodstripeid = $object->payment_method;
global $stripearrayofkeysbyenv;
$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
$s = new \Stripe\StripeClient($stripeacc);
$paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid);
//$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
$paymentTypeId = $paymentmethodstripe->type;
if ($paymentTypeId == "sepa_debit") {
$paymentTypeId = "BANCON";
} elseif ($paymentTypeId == "card") {
$paymentTypeId = "CB";
}
$paiement = new Paiement($db);
$paiement->datepaye = $now;
$paiement->date = $now;
if ($currencyCodeType == $conf->currency) {
$paiement->amounts = [$invoice_id => $invoice_amount]; // Array with all payments dispatching with invoice id
} else {
$paiement->multicurrency_amounts = [$invoice_id => $invoice_amount]; // Array with all payments dispatching
$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
$ispostactionok = -1;
// Not yet supported, so error
$error++;
$errorforinvoice++;
}
$paiement->paiementid = $paymentTypeId;
$paiement->num_paiement = '';
$paiement->num_payment = '';
// Add a comment with keyword 'SellYourSaas' in text. Used by trigger.
$paiement->note_public = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
$paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
$paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
$paiement->ext_payment_site = 'stripe';
if (!$errorforinvoice) {
dol_syslog('* Record payment for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document');
// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
$paiement_id = $paiement->create($user, 1);
if ($paiement_id < 0) {
$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
$errorforinvoice++;
} else {
$postactionmessages[] = 'Payment created';
}
dol_syslog("The payment has been created for invoice id " . $invoice_id);
}
if (!$errorforinvoice && isModEnabled('banque')) {
dol_syslog('* Add payment to bank');
// The bank used is the one defined into Stripe setup
$bankaccountid = 0;
if ($paymentmethod == 'stripe') {
$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
}
if ($bankaccountid > 0) {
$label = '(CustomerInvoicePayment)';
$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $customer_id, '');
if ($result < 0) {
$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
$errorforinvoice++;
} else {
$postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
}
} else {
$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
$ispostactionok = -1;
$error++;
$errorforinvoice++;
}
}
} elseif ($event->type == 'payment_intent.payment_failed') { } elseif ($event->type == 'payment_intent.payment_failed') {
// TODO: Redirect to paymentko.php // TODO: Redirect to paymentko.php
} elseif ($event->type == 'checkout.session.completed') { // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on). } elseif ($event->type == 'checkout.session.completed') { // Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).

24
htdocs/stripe/class/stripe.class.php
View File

@ -964,10 +964,9 @@ class Stripe extends CommonObject
$dataforcard = array( $dataforcard = array(
'type'=>'sepa_debit', 'type'=>'sepa_debit',
"sepa_debit" => array('iban' => $iban), "sepa_debit" => array('iban' => $iban),
'currency' => strtolower($conf->currency), 'billing_details' => array(
'usage' => 'reusable',
'owner' => array(
'name' => $soc->name, 'name' => $soc->name,
'email' => !empty($soc->email) ? $soc->email : "",
), ),
"metadata" => array( "metadata" => array(
'dol_type'=>$object->element, 'dol_type'=>$object->element,
@ -979,19 +978,19 @@ class Stripe extends CommonObject
); );
// Complete owner name // Complete owner name
if (!empty($soc->town)) { if (!empty($soc->town)) {
$dataforcard['owner']['address']['city']=$soc->town; $dataforcard['billing_details']['address']['city']=$soc->town;
} }
if (!empty($soc->country_code)) { if (!empty($soc->country_code)) {
$dataforcard['owner']['address']['country']=$soc->country_code; $dataforcard['billing_details']['address']['country']=$soc->country_code;
} }
if (!empty($soc->address)) { if (!empty($soc->address)) {
$dataforcard['owner']['address']['line1']=$soc->address; $dataforcard['billing_details']['address']['line1']=$soc->address;
} }
if (!empty($soc->zip)) { if (!empty($soc->zip)) {
$dataforcard['owner']['address']['postal_code']=$soc->zip; $dataforcard['billing_details']['address']['postal_code']=$soc->zip;
} }
if (!empty($soc->state)) { if (!empty($soc->state)) {
$dataforcard['owner']['address']['state']=$soc->state; $dataforcard['billing_details']['address']['state']=$soc->state;
} }
//$a = \Stripe\Stripe::getApiKey(); //$a = \Stripe\Stripe::getApiKey();
@ -1013,14 +1012,14 @@ class Stripe extends CommonObject
$s = new \Stripe\StripeClient($stripeacc); $s = new \Stripe\StripeClient($stripeacc);
// TODO LMR Deprecated with the new Stripe API and SCA. $sepa = $s->paymentMethods->create($dataforcard);
// TODO LMR Replace ->create() and ->createSource() and replace with ->getSetupIntent() to then, get the Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
$sepa = $s->sources->create($dataforcard);
if (!$sepa) { if (!$sepa) {
$this->error = 'Creation of sepa_debit on Stripe has failed'; $this->error = 'Creation of sepa_debit on Stripe has failed';
} else { } else {
// link customer and src // link customer and src
$cs = $cu->createSource($cu->id, array('source' => $sepa->id)); $cs = $s->setupIntents->create(['payment_method_types' => ['sepa_debit'], 'customer' => $cu->id]);
$cs = $s->setupIntents->update($cs->id, ['payment_method' => $sepa->id]);
$cs = $s->setupIntents->confirm($cs->id, ['mandate_data' => ['customer_acceptance' => ['type' => 'offline']]]);
if (!$cs) { if (!$cs) {
$this->error = 'Link SEPA <-> Customer failed'; $this->error = 'Link SEPA <-> Customer failed';
} else { } else {
@ -1040,6 +1039,7 @@ class Stripe extends CommonObject
} }
} }
} catch (Exception $e) { } catch (Exception $e) {
$sepa = null;
$this->error = $e->getMessage(); $this->error = $e->getMessage();
dol_syslog($this->error, LOG_WARNING); dol_syslog($this->error, LOG_WARNING);
} }