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

fixes for migration

Browse Source
This commit is contained in:
David Bomba 2021-05-18 17:28:13 +10:00
parent 9493a43f38
commit d049c56573
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/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'] = [];
} }