From 159665bc53af4de2212efe77ab037885d4fbc596 Mon Sep 17 00:00:00 2001 From: Jade Date: Wed, 31 Dec 2025 09:20:20 +0100 Subject: [PATCH 1/3] Rapidez v5 compatibility --- composer.json | 4 ++-- src/Commands/InvalidateCacheCommand.php | 10 +++++----- src/Models/Product.php | 18 +++--------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index aef4155..ad84190 100644 --- a/composer.json +++ b/composer.json @@ -33,8 +33,8 @@ "php": "^8.1", "justbetter/statamic-glide-directive": "^3.0", "rapidez/blade-directives": "^1.0", - "rapidez/core": "^4.0", - "rapidez/sitemap": "^4.0", + "rapidez/core": "^5.0", + "rapidez/sitemap": "^5.0", "spatie/once": "*", "statamic-rad-pack/runway": "^8.3", "statamic/cms": "^5.55", diff --git a/src/Commands/InvalidateCacheCommand.php b/src/Commands/InvalidateCacheCommand.php index 6885ffc..c7c086b 100644 --- a/src/Commands/InvalidateCacheCommand.php +++ b/src/Commands/InvalidateCacheCommand.php @@ -75,18 +75,18 @@ public function handle(Cacher $cacher, Writer $writer): void protected function addProductsUrls(): self { - $products = config('rapidez.models.product')::withoutGlobalScopes() + $products = config('rapidez.models.product')::query() ->where('updated_at', '>=', $this->latestCheck) ->orWhereIn('entity_id', $this->getUpdatedStockProducts()) - ->with(['parent:entity_id' => ['rewrites']]) + ->with(['parents:entity_id' => ['rewrites']]) ->with('rewrites') - ->get('entity_id'); + ->get(); foreach ($products as $product) { $this->addUrls($this->getUrlsFromRewrites($product->rewrites)); - if ($product->parent) { - $this->addUrls($this->getUrlsFromRewrites($product->parent->rewrites)); + foreach ($product->parents as $parent) { + $this->addUrls($this->getUrlsFromRewrites($parent->rewrites)); } } diff --git a/src/Models/Product.php b/src/Models/Product.php index 743d557..a7b4a81 100644 --- a/src/Models/Product.php +++ b/src/Models/Product.php @@ -4,22 +4,15 @@ use Illuminate\Database\Eloquent\Attributes\ObservedBy; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; -use Rapidez\Statamic\Collections\Products; +use Rapidez\Core\Models\Product as CoreProduct; use Rapidez\Statamic\Models\Traits\HasContentEntry; use Rapidez\Statamic\Observers\RunwayObserver; use StatamicRadPack\Runway\Traits\HasRunwayResource; -use Statamic\Facades\Site; -use Statamic\Statamic; -use Rapidez\Statamic\Facades\RapidezStatamic; #[ObservedBy([RunwayObserver::class])] -class Product extends Model +class Product extends CoreProduct { use HasRunwayResource, HasContentEntry; - - protected $primaryKey = 'sku'; - protected $keyType = 'string'; public string $linkField = 'linked_product'; public string $collection = 'products'; @@ -27,12 +20,7 @@ class Product extends Model protected static function booting() { static::addGlobalScope(function (Builder $builder) { - $builder->whereIn('visibility', config('rapidez.statamic.runway.product_visibility')); + $builder->whereInAttribute('visibility', config('rapidez.statamic.runway.product_visibility')); }); } - - public function getTable() - { - return 'catalog_product_flat_' . RapidezStatamic::getCurrentStoreId(); - } } From d329d047d8fd9047982ada442bd841a6162099fa Mon Sep 17 00:00:00 2001 From: indy koning Date: Mon, 12 Jan 2026 11:00:49 +0100 Subject: [PATCH 2/3] Fixed undefined Vue --- resources/js/components/FormConditions.vue | 6 ++++-- resources/js/components/FormSubmission.vue | 8 +++++--- resources/js/package.js | 14 +++++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/resources/js/components/FormConditions.vue b/resources/js/components/FormConditions.vue index a3c23b5..f9ce30d 100644 --- a/resources/js/components/FormConditions.vue +++ b/resources/js/components/FormConditions.vue @@ -1,6 +1,8 @@