Merge branch 'main' of https://github.com/mooxphp/moox

Author: AzGasim

packages/category/database/migrations/create_categories_table.php.stub

@@ -18,6 +18,7 @@ return new class extends Migration
             $table->integer('weight')->nullable();
             $table->integer('count')->nullable();
             $table->string('color')->nullable();
+            $table->json('basedata')->nullable();
             $table->timestamp('deleted_at')->nullable()->index();
             $table->timestamps();
             NestedSet::columns($table);

packages/category/src/Moox/Entities/Categories/Category/CategoryResource.php

@@ -78,7 +78,6 @@ public static function form(Form $form): Form
                                                         $rule->where('locale', $locale);
                                                     }
 
-                                                    return $rule;
                                                 },
                                                 'table' => 'category_translations',
                                                 'column' => 'slug',
@@ -267,7 +266,7 @@ public static function table(Table $table): Table
                         });
                     })),
             ])
-            ->defaultSort('updated_at', 'desc')
+            ->defaultSort('id', 'asc')
             ->actions([
                 ViewAction::make(),
                 EditAction::make()->hidden(fn (): bool => in_array(static::getCurrentTab(), ['trash', 'deleted'])),

packages/core/src/Traits/Taxonomy/HasResourceTaxonomy.php

@@ -41,7 +41,6 @@ protected static function createTaxonomyField(string $taxonomy, array $settings,
         $modelClass = $taxonomyService->getTaxonomyModel($taxonomy);
         $taxonomyService->validateTaxonomy($taxonomy);
         $isHierarchical = $settings['hierarchical'] ?? false;
-
         $createFormClass = $settings['createForm'] ?? CoreTaxonomyCreateForm::class;
 
         $commonConfig = [
@@ -55,28 +54,32 @@ protected static function createTaxonomyField(string $taxonomy, array $settings,
                 ]);
 
                 if ($validator->fails()) {
+
                     return $validator->errors()->first();
                 }
 
                 $model = app($modelClass);
 
                 // Check if model is translatable
                 if (method_exists($model, 'createWithTranslations')) {
-                    $locale = app()->getLocale();
+                    $locale = request()->get('lang') ?? app()->getLocale();
                     $translations = [
                         $locale => [
                             'title' => $data['title'],
                             'slug' => $data['slug'],
                         ],
                     ];
+                    \Illuminate\Support\Facades\Log::info('translations', $translations);
                     $newTaxonomy = $model::createWithTranslations([], $translations);
                 } else {
-                    // Handle non-translatable models
                     $newTaxonomy = $model::create([
                         'title' => $data['title'],
                         'slug' => $data['slug'],
                     ]);
+                    \Illuminate\Support\Facades\Log::info('newTaxonomy', $newTaxonomy);
+
                 }
+                \Illuminate\Support\Facades\Log::info('newTaxonomy', $newTaxonomy);
 
                 return $newTaxonomy->id;
             },
@@ -89,6 +92,7 @@ protected static function createTaxonomyField(string $taxonomy, array $settings,
                     titleAttribute: 'title',
                     parentAttribute: 'parent_id'
                 )
+               
                 ->enableBranchNode()
                 ->searchable()
                 ->createOptionForm($commonConfig['createOptionForm'])
@@ -105,7 +109,7 @@ protected static function createTaxonomyField(string $taxonomy, array $settings,
                     ->when(method_exists($modelClass, 'whereHas'), function ($query) use ($search) {
                         $query->whereHas('translations', function ($q) use ($search) {
                             $q->where('title', 'like', sprintf('%%%s%%', $search))
-                                ->where('locale', app()->getLocale());
+                                ->where('locale', request()->get('lang') ?? app()->getLocale());
                         });
                     }, function ($query) use ($search) {
                         $query->where('title', 'like', sprintf('%%%s%%', $search));
@@ -135,6 +139,7 @@ public static function getTaxonomyFilters(): array
         $taxonomyService = static::getTaxonomyService();
         $taxonomies = $taxonomyService->getTaxonomies();
         $resourceModel = static::getModel();
+
         $resourceTable = app($resourceModel)->getTable();
 
         return collect($taxonomies)->map(function ($settings, $taxonomy) use ($taxonomyService, $resourceTable): SelectFilter {
@@ -181,6 +186,7 @@ protected static function getTaxonomyColumns(): array
         $taxonomyService = static::getTaxonomyService();
         $taxonomies = $taxonomyService->getTaxonomies();
 
+
         return collect($taxonomies)->map(fn ($settings, $taxonomy): TagsColumn => TagsColumn::make($taxonomy)
             ->label($settings['label'] ?? ucfirst((string) $taxonomy))
             ->getStateUsing(function ($record) use ($taxonomy, $taxonomyService, $settings) {
@@ -200,7 +206,8 @@ protected static function getTaxonomyColumns(): array
                         return $query->join('translations', function ($join) use ($modelTable, $modelClass) {
                             $join->on('translations.translatable_id', '=', $modelTable.'.id')
                                 ->where('translations.translatable_type', '=', $modelClass)
-                                ->where('translations.locale', '=', app()->getLocale());
+                                ->where('translations.locale', '=', request()->get('lang') ?? app()->getLocale());
+
                         })->pluck('translations.title');
                     }, function ($query) use ($modelTable) {
                         return $query->pluck($modelTable.'.title');

packages/localization/resources/lang/de/localization.php

@@ -3,5 +3,5 @@
 return [
     'localization' => 'Lokalisierung',
     'localizations' => 'Lokalisierungen',
-
+    'select_language' => 'Sprache auswählen',
 ];

packages/localization/resources/lang/en/localization.php

@@ -3,5 +3,5 @@
 return [
     'localization' => 'Localization',
     'localizations' => 'Localizations',
-
+    'select_language' => 'Select Language',
 ];

packages/localization/resources/views/lang-selector.blade.php

@@ -1,6 +1,6 @@
 <select onchange="if(this.value) window.location.href = window.location.pathname + '?lang=' + this.value"
     class="fi-input block w-full rounded-lg border-gray-300 shadow-sm outline-none transition duration-75 focus:border-primary-500 focus:ring-1 focus:ring-inset focus:ring-primary-500 disabled:opacity-70 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:focus:border-primary-500">
-    <option value="">Select Language</option>
+    <option value="">{{ __('localization::localization.select_language') }}</option>
     @foreach(\Moox\Localization\Models\Localization::all() as $locale)
         <option value="{{ $locale->language->alpha2 }}" {{ request()->get('lang') == $locale->language->alpha2 ? 'selected' : '' }}>
             {{ $locale->language->common_name }}