Merge pull request #2918 from EnesSacid-Buker/category-type

Category types saved incorrectly in database issue

app/Listeners/Update/V30/Version3013.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Listeners\Update\V30;
+
+use App\Abstracts\Listeners\Update as Listener;
+use App\Events\Install\UpdateFinished as Event;
+use App\Traits\Categories;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class Version3013 extends Listener
+{
+    use Categories;
+
+    const ALIAS = 'core';
+
+    const VERSION = '3.0.13';
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(Event $event)
+    {
+        if ($this->skipThisUpdate($event)) {
+            return;
+        }
+
+        Log::channel('stdout')->info('Updating to 3.0.13 version...');
+
+        DB::transaction(function () {
+            $types = $this->getTypesByAllowedTranslations();
+
+            foreach ($types as $type => $translations) {
+                DB::table('categories')->whereIn('type', $translations)->update(['type' => $type]);
+            }
+        });
+
+        Log::channel('stdout')->info('Done!');
+    }
+
+    protected function getTypesByAllowedTranslations(): array
+    {
+        $types = $this->getCategoryTypes(false);
+        $lang_codes = array_keys(language()->allowed());
+
+        foreach ($types as $type => $trans_name) {
+            $translations_for_type = [];
+
+            foreach ($lang_codes as $lang_code) {
+                $translation = trans_choice($trans_name, 1, locale: $lang_code);
+
+                if ($translation === $trans_name) {
+                    continue;
+                }
+
+                $translations_for_type[] = $translation;
+            }
+
+            $types[$type] = $translations_for_type;
+        }
+
+        /**
+         * Example:     en-GB      es-ES
+         * 'income' => ['Income', 'Ingresos']
+         */
+        return $types;
+    }
+}

app/Providers/Event.php

@@ -21,6 +21,7 @@ class Event extends Provider
             'App\Listeners\Update\V30\Version305',
             'App\Listeners\Update\V30\Version307',
             'App\Listeners\Update\V30\Version309',
+            'App\Listeners\Update\V30\Version3013',
         ],
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\Auth\Login',

app/Traits/Categories.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Str;
 
 trait Categories
 {
-    public function getCategoryTypes(): array
+    public function getCategoryTypes(bool $translate = true): array
     {
         $types = [];
         $configs = config('type.category');
@@ -21,7 +21,7 @@ trait Categories
                 $name = $attr['alias'] . '::' . $name;
             }
 
-            $types[$type] = trans_choice($name, 1);
+            $types[$type] = $translate ? trans_choice($name, 1) : $name;
         }
 
         return $types;