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

Try some fixes

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-25 15:15:17 +01:00
parent dde18e803d
commit 8234c09412
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,13 +243,13 @@ class Stripe extends CommonObject
/** /**
* Get the Stripe payment intent * Get the Stripe payment intent
* *
* @param Societe $object Object tp pay on Stripe * @param Societe $object Object to pay with Stripe
* @param string $customer Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe() * @param string $customer Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
* @param string $key ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect * @param string $key ''=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 $status Status (0=test, 1=live)
* @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email fpr receipt * @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email for receipt
* @param int $mode automatic=automatic payment, manual=need confirmation * @param int $mode automatic=automatic payment, manual=need confirmation
* @return \Stripe\PaymentIntent|null Stripe PaymentIntent or null if not found * @return \Stripe\PaymentIntent|null Stripe PaymentIntent or null if not found
*/ */
public function getPaymentIntent($object, $customer, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic') public function getPaymentIntent($object, $customer, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic')
{ {
@ -284,7 +284,7 @@ class Stripe extends CommonObject
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$intent = $obj->ext_payment_id; $intent = $obj->ext_payment_id;
dol_syslog(get_class($this) . "::customerStripe found stripe customer key_account = ".$tiers); dol_syslog(get_class($this) . "::customerStripe found record");
// Force to use the correct API key // Force to use the correct API key
global $stripearrayofkeysbyenv; global $stripearrayofkeysbyenv;
@ -308,7 +308,7 @@ class Stripe extends CommonObject
if (! in_array($object->multicurrency_code, $arrayzerounitcurrency)) $stripeamount=$object->multicurrency_total_ttc * 100; if (! in_array($object->multicurrency_code, $arrayzerounitcurrency)) $stripeamount=$object->multicurrency_total_ttc * 100;
else $stripeamount = $object->multicurrency_total_ttc; else $stripeamount = $object->multicurrency_total_ttc;
$fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100); $fee = round(($object->total_ttc * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) { if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100); $fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
} }
@ -328,9 +328,9 @@ class Stripe extends CommonObject
{ {
$dataforintent["application_fee"] = $fee; $dataforintent["application_fee"] = $fee;
} }
if ($societe->email && $usethirdpartyemailforreceiptemail) if ($usethirdpartyemailforreceiptemail && $object->thirdparty->email)
{ {
$dataforintent["receipt_email"] = $societe->email; $dataforintent["receipt_email"] = $object->thirdparty->email;
} }
try { try {