Merge branch '1.x' into feature/support-highest-shipping-rate-in-ship…

…ping-tables
lunarphp · Oct 22, 2024 · 093c2b6 · 093c2b6
2 parents 4c8841a + 5266054
commit 093c2b6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.../admin/src/Filament/Resources/CustomerResource/RelationManagers/OrdersRelationManager.php b/.../admin/src/Filament/Resources/CustomerResource/RelationManagers/OrdersRelationManager.php
@@ -6,6 +6,7 @@
 use Filament\Tables\Table;
 use Lunar\Admin\Filament\Resources\OrderResource;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
+use Lunar\Admin\Filament\Resources\OrderResource\Pages\ManageOrder;
 use Lunar\Models\Order;
 
 class OrdersRelationManager extends BaseRelationManager
@@ -18,7 +19,7 @@ public function getDefaultTable(Table $table): Table
             OrderResource::getTableColumns()
         )->actions([
             Tables\Actions\Action::make('viewOrder')
-                ->url(fn (Order $record): string => route('filament.lunar.resources.orders.order', $record)),
+                ->url(fn (Order $record): string => ManageOrder::getUrl(['record' => $record])),
         ]);
     }
 }
diff --git a/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php b/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php
@@ -27,7 +27,7 @@ protected function getDefaultHeaderActions(): array
                 static::createActionFormInputs()
             )->using(
                 fn (array $data, string $model) => static::createRecord($data, $model)
-            )->successRedirectUrl(fn (Model $record): string => route('filament.lunar.resources.products.edit', [
+            )->successRedirectUrl(fn (Model $record): string => ProductResource::getUrl('edit', [
                 'record' => $record,
             ])),
         ];

diff --git a/packages/admin/src/Support/Forms/Components/Attributes.php b/packages/admin/src/Support/Forms/Components/Attributes.php
@@ -86,7 +86,7 @@ protected function setUp(): void
             }
 
             foreach ($state as $key => $value) {
-                if (! $value instanceof \Lunar\Base\Fieldtype) {
+                if (! $value instanceof \Lunar\Base\FieldType) {
                     continue;
                 }
 

diff --git a/packages/core/database/state/EnsureMediaCollectionsAreRenamed.php b/packages/core/database/state/EnsureMediaCollectionsAreRenamed.php
@@ -35,7 +35,7 @@ protected function shouldRun()
     protected function getOutdatedMediaQuery()
     {
         return DB::table(app(config('media-library.media_model'))->getTable())
-            ->whereIn('model_type', [Product::class, Collection::class, Brand::class])
+            ->whereIn('model_type', [Product::morphName(), Collection::morphName(), Brand::morphName()])
             ->where('collection_name', 'products');
     }
 }
diff --git a/packages/core/src/DiscountTypes/AbstractDiscountType.php b/packages/core/src/DiscountTypes/AbstractDiscountType.php
@@ -64,7 +64,7 @@ protected function checkDiscountConditions(Cart $cart): bool
 
         $validCoupon = $cartCoupon ? ($cartCoupon === $conditionCoupon) : blank($conditionCoupon);
 
-        $minSpend = ($data['min_prices'][$cart->currency->code] ?? 0) / $cart->currency->factor;
+        $minSpend = (int) ($data['min_prices'][$cart->currency->code] ?? 0) / (int) $cart->currency->factor;
         $minSpend = (int) bcmul($minSpend, $cart->currency->factor);
 
         $lines = $this->getEligibleLines($cart);

diff --git a/packages/core/src/Observers/OrderLineObserver.php b/packages/core/src/Observers/OrderLineObserver.php
@@ -32,8 +32,12 @@ public function creating(OrderLine $orderLine)
      */
     public function updating(OrderLine $orderLine)
     {
-        if (! in_array(Purchasable::class, class_implements($orderLine->purchasable_type, true))) {
-            throw new NonPurchasableItemException($orderLine->purchasable_type);
+        $purchasableModel = class_exists($orderLine->purchasable_type) ?
+            $orderLine->purchasable_type :
+            Relation::getMorphedModel($orderLine->purchasable_type);
+
+        if (! $purchasableModel || ! in_array(Purchasable::class, class_implements($purchasableModel, true))) {
+            throw new NonPurchasableItemException($purchasableModel);
         }
     }
 }