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

Fixes for demo mode in l8

Browse Source
This commit is contained in:
David Bomba 2020-10-01 21:41:23 +10:00
parent 3fa336946f
commit b94bfacc19
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/DemoMode.php
View File

@ -18,8 +18,10 @@ use App\Factory\InvoiceItemFactory;
use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSum;
use App\Jobs\Ninja\CompanySizeCheck; use App\Jobs\Ninja\CompanySizeCheck;
use App\Jobs\Util\VersionCheck; use App\Jobs\Util\VersionCheck;
use App\Models\Account;
use App\Models\Client; use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\Company;
use App\Models\CompanyToken; use App\Models\CompanyToken;
use App\Models\Country; use App\Models\Country;
use App\Models\Credit; use App\Models\Credit;

12
app/Utils/Helpers.php
View File

@ -16,8 +16,18 @@ use App\Models\Client;
class Helpers class Helpers
{ {
public static function sharedEmailVariables(Client $client, array $settings = null): array public static function sharedEmailVariables(?Client $client, array $settings = null): array
{ {
if(!$client){
$elements['signature'] = '';
$elements['settings'] = new \stdClass;
$elements['whitelabel'] = true;
return $elements;
}
$_settings = is_null($settings) ? $client->getMergedSettings() : $settings; $_settings = is_null($settings) ? $client->getMergedSettings() : $settings;
$elements['signature'] = $_settings->email_signature; $elements['signature'] = $_settings->email_signature;