From 88b048d9a78be2961bedc35dc5b9d65f4cf29ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 22 Nov 2021 19:34:25 +0300
Subject: [PATCH] close #2306 Fixed: Bill columns names show translation keys
 instead of localized strings

---
 .../View/Components/DocumentForm.php          | 12 ++++++++---
 .../View/Components/DocumentTemplate.php      | 20 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/Abstracts/View/Components/DocumentForm.php b/app/Abstracts/View/Components/DocumentForm.php
index 336470ea2..ebb65f5bd 100644
--- a/app/Abstracts/View/Components/DocumentForm.php
+++ b/app/Abstracts/View/Components/DocumentForm.php
@@ -782,7 +782,9 @@ abstract class DocumentForm extends Base
             return $textItems;
         }
 
-        if (setting($this->getSettingKey($type, 'item_name')) !== null) {
+        if (setting($this->getSettingKey($type, 'item_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'item_name'))) != setting($this->getSettingKey($type, 'item_name')))
+        ) {
             return setting($this->getSettingKey($type, 'item_name'));
         }
 
@@ -810,7 +812,9 @@ abstract class DocumentForm extends Base
             return $textQuantity;
         }
 
-        if (setting($this->getSettingKey($type, 'quantity_name')) !== null) {
+        if (setting($this->getSettingKey($type, 'quantity_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'quantity_name'))) != setting($this->getSettingKey($type, 'quantity_name')))
+        ) {
             return setting($this->getSettingKey($type, 'quantity_name'));
         }
 
@@ -838,7 +842,9 @@ abstract class DocumentForm extends Base
             return $textPrice;
         }
 
-        if (setting($this->getSettingKey($type, 'price_name')) !== null) {
+        if (setting($this->getSettingKey($type, 'price_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'price_name'))) != setting($this->getSettingKey($type, 'price_name')))
+        ) {
             return setting($this->getSettingKey($type, 'price_name'));
         }
 
diff --git a/app/Abstracts/View/Components/DocumentTemplate.php b/app/Abstracts/View/Components/DocumentTemplate.php
index 16c3beb9d..f2eca769c 100644
--- a/app/Abstracts/View/Components/DocumentTemplate.php
+++ b/app/Abstracts/View/Components/DocumentTemplate.php
@@ -419,7 +419,7 @@ abstract class DocumentTemplate extends Base
         }
 
         // if you use settting translation
-        if (setting($this->getSettingKey($type, 'item_name'), 'items') == 'custom') {
+        if (setting($this->getSettingKey($type, 'item_name'), 'items') === 'custom') {
             if (empty($textItems = setting($this->getSettingKey($type, 'item_name_input')))) {
                 $textItems = 'general.items';
             }
@@ -427,6 +427,12 @@ abstract class DocumentTemplate extends Base
             return $textItems;
         }
 
+        if (setting($this->getSettingKey($type, 'item_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'item_name'))) != setting($this->getSettingKey($type, 'item_name')))
+        ) {
+            return setting($this->getSettingKey($type, 'item_name'));
+        }
+
         $translation = $this->getTextFromConfig($type, 'items');
 
         if (!empty($translation)) {
@@ -451,6 +457,12 @@ abstract class DocumentTemplate extends Base
             return $textQuantity;
         }
 
+        if (setting($this->getSettingKey($type, 'quantity_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'quantity_name'))) != setting($this->getSettingKey($type, 'quantity_name')))
+        ) {
+            return setting($this->getSettingKey($type, 'quantity_name'));
+        }
+
         $translation = $this->getTextFromConfig($type, 'quantity');
 
         if (!empty($translation)) {
@@ -475,6 +487,12 @@ abstract class DocumentTemplate extends Base
             return $textPrice;
         }
 
+        if (setting($this->getSettingKey($type, 'price_name')) !== null && 
+            (trans(setting($this->getSettingKey($type, 'price_name'))) != setting($this->getSettingKey($type, 'price_name')))
+        ) {
+            return setting($this->getSettingKey($type, 'price_name'));
+        }
+
         $translation = $this->getTextFromConfig($type, 'price');
 
         if (!empty($translation)) {