Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5283 from turbo124/master

Browse Source 
Minor fixes for migration
This commit is contained in:
David Bomba 2021-03-30 20:29:42 +11:00 committed by GitHub
commit e6915f36a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Migration/StepsController.php
View File

@ -2,18 +2,19 @@
namespace App\Http\Controllers\Migration; namespace App\Http\Controllers\Migration;
use App\Http\Controllers\BaseController;
use App\Http\Requests\MigrationAuthRequest;
use App\Http\Requests\MigrationCompaniesRequest;
use App\Http\Requests\MigrationEndpointRequest;
use App\Http\Requests\MigrationTypeRequest;
use App\Libraries\Utils; use App\Libraries\Utils;
use App\Models\Account;
use App\Services\Migration\AuthService;
use App\Services\Migration\CompanyService;
use App\Services\Migration\CompleteService;
use App\Traits\GenerateMigrationResources; use App\Traits\GenerateMigrationResources;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Services\Migration\AuthService; use Illuminate\Support\Facades\Storage;
use App\Http\Controllers\BaseController;
use App\Services\Migration\CompanyService;
use App\Http\Requests\MigrationAuthRequest;
use App\Http\Requests\MigrationTypeRequest;
use App\Services\Migration\CompleteService;
use App\Http\Requests\MigrationEndpointRequest;
use App\Http\Requests\MigrationCompaniesRequest;
use App\Models\Account;
class StepsController extends BaseController class StepsController extends BaseController
{ {
@ -256,7 +257,10 @@ class StepsController extends BaseController
$localMigrationData['force'] = array_key_exists('force', $company); $localMigrationData['force'] = array_key_exists('force', $company);
$file = storage_path("migrations/{$fileName}.zip"); Storage::makeDirectory('migrations');
$file = Storage::path("migrations/{$fileName}.zip");
//$file = storage_path("migrations/{$fileName}.zip");
ksort($localMigrationData); ksort($localMigrationData);