Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 21:44:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Stripe Connect

Browse Source
This commit is contained in:
David Bomba 2021-05-18 15:53:00 +10:00
parent d515a1ee97
commit 3f373d873f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/CompanyGatewayFactory.php
View File

@ -21,6 +21,8 @@ class CompanyGatewayFactory
$company_gateway = new CompanyGateway; $company_gateway = new CompanyGateway;
$company_gateway->company_id = $company_id; $company_gateway->company_id = $company_id;
$company_gateway->user_id = $user_id; $company_gateway->user_id = $user_id;
$company_gateway->require_billing_address = false;
$company_gateway->require_shipping_address = false;
// $company_gateway->fees_and_limits = new FeesAndLimits; // $company_gateway->fees_and_limits = new FeesAndLimits;
return $company_gateway; return $company_gateway;

30
app/Http/Controllers/StripeConnectController.php
View File

@ -41,6 +41,8 @@ class StripeConnectController extends BaseController
MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']); MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
$company = Company::where('company_key', $request->getTokenContent()['company_key'])->first();
$company_gateway = CompanyGateway::query() $company_gateway = CompanyGateway::query()
->where('gateway_key', 'd14dd26a47cecc30fdd65700bfb67b34') ->where('gateway_key', 'd14dd26a47cecc30fdd65700bfb67b34')
->where('company_id', $request->getCompany()->id) ->where('company_id', $request->getCompany()->id)
@ -48,7 +50,7 @@ class StripeConnectController extends BaseController
if ($company_gateway) { if ($company_gateway) {
$config = decrypt($company_gateway->config); $config = $company_gateway->getConfig();
if(property_exists($config, 'account_id')) if(property_exists($config, 'account_id'))
return view('auth.connect.existing'); return view('auth.connect.existing');
@ -59,6 +61,12 @@ class StripeConnectController extends BaseController
$redirect_uri = 'http://ninja.test:8000/stripe/completed'; $redirect_uri = 'http://ninja.test:8000/stripe/completed';
$endpoint = "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={$stripe_client_id}&redirect_uri={$redirect_uri}&scope=read_write&state={$token}"; $endpoint = "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={$stripe_client_id}&redirect_uri={$redirect_uri}&scope=read_write&state={$token}";
if($email = $request->getContact()->email)
$endpoint .= "&stripe_user[email]={$email}";
$company_name = str_replace(" ", "_", $company->present()->name());
$endpoint .= "&stripe_user[business_name]={$company_name}";
return redirect($endpoint); return redirect($endpoint);
} }
@ -72,6 +80,8 @@ class StripeConnectController extends BaseController
'code' => $request->input('code'), 'code' => $request->input('code'),
]); ]);
// nlog($response);
$company = Company::where('company_key', $request->getTokenContent()['company_key'])->first(); $company = Company::where('company_key', $request->getTokenContent()['company_key'])->first();
$company_gateway = CompanyGatewayFactory::create($company->id, $company->id); $company_gateway = CompanyGatewayFactory::create($company->id, $company->id);
@ -79,32 +89,32 @@ class StripeConnectController extends BaseController
$fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits; $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits;
$company_gateway->gateway_key = 'd14dd26a47cecc30fdd65700bfb67b34'; $company_gateway->gateway_key = 'd14dd26a47cecc30fdd65700bfb67b34';
$company_gateway->fees_and_limits = $fees_and_limits; $company_gateway->fees_and_limits = $fees_and_limits;
$company_gateway->config = encrypt(json_encode([])); $company_gateway->setConfig([]);
$company_gateway->save(); $company_gateway->save();
$payload = [ $payload = [
'account_id' => $response->stripe_user_id, 'account_id' => $response->stripe_user_id,
"token_type" => 'bearer', "token_type" => 'bearer',
"stripe_publishable_key" => $request->input('stripe_publishable_key'), "stripe_publishable_key" => $response->stripe_publishable_key,
"scope" => $request->input('scope'), "scope" => $response->scope,
"livemode" => $request->input('livemode'), "livemode" => $response->livemode,
"stripe_user_id" => $request->input('stripe_user_id'), "stripe_user_id" => $response->stripe_user_id,
"refresh_token" => $request->input('refresh_token'), "refresh_token" => $response->refresh_token,
"access_token" => $request->input('access_token') "access_token" => $response->access_token
]; ];
/* Link account if existing account exists */ /* Link account if existing account exists */
if($account_id = $this->checkAccountAlreadyLinkToEmail($company_gateway, $request->getContact()->email)) { if($account_id = $this->checkAccountAlreadyLinkToEmail($company_gateway, $request->getContact()->email)) {
$payload['account_id'] = $account_id; $payload['account_id'] = $account_id;
$company_gateway->config = $company_gateway->setConfig($payload); $company_gateway->setConfig($payload);
$company_gateway->save(); $company_gateway->save();
return view('auth.connect.existing'); return view('auth.connect.existing');
} }
$company_gateway->config = $company_gateway->setConfig($payload); $company_gateway->setConfig($payload);
$company_gateway->save(); $company_gateway->save();
//response here //response here