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

Fixes for phpoffice and PHP7.4

Browse Source
This commit is contained in:
David Bomba 2022-03-18 13:40:26 +11:00
parent 996afc767c
commit 830a82ff9b
3 changed files with 743 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Console/Commands/ForceMigration.php
View File

@ -97,20 +97,20 @@ class ForceMigration extends Command
} }
$company = Company::on($this->db) // $company = Company::on($this->db)
->whereNull('plan') // ->whereNull('plan')
->orWhereIn('plan', ['','free']) // ->orWhereIn('plan', ['','free'])
->whereHas('accounts', function ($query){ // ->whereHas('accounts', function ($query){
$query->where('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); // $query->where('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
$query->orWhere('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx702'); // $query->orWhere('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx702');
$query->orWhere('account_key', '!=', 'AsFmBAeLXF0IKf7tmi0eiyZfmWW9hxMT'); // $query->orWhere('account_key', '!=', 'AsFmBAeLXF0IKf7tmi0eiyZfmWW9hxMT');
}) // })
->with('accounts') // ->with('accounts')
->withCount('accounts') // ->withCount('accounts')
->having('accounts_count', '>=', 1) // ->having('accounts_count', '>=', 1)
->first(); // ->first();
return $company; // return $company;
} }

4
composer.json
View File

@ -67,7 +67,7 @@
"league/flysystem-rackspace": "~1.0", "league/flysystem-rackspace": "~1.0",
"league/fractal": "0.13.*", "league/fractal": "0.13.*",
"lokielse/omnipay-alipay": "~1.4", "lokielse/omnipay-alipay": "~1.4",
"maatwebsite/excel": "dev-carbon#8b17952", "maatwebsite/excel": "dev-php-fix",
"meebio/omnipay-creditcall": "dev-master", "meebio/omnipay-creditcall": "dev-master",
"meebio/omnipay-secure-trading": "dev-master", "meebio/omnipay-secure-trading": "dev-master",
"mfauveau/omnipay-pacnet": "~2.0", "mfauveau/omnipay-pacnet": "~2.0",
@ -207,7 +207,7 @@
}, },
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/tainmar/Laravel-Excel" "url": "https://github.com/turbo124/Laravel-Excel"
} }
] ]
} }

1295
composer.lock generated
View File

File diff suppressed because it is too large Load Diff