From 50eaf0cc789b2c7cec0ea3e567abd3366e8952b2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 24 Oct 2020 14:38:53 +1100
Subject: [PATCH] Fix for date localization

---
 app/Models/Client.php    |  1 -
 app/Utils/HtmlEngine.php | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/Models/Client.php b/app/Models/Client.php
index afda91176ea4..86d4fd90b65c 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -240,7 +240,6 @@ class Client extends BaseModel implements HasLocalePreference
             return $item->id == $this->getSetting('date_format_id');
         })->first()->format;
 
-        //return DateFormat::find($this->getSetting('date_format_id'))->format;
     }
 
     public function currency()
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 6befe6d676db..6c3cafa73a0e 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -15,10 +15,13 @@ namespace App\Utils;
 use App\Designs\Designer;
 use App\Models\Country;
 use App\Utils\Number;
+use App\Utils\Traits\MakesDates;
 use Illuminate\Support\Facades\App;
 
 class HtmlEngine
 {
+    use MakesDates;
+
     public $entity;
 
     public $invitation;
@@ -172,10 +175,10 @@ class HtmlEngine
         $data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
         $data['$invoice.taxes'] = &$data['$taxes'];
 
-        $data['$invoice.custom1'] = ['value' => $this->entity->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice1')];
-        $data['$invoice.custom2'] = ['value' => $this->entity->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice2')];
-        $data['$invoice.custom3'] = ['value' => $this->entity->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice3')];
-        $data['$invoice.custom4'] = ['value' => $this->entity->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice4')];
+        $data['$invoice.custom1'] = ['value' => $this->formatCustomFieldValue('invoice1', $this->entity->custom_value1) ?: '&nbsp;', 'label' => $this->makeCustomField('invoice1')];
+        $data['$invoice.custom2'] = ['value' => $this->formatCustomFieldValue('invoice2', $this->entity->custom_value2) ?: '&nbsp;', 'label' => $this->makeCustomField('invoice2')];
+        $data['$invoice.custom3'] = ['value' => $this->formatCustomFieldValue('invoice3', $this->entity->custom_value3) ?: '&nbsp;', 'label' => $this->makeCustomField('invoice3')];
+        $data['$invoice.custom4'] = ['value' => $this->formatCustomFieldValue('invoice4', $this->entity->custom_value4) ?: '&nbsp;', 'label' => $this->makeCustomField('invoice4')];
         $data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: '&nbsp;', 'label' => ctrans('texts.public_notes')];
         $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
 
@@ -481,6 +484,7 @@ class HtmlEngine
 
         if ($custom_fields && property_exists($custom_fields, $field)) {
             $custom_field = $custom_fields->{$field};
+            
             $custom_field_parts = explode('|', $custom_field);
 
             return $custom_field_parts[0];
@@ -489,6 +493,28 @@ class HtmlEngine
         return '';
     }
 
+    private function formatCustomFieldValue($field, $value) :string
+    {
+        $custom_fields = $this->company->custom_fields;
+        $custom_field = '';
+
+        if ($custom_fields && property_exists($custom_fields, $field)) {
+            $custom_field = $custom_fields->{$field};
+            $custom_field_parts = explode('|', $custom_field);
+            $custom_field = $custom_field_parts[1];
+        }
+
+        switch ($custom_field) {
+            case 'date':
+                return $this->formatDate($value, $this->client->date_format());
+                break;
+            
+            default:
+                return $value;
+                break;
+        }
+    }
+
     private function makeTotalTaxes() :string
     {
         $data = '';