From dda391bb3a18e4cc7597c8945ce70a4bcdd9e45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Oct 2021 14:51:43 +0200
Subject: [PATCH 1/5] Resolving fonts

---
 app/Utils/Helpers.php      | 25 +++++++++++++++++++++++
 app/Utils/HtmlEngine.php   |  2 ++
 tests/Unit/HelpersTest.php | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 tests/Unit/HelpersTest.php

diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 07966956a2c0..27fe7eb0fe5d 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -264,4 +264,29 @@ 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
+    {
+        $fonts = [
+            'Arial' => '',
+            'Inter' => 'https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap',
+            'Roboto' => 'https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap',
+            'Irish Grover' => 'https://fonts.googleapis.com/css2?family=Irish+Grover&display=swap',
+        ];
+
+        if (array_key_exists($font, $fonts)) {
+            return [
+                'name' => $font,
+                'url' => $fonts[$font],
+            ];
+        }
+
+        return ['name' => 'Arial', 'url' => $fonts['Arial']];
+    }
 }
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index d5bd8020bfeb..4b64aa4d7e1e 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()['name'], 'label' => ''];
+        $data['$font_url'] = ['value' => Helpers::resolveFont()['url'], 'label' => ''];
 
         $data['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/new_logo.png', 'label' => ''];
 
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
new file mode 100644
index 000000000000..1516ef513adb
--- /dev/null
+++ 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']);
+    }
+}

From 0059e87794a346fcf60f0ddf10a8a28ac3906979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Oct 2021 14:53:46 +0200
Subject: [PATCH 2/5] Update designs

---
 resources/views/pdf-designs/bold.html     | 4 +++-
 resources/views/pdf-designs/business.html | 4 +++-
 resources/views/pdf-designs/clean.html    | 4 +++-
 resources/views/pdf-designs/creative.html | 4 +++-
 resources/views/pdf-designs/elegant.html  | 4 +++-
 resources/views/pdf-designs/hipster.html  | 4 +++-
 resources/views/pdf-designs/modern.html   | 4 +++-
 resources/views/pdf-designs/plain.html    | 4 +++-
 resources/views/pdf-designs/playful.html  | 4 +++-
 resources/views/pdf-designs/tech.html     | 4 +++-
 10 files changed, 30 insertions(+), 10 deletions(-)

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 @@
 <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%;
     }
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index a300eddfb01e..29086bb2b409 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 5f6f5643bb96..d53a34ca3d2d 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 453046cb6390..408db2250368 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index e7890badd73c..e5c457ad32c1 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index a2af152de09b..50d3260ae861 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 712af9dd6925..b6bd3cf4bb9f 100644
--- 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%;
       }
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 53261c501126..febdb4b4b63a 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 66810b868de6..bee8fd207fd1 100644
--- 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%;
     }
diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html
index 139eb8214825..9c253db94756 100644
--- 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;

From ab8b7c4427ba681dc4cbfc0e2b8130524566ed70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Oct 2021 14:54:06 +0200
Subject: [PATCH 3/5] Migration file

---
 ...19_update_designs.php => 2021_10_27_115919_update_designs.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename database/migrations/{2021_09_16_115919_update_designs.php => 2021_10_27_115919_update_designs.php} (100%)

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

From f4979fb0a476e0ac4dd3d2afea4090b6ffdea4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Oct 2021 15:03:51 +0200
Subject: [PATCH 4/5] Update automatic font resolving

---
 app/Utils/Helpers.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 27fe7eb0fe5d..b0da6a04b5f5 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -273,20 +273,8 @@ class Helpers
      */
     public static function resolveFont(string $font = 'Arial'): array
     {
-        $fonts = [
-            'Arial' => '',
-            'Inter' => 'https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap',
-            'Roboto' => 'https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap',
-            'Irish Grover' => 'https://fonts.googleapis.com/css2?family=Irish+Grover&display=swap',
-        ];
-
-        if (array_key_exists($font, $fonts)) {
-            return [
-                'name' => $font,
-                'url' => $fonts[$font],
-            ];
-        }
-
-        return ['name' => 'Arial', 'url' => $fonts['Arial']];
+        return $font
+            ? ['name' => $font, 'url' => sprintf('https://fonts.googleapis.com/css2?family=%s&display=swap', $font)]
+            : ['name' => 'Arial', 'url' => ''];
     }
 }

From 85524316789c6fcb900a632a3a34744f6000885a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Oct 2021 16:45:50 +0200
Subject: [PATCH 5/5] Use font from the settings

---
 app/Utils/Helpers.php    | 2 +-
 app/Utils/HtmlEngine.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index b0da6a04b5f5..a2507496ecf7 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -274,7 +274,7 @@ class Helpers
     public static function resolveFont(string $font = 'Arial'): array
     {
         return $font
-            ? ['name' => $font, 'url' => sprintf('https://fonts.googleapis.com/css2?family=%s&display=swap', $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 4b64aa4d7e1e..e165c5102bfd 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -445,8 +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()['name'], 'label' => ''];
-        $data['$font_url'] = ['value' => Helpers::resolveFont()['url'], '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' => ''];