From 815878be5c28ee95517d8dfd6db730f5b44cdc13 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 10 May 2021 10:22:07 +1000 Subject: [PATCH] Fixes for Stripe Connect --- app/Http/Controllers/StripeConnectController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index 7410f3766174..055748b8c02f 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -43,20 +43,26 @@ class StripeConnectController extends BaseController 'country' => $request->getCompany()->country()->iso_3166_2, ]; - $exists = CompanyGateway::query() + $company_gateway = CompanyGateway::query() ->where('gateway_key', 'd14dd26a47cecc30fdd65700bfb67b34') ->where('company_id', $request->getCompany()->id) ->first(); - if ($exists) { - return render('gateways.stripe.connect.existing'); + if ($company_gateway) { + + $config = decrypt($company_gateway->config); + + if(property_exists($config, 'account_id')) + return render('gateways.stripe.connect.existing'); + } $account = Account::create($data); $link = Account::link($account->id, $token); - $company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->id); + if(!$company_gateway) + $company_gateway = CompanyGatewayFactory::create($request->getCompany()->id, $request->getContact()->id); $company_gateway->fill([ 'gateway_key' => 'd14dd26a47cecc30fdd65700bfb67b34',