Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 20:26:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5733 from turbo124/v5-develop

Browse Source 
Fixes for Stripe Connect
This commit is contained in:
David Bomba 2021-05-18 19:55:22 +10:00 committed by GitHub
commit 2291d908d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/OneTimeTokenController.php
View File

@ -25,7 +25,6 @@ class OneTimeTokenController extends BaseController
{ {
private $contexts = [ private $contexts = [
'stripe_connect' => 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_J2Fh2tZfMlaaItUfbUwBBx4JPss8jCz9&scope=read_write'
]; ];
public function __construct() public function __construct()

9
app/Http/Controllers/SetupController.php
View File

@ -275,7 +275,9 @@ class SetupController extends Controller
public function update() public function update()
{ {
if(Ninja::isHosted())
return redirect('/');
// if( Ninja::isNinja() || !request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) ) // if( Ninja::isNinja() || !request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) )
if(!request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) ) if(!request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) )
return redirect('/'); return redirect('/');
@ -290,6 +292,11 @@ class SetupController extends Controller
unlink ($cacheServices); unlink ($cacheServices);
} }
$cacheRoute = base_path('bootstrap/cache/routes-v7.php');
if (file_exists($cacheRoute)) {
unlink ($cacheRoute);
}
Artisan::call('clear-compiled'); Artisan::call('clear-compiled');
Artisan::call('route:clear'); Artisan::call('route:clear');
Artisan::call('view:clear'); Artisan::call('view:clear');

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

@ -58,7 +58,7 @@ class StripeConnectController extends BaseController
} }
$stripe_client_id = config('ninja.ninja_stripe_client_id'); $stripe_client_id = config('ninja.ninja_stripe_client_id');
$redirect_uri = 'http://ninja.test:8000/stripe/completed'; $redirect_uri = 'https://invoicing.co/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) if($email = $request->getContact()->email)

2
app/Jobs/Util/Import.php
View File

@ -1264,7 +1264,7 @@ class Import implements ShouldQueue
$modified['fees_and_limits'] = $this->cleanFeesAndLimits($modified['fees_and_limits']); $modified['fees_and_limits'] = $this->cleanFeesAndLimits($modified['fees_and_limits']);
} }
else if(Ninja::isHosted() && !Ninja::isPaidHostedClient() && $modified['gateway_key'] == 'd14dd26a37cecc30fdd65700bfb55b23'){ else if(Ninja::isHosted() && $modified['gateway_key'] == 'd14dd26a37cecc30fdd65700bfb55b23'){
$modified['gateway_key'] = 'd14dd26a47cecc30fdd65700bfb67b34'; $modified['gateway_key'] = 'd14dd26a47cecc30fdd65700bfb67b34';
$modified['fees_and_limits'] = []; $modified['fees_and_limits'] = [];
} }