Merge branch '1.x' into fix/list-screen-pagination-all-option

lunarphp · Jan 24, 2025 · c2014cc · c2014cc
2 parents e66c3bf + cfa3db1
commit c2014cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.../Filament/Resources/DiscountResource/RelationManagers/ProductConditionRelationManager.php b/.../Filament/Resources/DiscountResource/RelationManagers/ProductConditionRelationManager.php
@@ -7,6 +7,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
+use Lunar\Facades\ModelManifest;
 use Lunar\Models\Product;
 
 class ProductConditionRelationManager extends BaseRelationManager
@@ -38,7 +39,9 @@ public function getDefaultTable(Table $table): Table
             ->paginated(false)
             ->modifyQueryUsing(
                 fn ($query) => $query->whereIn('type', ['condition'])
-                    ->wherePurchasableType(Product::class)
+                    ->wherePurchasableType(
+                        ModelManifest::getMorphMapKey(Product::class)
+                    )
                     ->whereHas('purchasable')
             )
             ->headerActions([

diff --git a/...src/Filament/Resources/DiscountResource/RelationManagers/ProductRewardRelationManager.php b/...src/Filament/Resources/DiscountResource/RelationManagers/ProductRewardRelationManager.php
@@ -7,6 +7,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
+use Lunar\Facades\ModelManifest;
 use Lunar\Models\Product;
 
 class ProductRewardRelationManager extends BaseRelationManager
@@ -38,7 +39,9 @@ public function getDefaultTable(Table $table): Table
             ->paginated(false)
             ->modifyQueryUsing(
                 fn ($query) => $query->whereIn('type', ['reward'])
-                    ->wherePurchasableType(Product::class)
+                    ->wherePurchasableType(
+                        ModelManifest::getMorphMapKey(Product::class)
+                    )
                     ->whereHas('purchasable')
             )
             ->headerActions([