From a5f8d8c0428cc98b7590dc212c5987cfecf00061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 24 Aug 2021 15:37:16 +0200
Subject: [PATCH] Rename `$payment_date` to `$payment.date`

---
 app/DataMapper/CompanySettings.php | 4 ++--
 app/Utils/HtmlEngine.php           | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 54b589718b62..38193e0a8bdf 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -71,7 +71,7 @@ class CompanySettings extends BaseSettings
     public $inclusive_taxes = false; //@implemented
     public $quote_footer = ''; //@implmented
 
-    public $translations; 
+    public $translations;
 
     public $counter_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
     public $quote_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
@@ -685,7 +685,7 @@ class CompanySettings extends BaseSettings
             ],
             'statement_payment_columns' => [
                 '$invoice.number',
-                '$payment_date',
+                '$payment.date',
                 '$method',
                 '$outstanding',
             ],
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index bfe341274b29..0f6b81bf3b22 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -190,7 +190,7 @@ class HtmlEngine
             }
             else{
                 $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.balance_due')];
-                $data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];                
+                $data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
             }
         }
 
@@ -302,7 +302,7 @@ class HtmlEngine
 
         $data['$contact.full_name'] = ['value' => $this->contact->present()->name(), 'label' => ctrans('texts.name')];
         $data['$contact'] = &$data['$contact.full_name'];
-        
+
         $data['$contact.email'] = ['value' => $this->contact->email, 'label' => ctrans('texts.email')];
         $data['$contact.phone'] = ['value' => $this->contact->phone, 'label' => ctrans('texts.phone')];
 
@@ -439,8 +439,7 @@ class HtmlEngine
         $data['$dir'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'rtl' : 'ltr', 'label' => ''];
         $data['$dir_text_align'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'right' : 'left', 'label' => ''];
 
-        $data['$statement_date'] = ['value' => '{CHANGE_THIS}', 'label' => ctrans('texts.statement_date')];
-        $data['$payment_date'] = ['value' => '&nbsp;', 'label' => ctrans('texts.payment_date')];
+        $data['$payment.date'] = ['value' => '&nbsp;', 'label' => ctrans('texts.payment_date')];
         $data['$method'] = ['value' => '&nbsp;', 'label' => ctrans('texts.method')];
 
         $arrKeysLength = array_map('strlen', array_keys($data));