Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/product variant attribute filling #1997

Draft
wants to merge 7 commits into
base: 1.x
Choose a base branch
from
Draft

Fix/product variant attribute filling #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
050b195
fix relation manager url generation
AidasK Oct 20, 2024
3f236aa
Merge pull request #1 from AidasK/fix/customer-orders-urls-generation
AidasK Oct 20, 2024
a39a34f
Update Attributes.php
AidasK Oct 20, 2024
311a5fe
show variant products if it's the only variant
AidasK Oct 20, 2024
74d0975
Merge branch '1.x' into fix/product-variant-attribute-filling
alecritson Nov 4, 2024
244f4b0
Merge branch '1.x' into fix/product-variant-attribute-filling
glennjacobs Nov 5, 2024
86614ff
Merge branch '1.x' into fix/product-variant-attribute-filling
glennjacobs Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../admin/src/Filament/Resources/CustomerResource/RelationManagers/OrdersRelationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Lunar\Admin\Filament\Resources\OrderResource;
use Lunar\Admin\Filament\Resources\OrderResource\Pages\ManageOrder;
use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
use Lunar\Admin\Filament\Resources\OrderResource\Pages\ManageOrder;
use Lunar\Models\Order;

class OrdersRelationManager extends BaseRelationManager
Expand Down
15 changes: 14 additions & 1 deletion packages/admin/src/Filament/Resources/ProductResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions packages/admin/src/Support/Forms/Components/Attributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading