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

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	dev/setup/codesniffer/ruleset.xml
This commit is contained in:
Laurent Destailleur 2018-11-09 01:32:47 +01:00
commit 4946de9533
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/stripe/payment.php
View File

@ -88,8 +88,8 @@ if (! empty($conf->stripe->enabled))
$servicestatus = 0; $servicestatus = 0;
} }
$stripe=new Stripe($db); $stripe=new Stripe($db);
$stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here) $stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here)
} }
// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array