1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00

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

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

View File

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

View File

@ -27,7 +27,6 @@ class CompanyPresenter extends EntityPresenter
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
*/
public function logo2($settings = null)
public function logo_base64($settings = null)
{
if (! $settings) {
$settings = $this->entity->settings;