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

Merge pull request #8658 from ptibogxiv/patch-26

Browse Source 
fix getcountry
This commit is contained in:
Laurent Destailleur 2018-04-22 20:29:31 +02:00 committed by GitHub
commit ffa8b7379b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/stripe/payment.php
View File

@ -32,6 +32,7 @@
// Load Dolibarr environment // Load Dolibarr environment
$res=@include("../main.inc.php"); // For root directory $res=@include("../main.inc.php"); // For root directory
if (! $res) $res=@include("../../main.inc.php"); if (! $res) $res=@include("../../main.inc.php");
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@ -303,9 +304,8 @@ if (empty($reshook))
} }
elseif (preg_match('/src_/i',$source)) elseif (preg_match('/src_/i',$source))
{ {
$stripeacc = $stripe->getStripeAccount($entity);
$customer2 = \Stripe\Customer::retrieve($customer->id, array("stripe_account" => $stripeacc)); $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
//$src = $customer2->sources->retrieve("$source", array("stripe_account" => $stripeacc)); // this API fails when array stripe_account is provided
$src = $customer2->sources->retrieve("$source"); $src = $customer2->sources->retrieve("$source");
if ($src->type=='card') if ($src->type=='card')
{ {
@ -395,7 +395,7 @@ if (empty($reshook))
} }
else else
{ {
$loc = dol_buildpath('/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage().'', 1); $loc = DOL_URL_ROOT.'/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage();
$db->rollback(); $db->rollback();
header('Location: '.$loc); header('Location: '.$loc);