feat: upgrade shopper version (#34)

* feat: upgrade shopper version

* feat: update shopper and fix home page

Author: mckenziearts

.env.example

@@ -8,19 +8,25 @@ LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_DATABASE=shopper
-# DB_USERNAME=root
-# DB_PASSWORD=
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=shopper
+DB_USERNAME=root
+DB_PASSWORD=
+
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
 
 BROADCAST_DRIVER=log
-CACHE_DRIVER=file
 FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
+
+CACHE_STORE=file
+CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 

app/DTO/PriceData.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Shopper\Core\Helpers\Price;
+
+final class PriceData
+{
+    public function __construct(
+        public Price $amount,
+        public ?Price $compare,
+        public ?float $percentage,
+    ) {}
+}

app/Livewire/Modals/Customer/AddressForm.php

@@ -6,7 +6,6 @@
 
 use App\Actions\CountriesWithZone;
 use App\Actions\ZoneSessionManager;
-use App\Models\Country;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
@@ -15,6 +14,7 @@
 use LivewireUI\Modal\ModalComponent;
 use Shopper\Core\Enum\AddressType;
 use Shopper\Core\Models\Address;
+use Shopper\Core\Models\Country;
 
 final class AddressForm extends ModalComponent
 {

app/Livewire/Modals/ZoneSelector.php

@@ -35,6 +35,7 @@ public function selectZone(int $countryId): void
 
         if ($selectedZone->countryId !== ZoneSessionManager::getSession()?->countryId) {
             ZoneSessionManager::setSession($selectedZone);
+
             session()->forget('checkout');
 
             $this->dispatch('zoneChanged');

app/Livewire/Pages/Home.php

@@ -16,7 +16,16 @@ final class Home extends Component
     public function render(): View
     {
         return view('livewire.pages.home', [
-            'products' => Product::with(['brand', 'media'])
+            'products' => Product::query()
+                ->select('id', 'name', 'slug', 'brand_id')
+                ->with([
+                    'brand',
+                    'media',
+                    'prices' => function ($query) {
+                        $query->whereRelation('currency', 'code', current_currency());
+                    },
+                    'prices.currency',
+                ])
                 ->scopes('publish')
                 ->limit(8)
                 ->get(),

app/Livewire/Pages/SingleProduct.php

@@ -17,31 +17,31 @@ final class SingleProduct extends Component
     #[Url(except: '')]
     public string $variant = '';
 
-    public function mount(Product $product): void
+    public function mount(): void
     {
-        abort_unless($product->isPublished(), 404);
+        abort_unless($this->product->isPublished(), 404);
 
-        $this->product = $product->load([
+        $this->product->load([
+            'brand',
             'media',
             'relatedProducts',
-            'variants',
-            'variants.media',
+            'prices' => function ($query) {
+                $query->whereRelation('currency', 'code', current_currency());
+            },
+            'prices.currency',
         ]);
     }
 
     #[Computed]
-    public function getAverageRatingProperty(): float
+    public function averageRating(): float
     {
         return floatval($this->product->averageRating(1)->first());
     }
 
     public function render(): View
     {
         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(),
+            'selectedVariant' => null,
         ])
             ->title($this->product->name);
     }

app/Livewire/Pages/Store.php

@@ -21,8 +21,8 @@ class Store extends Component
 
     public function render(): View
     {
-        $query = Product::with(['media', 'attributes'])
-            ->scopes(['parent', 'publish'])
+        $query = Product::with(['media', 'attributes', 'prices', 'prices.currency'])
+            ->scopes(['publish'])
             ->latest();
 
         if (count($this->selectedAttributes) > 0) {

app/Models/Country.php

@@ -4,28 +4,15 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Casts\Attribute;
+use App\Traits\HasProductPricing;
 use Shopper\Core\Models\Product as Model;
 
 final class Product extends Model
 {
+    use HasProductPricing;
+
     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/Models/Product.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use App\Traits\HasProductPricing;
+use Shopper\Core\Models\ProductVariant as Model;
+
+final class ProductVariant extends Model
+{
+    use HasProductPricing;
+}