Merge remote-tracking branch 'origin/fix/product-variant-attribute-fi…

…lling' into prod
lunarphp · Oct 22, 2024 · b9a8ccb · b9a8ccb
2 parents 609a560 + 311a5fe
commit b9a8ccb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/admin/src/Filament/Resources/ProductResource.php b/packages/admin/src/Filament/Resources/ProductResource.php
@@ -99,7 +99,7 @@ public static function getWidgets(): array
     public static function getDefaultForm(Form $form): Form
     {
         return $form
-            ->schema([
+            ->schema(fn (Product $record) => [
                 Shout::make('product-status')
                     ->content(
                         __('lunarpanel::product.status.unpublished.content')
@@ -123,6 +123,19 @@ public static function getDefaultForm(Form $form): Form
                         static::getMainFormComponents(),
                     ),
                 static::getAttributeDataFormComponent(),
+                ...(
+                    $record->variants->count() === 1 ?
+                    [Forms\Components\Repeater::make('variants')
+                        ->relationship()
+                        ->schema([
+                            Attributes::make()->statePath('attribute_data')
+                        ])
+                        ->maxItems(1)
+                        ->addable(false)
+                        ->deletable(false)
+                        ->label('Variant details')] :
+                    []
+                )
             ])
             ->columns(1);
     }

diff --git a/packages/admin/src/Support/Forms/Components/Attributes.php b/packages/admin/src/Support/Forms/Components/Attributes.php
@@ -22,11 +22,10 @@ protected function setUp(): void
 
         if (blank($this->childComponents)) {
             $this->schema(function (\Filament\Forms\Get $get, Livewire $livewire, ?Model $record) {
-                $modelClass = $livewire::getResource()::getModel();
 
                 $productTypeId = null;
 
-                $morphMap = $modelClass::morphName();
+                $morphMap = $record ? $record::morphName() : $livewire::getResource()::getModel()::morphName();
 
                 $attributeQuery = Attribute::where('attribute_type', $morphMap);