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

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-07-25 22:42:15 +10:00
commit 8cf9576496
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SubdomainController.php
View File

@ -26,6 +26,8 @@ class SubdomainController extends BaseController
'docs', 'docs',
'client_domain', 'client_domain',
'custom_domain', 'custom_domain',
'preview',
'invoiceninja',
]; ];
public function __construct() public function __construct()

3
app/Models/Presenters/CompanyPresenter.php
View File

@ -27,7 +27,6 @@ class CompanyPresenter extends EntityPresenter
return $this->settings->name ?: ctrans('texts.untitled_account'); return $this->settings->name ?: ctrans('texts.untitled_account');
//return $this->entity->name ?: ctrans('texts.untitled_account');
} }
@ -49,7 +48,7 @@ class CompanyPresenter extends EntityPresenter
/** /**
* Test for using base64 encoding * Test for using base64 encoding
*/ */
public function logo2($settings = null) public function logo_base64($settings = null)
{ {
if (! $settings) { if (! $settings) {
$settings = $this->entity->settings; $settings = $this->entity->settings;