fix: fix bug on single product page and store page

Author: cybersoldattech

.gitignore

@@ -7,6 +7,7 @@
 /public/**/filament
 /public/uploads
 /storage/*.key
+/storage/media-library
 /vendor
 .env
 .env.backup

app/Livewire/Pages/SingleProduct.php

@@ -5,6 +5,7 @@
 namespace App\Livewire\Pages;
 
 use App\Models\Product;
+use App\Models\ProductVariant;
 use Illuminate\Contracts\View\View;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Url;
@@ -14,13 +15,14 @@ final class SingleProduct extends Component
 {
     public Product $product;
 
+    public ?ProductVariant $selectedVariant = null;
+
     #[Url(except: '')]
     public string $variant = '';
 
     public function mount(): void
     {
         abort_unless($this->product->isPublished(), 404);
-
         $this->product->load([
             'brand',
             'media',
@@ -30,6 +32,11 @@ public function mount(): void
             },
             'prices.currency',
         ]);
+
+        $this->selectedVariant = ($this->variant) ? ProductVariant::query()
+            ->with(['media'])
+            ->where('id', $this->variant)
+            ->firstOrFail() : null;
     }
 
     #[Computed]
@@ -41,7 +48,7 @@ public function averageRating(): float
     public function render(): View
     {
         return view('livewire.pages.single-product', [
-            'selectedVariant' => null,
+            'selectedVariant' => $this->selectedVariant,
         ])
             ->title($this->product->name);
     }

app/Livewire/Pages/Store.php

@@ -21,7 +21,7 @@ class Store extends Component
 
     public function render(): View
     {
-        $query = Product::with(['media', 'attributes', 'prices', 'prices.currency'])
+        $query = Product::with(['media', 'options', 'prices', 'prices.currency'])
             ->scopes(['publish'])
             ->latest();
 

app/Livewire/VariantsSelector.php

@@ -5,6 +5,7 @@
 namespace App\Livewire;
 
 use App\Models\Product;
+use App\Models\ProductVariant;
 use Darryldecode\Cart\Facades\CartFacade;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
@@ -14,21 +15,31 @@ final class VariantsSelector extends Component
 {
     public Product $product;
 
-    public ?Product $selectedVariant = null;
+    public ?ProductVariant $selectedVariant = null;
+
+    public function mount(): void
+    {
+        $this->selectedVariant?->load([
+            'prices' => function ($query) {
+                $query->whereRelation('currency', 'code', current_currency());
+            },
+            'prices.currency',
+        ]);
+    }
 
     public function addToCart(): void
     {
+        $price = $this->selectedVariant && $this->selectedVariant->getPrice()
+            ? $this->selectedVariant->getPrice()->amount->amount
+            : $this->product->getPrice()->amount->amount;
+
         // @phpstan-ignore-next-line
         CartFacade::session(session()->getId())->add([
-            'id' => $this->selectedVariant ? $this->selectedVariant->id : $this->product->id,
-            'name' => $this->selectedVariant
-                ? $this->product->name . ' / ' . $this->selectedVariant->name
-                : $this->product->name,
-            'price' => $this->selectedVariant && $this->selectedVariant->price_amount
-                ? $this->selectedVariant->price_amount
-                : $this->product->price_amount,
+            'id' => $this->product->id,
+            'name' => $this->product->name,
+            'price' => $price,
             'quantity' => 1,
-            'associatedModel' => $this->selectedVariant?->load('parent') ?? $this->product,
+            'associatedModel' => $this->selectedVariant ?? $this->product,
         ]);
 
         $this->dispatch('cartUpdated');

resources/views/livewire/components/variants-selector.blade.php

@@ -7,7 +7,7 @@
             <div class="mt-4 grid grid-cols-2 gap-4 sm:grid-cols-4">
                 @foreach ($product->variants as $variant)
                     <x-link
-                        :href="route('single-product', ['product' => $product , 'variant'=> $variant->slug])"
+                        :href="route('single-product', ['product' => $product , 'variant'=> $variant])"
                         @class([
                             'inline-flex items-center justify-center text-gray-500 font-medium hover:text-gray-900 px-3 py-2.5 rounded-md',
                             'border border-gray-200',