Przeniesienie flattenCollection do CustomCollection z Helpera

application/Gekosale/Core/Helper.php

@@ -21,45 +21,6 @@
  */
 class Helper extends Component
 {
-    /**
-     * Flatten Collection to key-value pairs
-     *
-     * @param Collection $collection
-     * @param            $idKey
-     * @param            $translationPath
-     *
-     * @return array
-     */
-    public function flattenCollection(Collection $collection, $idKey, $translationPath)
-    {
-        $language        = $this->getCurrentLanguage();
-        $select          = [];
-        $translationPath = explode('.', $translationPath);
-
-        if (count($translationPath) == 2) {
-            $translationNode = $translationPath[0];
-            $translationKey  = $translationPath[1];
-        } else {
-            $translationNode = null;
-            $translationKey  = $translationPath[0];
-        }
-
-        $collection->each(function ($item) use (&$select, $idKey, $translationNode, $translationKey, $collection, $language) {
-
-            if (null === $translationNode) {
-                $select[$item->$idKey] = $item->$translationKey;
-            } else {
-                foreach ($item->$translationNode as $translation) {
-                    if ($translation->language_id === $language) {
-                        $select[$item->$idKey] = $translation->$translationKey;
-                    }
-                }
-            }
-        });
-
-        return $select;
-    }
-
     /**
      * Returns current translation from translation Collection
      *

application/Gekosale/Core/Model.php

@@ -144,4 +144,17 @@ public function sync(BelongsToMany $relation, $values)
             $relation->detach();
         }
     }
+
+    /**
+     * Gekosale custom Eloquent Collection
+     *
+     * @param array $models
+     *
+     * @return Model\CustomCollection|Collection
+     */
+    public function newCollection(array $models = Array())
+    {
+        return new Model\CustomCollection($models);
+    }
+
 }

application/Gekosale/Core/Model/CustomCollection.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Gekosale\Core\Model;
+
+use Illuminate\Database\Eloquent\Collection;
+
+class CustomCollection extends Collection
+{
+    /**
+     * Flatten Collection to key-value pairs used in forms
+     *
+     * @param            $idKey
+     * @param            $translationPath
+     * @param            $language
+     *
+     * @return array
+     */
+
+    public function toSelect($idKey, $translationPath, $language)
+    {
+        $items           = $this;
+        $select          = [];
+        $translationPath = explode('.', $translationPath);
+
+        if (count($translationPath) == 2) {
+            $translationNode = $translationPath[0];
+            $translationKey  = $translationPath[1];
+        } else {
+            $translationNode = null;
+            $translationKey  = $translationPath[0];
+        }
+
+        $items->each(function ($item) use (&$select, $idKey, $translationNode, $translationKey, $items, $language) {
+
+            if (null === $translationNode) {
+                $select[$item->$idKey] = $item->$translationKey;
+            } else {
+                foreach ($item->$translationNode as $translation) {
+                    if ($translation->language_id === $language) {
+                        $select[$item->$idKey] = $translation->$translationKey;
+                    }
+                }
+            }
+        });
+
+        return $select;
+    }
+}

application/Gekosale/Core/Model/TaxTranslation.php

@@ -27,13 +27,8 @@ class TaxTranslation extends Model
     public $timestamps = true;
 
     protected $softDelete = false;
-
-    protected $fillable
-        = array(
-            'tax_id',
-            'language_id',
-            'name'
-        );
+
+    protected $fillable = ['tax_id', 'language_id', 'name'];
 
     public function tax()
     {

application/Gekosale/Plugin/Deliverer/Repository/DelivererRepository.php

@@ -112,6 +112,6 @@ public function getPopulateData($id)
      */
     public function getAllDelivererToSelect()
     {
-        return $this->getHelper()->flattenCollection($this->all(), 'id', 'translation.name');
+        return $this->all()->toSelect('id', 'translation.name', $this->getCurrentLanguage());
     }
 }

application/Gekosale/Plugin/Producer/Repository/ProducerRepository.php

@@ -123,6 +123,6 @@ public function getPopulateData($id)
      */
     public function getAllProducerToSelect()
     {
-        return $this->getHelper()->flattenCollection($this->all(), 'id', 'translation.name');
+        return $this->all()->toSelect('id', 'translation.name', $this->getCurrentLanguage());
     }
 }

application/Gekosale/Plugin/Shop/Repository/ShopRepository.php

@@ -148,7 +148,7 @@ public function getPopulateData($id)
      */
     public function getAllShopToSelect()
     {
-        return $this->getHelper()->flattenCollection($this->all(), 'id', 'translation.name');
+        return $this->all()->toSelect('id', 'translation.name', $this->getCurrentLanguage());
     }
 
     /**

application/Gekosale/Plugin/Tax/Repository/TaxRepository.php

@@ -115,6 +115,6 @@ public function getPopulateData($id)
      */
     public function getAllTaxToSelect()
     {
-        return $this->getHelper()->flattenCollection($this->all(), 'id', 'translation.name');
+        return $this->all()->toSelect('id', 'translation.name', $this->getCurrentLanguage());
     }
 }