From 60b385b98ba0f009b801e76a5b2d72ad1d7d3947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= <burakcakirel@gmail.com>
Date: Wed, 1 Dec 2021 12:11:09 +0000
Subject: [PATCH] Get dynamic setting key for apps

---
 app/Abstracts/View/Components/DocumentShow.php | 12 ++++++++----
 .../View/Components/DocumentTemplate.php       | 18 +++++++++++-------
 app/Listeners/Document/SettingFieldCreated.php |  6 +++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/Abstracts/View/Components/DocumentShow.php b/app/Abstracts/View/Components/DocumentShow.php
index a16b9b626..49a71f591 100644
--- a/app/Abstracts/View/Components/DocumentShow.php
+++ b/app/Abstracts/View/Components/DocumentShow.php
@@ -1187,8 +1187,10 @@ abstract class DocumentShow extends Base
             return $textDocumentTitle;
         }
 
-        if (!empty(setting($type . '.title'))) {
-            return setting($type . '.title');
+        $key = $this->getSettingKey($type, 'title');
+
+        if (!empty(setting($key))) {
+            return setting($key);
         }
 
         $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type), 'trans_choice');
@@ -1206,8 +1208,10 @@ abstract class DocumentShow extends Base
             return $textDocumentSubheading;
         }
 
-        if (!empty(setting($type . '.subheading'))) {
-            return setting($type . '.subheading');
+        $key = $this->getSettingKey($type, 'subheading');
+
+        if (!empty(setting($key))) {
+            return setting($key);
         }
 
         $translation = $this->getTextFromConfig($type, 'document_subheading', 'subheading');
diff --git a/app/Abstracts/View/Components/DocumentTemplate.php b/app/Abstracts/View/Components/DocumentTemplate.php
index f2eca769c..c8b44c6e3 100644
--- a/app/Abstracts/View/Components/DocumentTemplate.php
+++ b/app/Abstracts/View/Components/DocumentTemplate.php
@@ -272,8 +272,10 @@ abstract class DocumentTemplate extends Base
             return $textDocumentTitle;
         }
 
-        if (!empty(setting($type . '.title'))) {
-            return setting($type . '.title');
+        $key = $this->getSettingKey($type, 'title');
+
+        if (!empty(setting($key))) {
+            return setting($key);
         }
 
         $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type));
@@ -291,8 +293,10 @@ abstract class DocumentTemplate extends Base
             return $textDocumentSubheading;
         }
 
-        if (!empty(setting($type . '.subheading'))) {
-            return setting($type . '.subheading');
+        $key = $this->getSettingKey($type, 'subheading');
+
+        if (!empty(setting($key))) {
+            return setting($key);
         }
 
         $translation = $this->getTextFromConfig($type, 'document_subheading', 'subheading');
@@ -427,7 +431,7 @@ abstract class DocumentTemplate 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'));
@@ -457,7 +461,7 @@ abstract class DocumentTemplate 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'));
@@ -487,7 +491,7 @@ abstract class DocumentTemplate 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/Listeners/Document/SettingFieldCreated.php b/app/Listeners/Document/SettingFieldCreated.php
index 3ed162964..153fed0fa 100644
--- a/app/Listeners/Document/SettingFieldCreated.php
+++ b/app/Listeners/Document/SettingFieldCreated.php
@@ -42,7 +42,7 @@ class SettingFieldCreated
                 continue;
             }
 
-            $real_key = $type . '.' . $key;
+            $real_key = $this->getSettingKey($type, $key);
 
             setting()->set($real_key, $value);
         }
@@ -53,7 +53,7 @@ class SettingFieldCreated
             $company = Company::find($document->company_id);
 
             foreach ($files as $key => $value) {
-                // Upload attachment    
+                // Upload attachment
                 $media = $this->getMedia($value, 'settings');
 
                 $company->attachMedia($media, Str::snake($real_key));
@@ -66,7 +66,7 @@ class SettingFieldCreated
                     continue;
                 }
 
-                $real_key = $type . '.' . $key;
+                $real_key = setting($this->getSettingKey($type, $key));
 
                 setting()->set($real_key, $value);
             }