From d049c565739994948b9298c55179b7b4e3a60bc1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 18 May 2021 17:28:13 +1000 Subject: [PATCH 1/2] fixes for migration --- app/Http/Controllers/SetupController.php | 9 ++++++++- app/Jobs/Util/Import.php | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 6958204ca92b..9cf1c90352db 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -275,7 +275,9 @@ class SetupController extends Controller public function update() { - + if(Ninja::isHosted()) + return redirect('/'); + // if( Ninja::isNinja() || !request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) ) if(!request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) ) return redirect('/'); @@ -290,6 +292,11 @@ class SetupController extends Controller unlink ($cacheServices); } + $cacheRoute = base_path('bootstrap/cache/routes-v7.php'); + if (file_exists($cacheRoute)) { + unlink ($cacheRoute); + } + Artisan::call('clear-compiled'); Artisan::call('route:clear'); Artisan::call('view:clear'); diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index de18ff547e77..e5d7231bb61b 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -1264,7 +1264,7 @@ class Import implements ShouldQueue $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['fees_and_limits'] = []; } From 5c1190162557514f26a188a6bb9c915586462404 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 18 May 2021 19:54:57 +1000 Subject: [PATCH 2/2] Fixes for Stripe Connect --- app/Http/Controllers/OneTimeTokenController.php | 1 - app/Http/Controllers/StripeConnectController.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/OneTimeTokenController.php b/app/Http/Controllers/OneTimeTokenController.php index 2271557d268c..e55ffebc35db 100644 --- a/app/Http/Controllers/OneTimeTokenController.php +++ b/app/Http/Controllers/OneTimeTokenController.php @@ -25,7 +25,6 @@ class OneTimeTokenController extends BaseController { private $contexts = [ - 'stripe_connect' => 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_J2Fh2tZfMlaaItUfbUwBBx4JPss8jCz9&scope=read_write' ]; public function __construct() diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index e545c16cebac..cf467dffc719 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -58,7 +58,7 @@ class StripeConnectController extends BaseController } $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}"; if($email = $request->getContact()->email)