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

Minor fixes for migration

Browse Source
This commit is contained in:
David Bomba 2021-10-06 09:51:03 +11:00
parent 81772cd3e8
commit 9c1f82f632
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/MigrationController.php
View File

@ -234,21 +234,24 @@ class MigrationController extends BaseController
public function startMigration(Request $request) public function startMigration(Request $request)
{ {
// v4 Laravel 6
// $companies = [];
// foreach($request->all() as $input){
// if($input instanceof UploadedFile)
// nlog('is file');
// else
// $companies[] = json_decode($input);
// }
nlog("Starting Migration"); nlog("Starting Migration");
$companies = json_decode($request->companies,1); if($request->companies){
//handle Laravel 5.5 UniHTTP
$companies = json_decode($request->companies,1);
}
else {
//handle Laravel 6 Guzzle
$companies = [];
foreach($request->all() as $input){
if($input instanceof UploadedFile)
nlog('is file');
else
$companies[] = json_decode($input,1);
}
}
if (app()->environment() === 'local') { if (app()->environment() === 'local') {
nlog($request->all()); nlog($request->all());
@ -267,22 +270,11 @@ class MigrationController extends BaseController
foreach($companies as $company) foreach($companies as $company)
{ {
if(!is_array($company))
continue;
$company = (array)$company; $company = (array)$company;
// v4 Laravel 6
// $input = $request->all();
// foreach ($input as $company) {
// if($company instanceof UploadedFile)
// continue;
// else
// $company = json_decode($company,1);
// if (!$company || !is_int($company['company_index'] || !$request->file($company['company_index'])->isValid())) {
// continue;
// }
$user = auth()->user(); $user = auth()->user();
$company_count = $user->account->companies()->count(); $company_count = $user->account->companies()->count();