Merge pull request #6913 from beganovich/jira-651

Support for different fonts
2025-06-23 20:00:33 -04:00 · 2021-10-28 05:19:07 +11:00 · 2021-10-28 05:19:07 +11:00 · 25c3f7bf08
commit 25c3f7bf08
parent 369acc27be 8552431678
14 changed files with 86 additions and 10 deletions
--- 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' => ''];
+    }
 }
--- 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' => ''];

--- a/database/migrations/2021_10_27_115919_update_designs.php
+++ b/database/migrations/2021_10_27_115919_update_designs.php
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+    
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@ -1,4 +1,6 @@
 <style id="style">
+      @import url($font_url);
+
      :root {
        --primary-color: #298aab;
        --secondary-color: #7081e0;
@ -7,7 +9,7 @@
      body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "7px";
        zoom: 80%;
      }
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -8,7 +10,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
    }
--- a/resources/views/pdf-designs/tech.html
+++ b/resources/views/pdf-designs/tech.html
@ -1,4 +1,6 @@
 <style id="style">
+    @import url($font_url);
+
    :root {
        --primary-color: $primary_color;
        --secondary-color: $secondary_color;
@ -7,7 +9,7 @@
    body {
        -webkit-font-smoothing: antialiased;
        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
+        font-family: $font_name, Helvetica, sans-serif;
        font-size: "$font_size";
        zoom: 80%;
        margin: 0;
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace Tests\Unit;
+
+use App\Utils\Helpers;
+use PHPUnit\Framework\TestCase;
+
+class HelpersTest extends TestCase
+{
+    public function testFontsReturnFormat(): void
+    {
+        $font = Helpers::resolveFont();
+
+        $this->assertArrayHasKey('name', $font);
+        $this->assertArrayHasKey('url', $font);
+    }
+
+    public function testResolvingFont(): void
+    {
+        $font = Helpers::resolveFont('Inter');
+
+        $this->assertEquals('Inter', $font['name']);
+    }
+
+    public function testDefaultFontIsArial(): void
+    {
+        $font = Helpers::resolveFont();
+
+        $this->assertEquals('Arial', $font['name']);
+    }
+}