diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php index 07966956a2c0..a2507496ecf7 100644 --- a/app/Utils/Helpers.php +++ b/app/Utils/Helpers.php @@ -264,4 +264,17 @@ class Helpers return $value; } + + /** + * Resolve the font from the supported fonts array. + * + * @param string $font + * @return array + */ + public static function resolveFont(string $font = 'Arial'): array + { + return $font + ? ['name' => str_replace('_', ' ', $font), 'url' => sprintf('https://fonts.googleapis.com/css2?family=%s&display=swap', str_replace('_', '+', $font))] + : ['name' => 'Arial', 'url' => '']; + } } diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index d5bd8020bfeb..e165c5102bfd 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -445,6 +445,8 @@ class HtmlEngine $data['_rate3'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$font_size'] = ['value' => $this->settings->font_size . 'px', 'label' => '']; + $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['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/new_logo.png', 'label' => '']; diff --git a/database/migrations/2021_09_16_115919_update_designs.php b/database/migrations/2021_10_27_115919_update_designs.php similarity index 100% rename from database/migrations/2021_09_16_115919_update_designs.php rename to database/migrations/2021_10_27_115919_update_designs.php diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 8545f2b65c00..245515e97374 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -1,4 +1,6 @@