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

Update PHP7.4

Browse Source
This commit is contained in:
David Bomba 2021-09-27 21:55:48 +10:00
parent a164e945a7
commit 64269c5fc0
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Account.php
View File

@ -1123,7 +1123,12 @@ class Account extends Eloquent
Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
$currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
//php 7.3
// $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
//php 7.4
$currencyId = ($client && $client->currency_id) ? $client->currency_id : ($this->currency_id ?: DEFAULT_CURRENCY);
// $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
$locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
Session::put(SESSION_CURRENCY, $currencyId);

4
app/Models/Traits/Inviteable.php
View File

@ -74,7 +74,9 @@ trait Inviteable
}
}
return $hasValue ? implode($parts, '<br/>') : false;
return $hasValue ? implode('<br/>', $parts) : false;
// return $hasValue ? implode($parts, '<br/>') : false;
}
/**

8
composer.json
View File

@ -68,11 +68,11 @@
"league/fractal": "0.13.*",
"lokielse/omnipay-alipay": "~1.4",
"maatwebsite/excel": "dev-carbon#8b17952",
"mashape/unirest-php": "^3.0",
"mashape/unirest-php": "^3.0.5",
"meebio/omnipay-creditcall": "dev-master",
"meebio/omnipay-secure-trading": "dev-master",
"mfauveau/omnipay-pacnet": "~2.0",
"mpdf/mpdf": "7.1.7",
"mpdf/mpdf": "^8.0",
"nesbot/carbon": "^2.0",
"nwidart/laravel-modules": "2.0.*",
"omnipay/authorizenet": "dev-solution-id as 2.5.0",
@ -206,6 +206,10 @@
{
"type": "vcs",
"url": "https://github.com/tainmar/Laravel-Excel"
},
{
"type": "vcs",
"url": "https://github.com/loverg-c/unirest-php"
}
]
}