Merge branch '1.x' into 1.x

lunarphp · Nov 19, 2024 · 2e3afc7 · 2e3afc7
2 parents 8047651 + 6ec0b6e
commit 2e3afc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/admin/src/Filament/Resources/DiscountResource.php b/packages/admin/src/Filament/Resources/DiscountResource.php
@@ -361,7 +361,8 @@ protected static function getTableColumns(): array
                     \Lunar\Models\Discount::SCHEDULED => 'info',
                 }),
             Tables\Columns\TextColumn::make('name')
-                ->label(__('lunarpanel::discount.table.name.label')),
+                ->label(__('lunarpanel::discount.table.name.label'))
+                ->searchable(),
             Tables\Columns\TextColumn::make('type')
                 ->formatStateUsing(function ($state) {
                     return (new $state)->getName();

diff --git a/packages/admin/src/Support/Forms/Components/Attributes.php b/packages/admin/src/Support/Forms/Components/Attributes.php
@@ -61,7 +61,8 @@ protected function setUp(): void
                             'model' => $group,
                             'fields' => $attributes->groupBy('attribute_group_id')->get($group->id, []),
                         ];
-                    });
+                    })
+                    ->filter(fn ($group) => count($group['fields']));
 
                 $groupComponents = [];