Merge pull request #26 from shopperlabs/feature/sho-54-amelioration-de-la-page-detail-produit

feat:[SHO-54] add products variants in single product detail page and…

Author: cybersoldattech

app/Livewire/Pages/Category/CategoryProducts.php

@@ -5,20 +5,29 @@
 namespace App\Livewire\Pages\Category;
 
 use App\Models\Category;
+use App\Models\Product;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Builder;
 use Livewire\Component;
 
 final class CategoryProducts extends Component
 {
     public Category $category;
 
-    public function mount(string $slug): void
+    public function mount(): void
     {
-        $this->category = Category::with('products')->where('slug', $slug)->firstOrFail();
+        abort_unless($this->category->is_enabled, 404);
     }
 
     public function render(): View
     {
-        return view('livewire.category.category-products', ['products' => $this->category->products]);
+        return view('livewire.category.category-products', [
+            'products' => Product::with('media', 'categories')
+                ->scopes('publish')
+                ->whereHas('categories', function ($query): void {
+                    $query->where('id', $this->category->id);
+                })
+                ->get(),
+        ]);
     }
 }

app/Livewire/Pages/Collection/CollectionProducts.php

@@ -5,20 +5,23 @@
 namespace App\Livewire\Pages\Collection;
 
 use App\Models\Collection;
+use App\Models\Product;
 use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class CollectionProducts extends Component
 {
     public Collection $collection;
 
-    public function mount(string $slug): void
-    {
-        $this->collection = Collection::with('products')->where('slug', $slug)->firstOrFail();
-    }
-
     public function render(): View
     {
-        return view('livewire.collection.collection-products', ['products' => $this->collection->products]);
+        return view('livewire.collection.collection-products', [
+            'products' => Product::with('media', 'collections')
+                ->scopes('publish')
+                ->whereHas('collections', function ($query): void {
+                    $query->where('id', $this->collection->id);
+                })
+                ->get(),
+        ]);
     }
 }

app/Livewire/Pages/SingleProduct.php

@@ -6,23 +6,36 @@
 
 use App\Models\Product;
 use Illuminate\Contracts\View\View;
+use Livewire\Attributes\Url;
 use Livewire\Component;
 
 final class SingleProduct extends Component
 {
-    public ?Product $product = null;
+    public Product $product;
 
-    public function mount(string $slug): void
+    #[Url(except: '')]
+    public string $variant = '';
+
+    public function mount(Product $product): void
     {
-        $this->product = Product::with(['brand', 'media', 'attributes', 'relatedProducts'])
-            ->scopes('publish')
-            ->where('slug', $slug)
-            ->firstOrFail();
+        abort_unless($product->isPublished(), 404);
+
+        $this->product = $product->load([
+            'media',
+            'relatedProducts',
+            'variants',
+            'variants.media',
+        ]);
     }
 
     public function render(): View
     {
-        return view('livewire.pages.single-product')
+        return view('livewire.pages.single-product', [
+            'selectedVariant' => Product::with('media')
+                ->where('slug', $this->variant)
+                ->select('name', 'slug', 'sku', 'id', 'price_amount', 'old_price_amount')
+                ->first(),
+        ])
             ->title($this->product->name);
     }
 }

app/Livewire/Pages/Store.php

@@ -14,12 +14,16 @@ class Store extends Component
 {
     use WithPagination;
 
-    /** @var string[] */
+    /**
+     * @var string[]
+     */
     public array $selectedAttributes = [];
 
     public function render(): View
     {
-        $query = Product::with(['media', 'attributes'])->scopes('parent');
+        $query = Product::with(['media', 'attributes'])
+            ->scopes(['parent', 'publish'])
+            ->latest();
 
         if (count($this->selectedAttributes) > 0) {
             $query = $query->whereHas('attributes', function ($query) {

app/Livewire/VariantsSelector.php

@@ -14,25 +14,28 @@ final class VariantsSelector extends Component
 {
     public Product $product;
 
+    public ?Product $selectedVariant = null;
+
     public function addToCart(): void
     {
-        $this->product->loadMissing('media');
-
         // @phpstan-ignore-next-line
         CartFacade::session(session()->getId())->add([
-            'id' => $this->product->id,
-            'name' => $this->product->name,
-            'price' => $this->product->price_amount,
+            '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,
             'quantity' => 1,
-            'attributes' => [],
-            'associatedModel' => $this->product,
+            'associatedModel' => $this->selectedVariant?->load('parent') ?? $this->product,
         ]);
 
         $this->dispatch('cartUpdated');
 
         Notification::make()
             ->title(__('Cart updated'))
-            ->body(__('Product has been added to cart'))
+            ->body(__('Product / variant has been added to your cart'))
             ->success()
             ->send();
     }

app/Models/Product.php

@@ -5,13 +5,25 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Shopper\Core\Models\Product as Model;
 
 final class Product extends Model
 {
-    /**
-     * Scope a query to only include product parent.
-     */
+    public function isPublished(): bool
+    {
+        return $this->is_visible && $this->published_at && $this->published_at <= now();
+    }
+
+    public function discountPercentage(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => $this->old_price_amount > 0
+                ? round((($this->old_price_amount - $this->price_amount) / $this->old_price_amount) * 100)
+                : 0
+        );
+    }
+
     public function scopeParent(Builder $query): void
     {
         $query->whereNull('parent_id');

app/Providers/LivewireStarterKitProvider.php

@@ -5,7 +5,6 @@
 namespace App\Providers;
 
 use App\View\Composers\CategoriesNavigation;
-use App\View\Composers\CollectionsNavigation;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 
@@ -24,6 +23,5 @@ public function boot(): void
     private function loadViewsComposer(): void
     {
         View::composer('components.layouts.header', CategoriesNavigation::class);
-        View::composer('components.layouts.header', CollectionsNavigation::class);
     }
 }