diff --git a/app/Models/Company.php b/app/Models/Company.php index b485e14b4024..3581c42f510f 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -121,6 +121,7 @@ class Company extends BaseModel 'stock_notification', 'enabled_expense_tax_rates', 'invoice_task_project', + 'report_include_deleted', ]; protected $hidden = [ diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 81c5ac018edf..459625082a54 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -179,6 +179,7 @@ class CompanyTransformer extends EntityTransformer 'enable_applying_payments' => (bool) $company->enable_applying_payments, 'enabled_expense_tax_rates' => (int) $company->enabled_expense_tax_rates, 'invoice_task_project' => (bool) $company->invoice_task_project, + 'report_include_deleted' => (bool) $company->report_include_deleted, ]; } diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index c4d6cf6fe0db..d9141493f4f4 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -522,6 +522,9 @@ class HtmlEngine $data['$font_name'] = ['value' => Helpers::resolveFont($this->settings->primary_font)['name'], 'label' => '']; $data['$font_url'] = ['value' => Helpers::resolveFont($this->settings->primary_font)['url'], 'label' => '']; + $data['$secondary_font_name'] = ['value' => Helpers::resolveFont($this->settings->secondary_font)['name'], 'label' => '']; + $data['$secondary_font_url'] = ['value' => Helpers::resolveFont($this->settings->secondary_font)['url'], 'label' => '']; + $data['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/new_logo.png', 'label' => '']; $data['$primary_color'] = ['value' => $this->settings->primary_color, 'label' => ''];