Merge branch '1.x' into lun-156-unable-to-create-order

lunarphp · Sep 17, 2024 · 3089660 · 3089660
2 parents a3fb640 + 9eac4c7
commit 3089660
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 40 deletions.
diff --git a/packages/admin/src/Filament/Resources/ProductResource.php b/packages/admin/src/Filament/Resources/ProductResource.php
@@ -177,7 +177,7 @@ public static function getBaseNameFormComponent(): Component
     {
         $nameType = Attribute::whereHandle('name')
             ->whereAttributeType(
-                (new (static::getModel()))->getMorphClass()
+                static::getModel()::morphName()
             )
             ->first()?->type ?: TranslatedText::class;
 

diff --git a/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php b/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php
@@ -52,7 +52,7 @@ public static function createRecord(array $data, string $model): Model
         $currency = Currency::getDefault();
 
         $nameAttribute = Attribute::whereAttributeType(
-            (new $model)->getMorphClass()
+            $model::morphName()
         )
             ->whereHandle('name')
             ->first()

diff --git a/packages/admin/src/Filament/Resources/ProductTypeResource.php b/packages/admin/src/Filament/Resources/ProductTypeResource.php
@@ -54,15 +54,15 @@ public static function getDefaultForm(Forms\Form $form): Forms\Form
                     Forms\Components\Tabs\Tab::make(__('lunarpanel::producttype.tabs.product_attributes.label'))
                         ->schema([
                             AttributeSelector::make('mappedAttributes')
-                                ->withType((new Product)->getMorphClass())
+                                ->withType(Product::morphName())
                                 ->relationship(name: 'mappedAttributes')
                                 ->label('')
                                 ->columnSpan(2),
                         ]),
                     Forms\Components\Tabs\Tab::make(__('lunarpanel::producttype.tabs.variant_attributes.label'))
                         ->schema([
                             AttributeSelector::make('mappedAttributes')
-                                ->withType((new ProductVariant)->getMorphClass())
+                                ->withType(ProductVariant::morphName())
                                 ->relationship(name: 'mappedAttributes')
                                 ->label('')
                                 ->columnSpan(2),

diff --git a/packages/admin/src/Support/Actions/Collections/CreateChildCollection.php b/packages/admin/src/Support/Actions/Collections/CreateChildCollection.php
@@ -26,7 +26,7 @@ public function setUp(): void
             $this->success();
         });
 
-        $attribute = Attribute::where('attribute_type', '=', (new Collection)->getMorphClass())
+        $attribute = Attribute::where('attribute_type', '=', Collection::morphName())
             ->where('handle', '=', 'name')->first();
 
         $formInput = TextInput::class;

diff --git a/packages/admin/src/Support/Actions/Collections/CreateRootCollection.php b/packages/admin/src/Support/Actions/Collections/CreateRootCollection.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
             $record = $this->process(function (array $data) {
                 $attribute = Attribute::whereHandle('name')->whereAttributeType(
-                    (new Collection)->getMorphClass()
+                    Collection::morphName()
                 )->first()->type;
 
                 return Collection::create([
@@ -58,7 +58,7 @@ public function setUp(): void
             $this->success();
         });
 
-        $attribute = Attribute::where('attribute_type', '=', (new Collection)->getMorphClass())
+        $attribute = Attribute::where('attribute_type', '=', Collection::morphName())
             ->where('handle', '=', 'name')->first();
 
         $formInput = TextInput::class;

diff --git a/packages/admin/src/Support/Actions/Traits/CreatesChildCollections.php b/packages/admin/src/Support/Actions/Traits/CreatesChildCollections.php
@@ -13,7 +13,7 @@ public function createChildCollection(Collection $parent, array|string $name)
         DB::beginTransaction();
 
         $attribute = Attribute::whereHandle('name')->whereAttributeType(
-            (new Collection)->getMorphClass()
+            Collection::morphName()
         )->first()->type;
 
         $parent->appendNode(Collection::create([

diff --git a/packages/admin/src/Support/Forms/Components/AttributeSelector.php b/packages/admin/src/Support/Forms/Components/AttributeSelector.php
@@ -57,8 +57,8 @@ public function getAttributeGroups()
             $this->getRelationship()->getParent()
         );
 
-        if ($type === (new ProductType)->getMorphClass()) {
-            $type = (new Product)->getMorphClass();
+        if ($type === ProductType::morphName()) {
+            $type = Product::morphName();
         }
 
         if ($this->attributableType) {

diff --git a/packages/admin/src/Support/Forms/Components/Attributes.php b/packages/admin/src/Support/Forms/Components/Attributes.php
@@ -26,13 +26,13 @@ protected function setUp(): void
 
                 $productTypeId = null;
 
-                $morphMap = (new $modelClass)->getMorphClass();
+                $morphMap = $modelClass::morphName();
 
                 $attributeQuery = Attribute::where('attribute_type', $morphMap);
 
                 // Products are unique in that they use product types to map attributes, so we need
                 // to try and find the product type ID
-                if ($morphMap == (new Product)->getMorphClass()) {
+                if ($morphMap == Product::morphName()) {
                     $productTypeId = $record?->product_type_id ?: ProductType::first()->id;
 
                     // If we have a product type, the attributes should be based off that.
@@ -41,7 +41,7 @@ protected function setUp(): void
                     }
                 }
 
-                if ($morphMap == (new ProductVariant)->getMorphClass()) {
+                if ($morphMap == ProductVariant::morphName()) {
                     $productTypeId = $record?->product?->product_type_id ?: ProductType::first()->id;
                     // If we have a product type, the attributes should be based off that.
                     if ($productTypeId) {

diff --git a/packages/admin/src/Support/Resources/BaseResource.php b/packages/admin/src/Support/Resources/BaseResource.php
@@ -125,7 +125,7 @@ protected static function applyGlobalSearchAttributeConstraints(Builder $query,
     protected static function mapSearchableAttributes(array &$map)
     {
         $attributes = Attribute::whereAttributeType(
-            (new (static::getModel()))->getMorphClass()
+            static::getModel()::morphName()
         )
             ->whereSearchable(true)
             ->get();

diff --git a/packages/core/database/factories/CartLineFactory.php b/packages/core/database/factories/CartLineFactory.php
@@ -15,7 +15,7 @@ public function definition(): array
         return [
             'cart_id' => Cart::factory(),
             'quantity' => $this->faker->numberBetween(0, 1000),
-            'purchasable_type' => (new ProductVariant)->getMorphClass(),
+            'purchasable_type' => ProductVariant::morphName(),
             'purchasable_id' => ProductVariant::factory(),
             'meta' => null,
         ];

diff --git a/packages/core/database/factories/DiscountPurchasableFactory.php b/packages/core/database/factories/DiscountPurchasableFactory.php
@@ -13,7 +13,7 @@ public function definition(): array
     {
         return [
             'purchasable_id' => ProductVariant::factory(),
-            'purchasable_type' => (new ProductVariant)->getMorphClass(),
+            'purchasable_type' => ProductVariant::morphName(),
         ];
     }
 }
diff --git a/packages/core/database/factories/OrderLineFactory.php b/packages/core/database/factories/OrderLineFactory.php
@@ -16,7 +16,7 @@ public function definition(): array
     {
         return [
             'order_id' => Order::factory(),
-            'purchasable_type' => (new ProductVariant)->getMorphClass(),
+            'purchasable_type' => ProductVariant::morphName(),
             'purchasable_id' => ProductVariant::factory(),
             'type' => 'physical',
             'description' => $this->faker->sentence,

diff --git a/packages/core/database/factories/UrlFactory.php b/packages/core/database/factories/UrlFactory.php
@@ -16,7 +16,7 @@ public function definition(): array
             'slug' => $this->faker->slug,
             'default' => true,
             'language_id' => Language::factory(),
-            'element_type' => (new Product)->getMorphClass(),
+            'element_type' => Product::morphName(),
             'element_id' => 1,
         ];
     }

diff --git a/packages/core/database/state/ConvertProductTypeAttributesToProducts.php b/packages/core/database/state/ConvertProductTypeAttributesToProducts.php
@@ -23,15 +23,15 @@ public function run()
 
         DB::table("{$prefix}attributes")
             ->whereAttributeType(
-                (new ProductType)->getMorphClass()
+                ProductType::morphName()
             )
             ->update([
                 'attribute_type' => 'product',
             ]);
 
         DB::table("{$prefix}attribute_groups")
             ->whereAttributableType(
-                (new ProductType)->getMorphClass()
+                ProductType::morphName()
             )
             ->update([
                 'attributable_type' => 'product',

diff --git a/packages/core/src/Base/Traits/HasAttributes.php b/packages/core/src/Base/Traits/HasAttributes.php
@@ -19,7 +19,7 @@ public function getAttributableClassnameAttribute()
 
     public function getAttributableMorphMapAttribute()
     {
-        return (new self)->getMorphClass();
+        return self::morphName();
     }
 
     /**

diff --git a/packages/core/src/Base/Traits/HasModelExtending.php b/packages/core/src/Base/Traits/HasModelExtending.php
@@ -93,6 +93,13 @@ public static function modelClass(): string
         return ModelManifest::get($contractClass) ?? static::class;
     }
 
+    /**
+     * Returns the model alias registered in the model relation morph map.
+     */
+    public static function morphName():string{
+        return (new (static::modelClass()))->getMorphClass();
+    }
+
     public function getMorphClass(): string
     {
         $morphMap = Relation::morphMap();

diff --git a/packages/core/src/Console/InstallLunar.php b/packages/core/src/Console/InstallLunar.php
@@ -140,7 +140,7 @@ public function handle(): void
                 $this->components->info('Setting up initial attributes');
 
                 $group = AttributeGroup::create([
-                    'attributable_type' => (new Product)->getMorphClass(),
+                    'attributable_type' => Product::morphName(),
                     'name' => collect([
                         'en' => 'Details',
                     ]),
@@ -149,7 +149,7 @@ public function handle(): void
                 ]);
 
                 $collectionGroup = AttributeGroup::create([
-                    'attributable_type' => (new Collection)->getMorphClass(),
+                    'attributable_type' => Collection::morphName(),
                     'name' => collect([
                         'en' => 'Details',
                     ]),
@@ -251,7 +251,7 @@ public function handle(): void
 
                 $type->mappedAttributes()->attach(
                     Attribute::whereAttributeType(
-                        (new Product)->getMorphClass()
+                        Product::morphName()
                     )->get()->pluck('id')
                 );
             }

diff --git a/packages/core/src/DiscountTypes/BuyXGetY.php b/packages/core/src/DiscountTypes/BuyXGetY.php
@@ -58,7 +58,7 @@ public function apply(Cart $cart): Cart
         // Get all purchasables that are eligible.
         $conditions = $cart->lines->reject(function ($line) {
             return ! $this->discount->purchasableConditions->first(function ($item) use ($line) {
-                return $item->purchasable_type == (new Product)->getMorphClass() &&
+                return $item->purchasable_type == Product::morphName() &&
                     $item->purchasable_id == $line->purchasable->product->id;
             });
         });
@@ -89,7 +89,7 @@ public function apply(Cart $cart): Cart
         // Get the reward lines and sort by cheapest first.
         $rewardLines = $cart->lines->filter(function ($line) {
             return $this->discount->purchasableRewards->first(function ($item) use ($line) {
-                return $item->purchasable_type == (new Product)->getMorphClass() &&
+                return $item->purchasable_type == Product::morphName() &&
                     $item->purchasable_id == $line->purchasable->product->id;
             });
         })->sortBy('subTotal.value');

diff --git a/packages/core/src/Models/Discount.php b/packages/core/src/Models/Discount.php
@@ -179,7 +179,7 @@ public function scopeProducts(Builder $query, iterable $productIds = [], array|s
             fn ($subQuery) => $subQuery->whereDoesntHave('purchasables', fn ($query) => $query->when($types, fn ($query) => $query->whereIn('type', $types)))
                 ->orWhereHas('purchasables',
                     fn ($relation) => $relation->whereIn('purchasable_id', $productIds)
-                        ->wherePurchasableType((new Product)->getMorphClass())
+                        ->wherePurchasableType(Product::morphName())
                         ->when(
                             $types,
                             fn ($query) => $query->whereIn('type', $types)
@@ -200,7 +200,7 @@ public function scopeProductVariants(Builder $query, iterable $variantIds = [],
             fn ($subQuery) => $subQuery->whereDoesntHave('purchasables', fn ($query) => $query->when($types, fn ($query) => $query->whereIn('type', $types)))
                 ->orWhereHas('purchasables',
                     fn ($relation) => $relation->whereIn('purchasable_id', $variantIds)
-                        ->wherePurchasableType((new ProductVariant)->getMorphClass())
+                        ->wherePurchasableType(ProductVariant::morphName())
                         ->when(
                             $types,
                             fn ($query) => $query->whereIn('type', $types)

diff --git a/packages/core/src/Models/ProductType.php b/packages/core/src/Models/ProductType.php
@@ -52,14 +52,14 @@ public function mappedAttributes(): MorphToMany
     public function productAttributes(): MorphToMany
     {
         return $this->mappedAttributes()->whereAttributeType(
-            (new Product)->getMorphClass()
+            Product::morphName()
         );
     }
 
     public function variantAttributes(): MorphToMany
     {
         return $this->mappedAttributes()->whereAttributeType(
-            (new ProductVariant)->getMorphClass()
+            ProductVariant::morphName()
         );
     }
 

diff --git a/packages/table-rate-shipping/database/factories/ShippingExclusionFactory.php b/packages/table-rate-shipping/database/factories/ShippingExclusionFactory.php
@@ -14,7 +14,7 @@ public function definition(): array
     {
         return [
             'purchasable_id' => 1,
-            'purchasable_type' => (new Product)->getMorphClass(),
+            'purchasable_type' => Product::morphName(),
         ];
     }
 }
diff --git a/packages/table-rate-shipping/src/Drivers/ShippingMethods/Collection.php b/packages/table-rate-shipping/src/Drivers/ShippingMethods/Collection.php
@@ -45,7 +45,7 @@ public function resolve(ShippingOptionRequest $shippingOptionRequest): ?Shipping
 
         $hasExclusions = $shippingZone->shippingExclusions()
             ->whereHas('exclusions', function ($query) use ($productIds) {
-                $query->wherePurchasableType((new Product)->getMorphClass())
+                $query->wherePurchasableType(Product::morphName())
                     ->whereIn('purchasable_id', $productIds);
             })->exists();
 

diff --git a/packages/table-rate-shipping/src/Drivers/ShippingMethods/FlatRate.php b/packages/table-rate-shipping/src/Drivers/ShippingMethods/FlatRate.php
@@ -45,7 +45,7 @@ public function resolve(ShippingOptionRequest $shippingOptionRequest): ?Shipping
 
         $hasExclusions = $shippingZone->shippingExclusions()
             ->whereHas('exclusions', function ($query) use ($productIds) {
-                $query->wherePurchasableType((new Product)->getMorphClass())
+                $query->wherePurchasableType(Product::morphName())
                     ->whereIn('purchasable_id', $productIds);
             })->exists();
 

diff --git a/packages/table-rate-shipping/src/Drivers/ShippingMethods/FreeShipping.php b/packages/table-rate-shipping/src/Drivers/ShippingMethods/FreeShipping.php
@@ -46,7 +46,7 @@ public function resolve(ShippingOptionRequest $shippingOptionRequest): ?Shipping
 
         $hasExclusions = $shippingZone->shippingExclusions()
             ->whereHas('exclusions', function ($query) use ($productIds) {
-                $query->wherePurchasableType((new Product)->getMorphClass())
+                $query->wherePurchasableType(Product::morphName())
                     ->whereIn('purchasable_id', $productIds);
             })->exists();
 

diff --git a/packages/table-rate-shipping/src/Drivers/ShippingMethods/ShipBy.php b/packages/table-rate-shipping/src/Drivers/ShippingMethods/ShipBy.php
@@ -53,7 +53,7 @@ public function resolve(ShippingOptionRequest $shippingOptionRequest): ?Shipping
 
         $hasExclusions = $shippingZone->shippingExclusions()
             ->whereHas('exclusions', function ($query) use ($productIds) {
-                $query->wherePurchasableType((new Product)->getMorphClass())
+                $query->wherePurchasableType(Product::morphName())
                     ->whereIn('purchasable_id', $productIds);
             })->exists();
 

diff --git a/tests/admin/Feature/Filament/Resources/ProductTypeResource/Pages/CreateProductTypeTest.php b/tests/admin/Feature/Filament/Resources/ProductTypeResource/Pages/CreateProductTypeTest.php
@@ -54,7 +54,7 @@
         ->assertHasNoFormErrors();
 
     $this->assertDatabaseHas((new ProductType)->mappedAttributes()->getTable(), [
-        'attributable_type' => (new ProductType)->getMorphClass(),
+        'attributable_type' => ProductType::morphName(),
         'attributable_id' => $component->get('record')->id,
     ]);
 });
diff --git a/tests/admin/Feature/Filament/Resources/ProductTypeResource/Pages/EditProductTypeTest.php b/tests/admin/Feature/Filament/Resources/ProductTypeResource/Pages/EditProductTypeTest.php
@@ -26,13 +26,13 @@
         ->assertHasNoFormErrors();
 
     $this->assertDatabaseHas((new ProductType)->mappedAttributes()->getTable(), [
-        'attributable_type' => (new ProductType)->getMorphClass(),
+        'attributable_type' => ProductType::morphName(),
         'attributable_id' => $component->get('record')->id,
         'attribute_id' => $attributeA->id,
     ]);
 
     $this->assertDatabaseHas((new ProductType)->mappedAttributes()->getTable(), [
-        'attributable_type' => (new ProductType)->getMorphClass(),
+        'attributable_type' => ProductType::morphName(),
         'attributable_id' => $component->get('record')->id,
         'attribute_id' => $attributeB->id,
     ]);
@@ -46,13 +46,13 @@
         ->assertHasNoFormErrors();
 
     $this->assertDatabaseHas((new ProductType)->mappedAttributes()->getTable(), [
-        'attributable_type' => (new ProductType)->getMorphClass(),
+        'attributable_type' => ProductType::morphName(),
         'attributable_id' => $component->get('record')->id,
         'attribute_id' => $attributeA->id,
     ]);
 
     $this->assertDatabaseMissing((new ProductType)->mappedAttributes()->getTable(), [
-        'attributable_type' => (new ProductType)->getMorphClass(),
+        'attributable_type' => ProductType::morphName(),
         'attributable_id' => $component->get('record')->id,
         'attribute_id' => $attributeB->id,
     ]);

diff --git a/tests/core/Unit/Base/Traits/HasModelExtendingTest.php b/tests/core/Unit/Base/Traits/HasModelExtendingTest.php
@@ -60,7 +60,11 @@ function () {
     );
 
     expect((new \Lunar\Tests\Core\Stubs\Models\CustomProduct)->getMorphClass())
+        ->toBe('product')
+        ->and(\Lunar\Tests\Core\Stubs\Models\CustomProduct::morphName())
         ->toBe('product')
         ->and((new Product)->getMorphClass())
+        ->toBe('product')
+        ->and(Product::morphName())
         ->toBe('product');
 });