From 2560039fa6dbe7c50b2e434d651b29026b5606fd Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 19 Dec 2025 10:36:48 +0100
Subject: [PATCH 1/5] Added external video support

---
 config/rapidez/models.php                     |  1 +
 resources/js/components/Product/Images.vue    |  8 ++-
 .../product/partials/gallery/popup.blade.php  | 18 ++++-
 .../product/partials/gallery/slider.blade.php | 25 +++++--
 .../partials/gallery/thumbnails.blade.php     | 14 ++--
 .../gallery/thumbnails/show-more.blade.php    |  8 +--
 .../views/product/partials/images.blade.php   |  2 +-
 src/Http/Controllers/ProductController.php    |  1 +
 src/Models/Product.php                        | 15 ++++
 src/Models/ProductImage.php                   |  7 +-
 src/Models/ProductVideoValue.php              | 10 +++
 src/RapidezServiceProvider.php                | 72 +++++++++++++++++++
 12 files changed, 158 insertions(+), 23 deletions(-)
 create mode 100644 src/Models/ProductVideoValue.php

diff --git a/config/rapidez/models.php b/config/rapidez/models.php
index 3204acc45..719de666b 100644
--- a/config/rapidez/models.php
+++ b/config/rapidez/models.php
@@ -22,6 +22,7 @@
     'product'                   => Rapidez\Core\Models\Product::class,
     'product_image'             => Rapidez\Core\Models\ProductImage::class,
     'product_image_value'       => Rapidez\Core\Models\ProductImageValue::class,
+    'product_video_value'       => Rapidez\Core\Models\ProductVideoValue::class,
     'product_link'              => Rapidez\Core\Models\ProductLink::class,
     'product_option'            => Rapidez\Core\Models\ProductOption::class,
     'product_option_price'      => Rapidez\Core\Models\ProductOptionPrice::class,
diff --git a/resources/js/components/Product/Images.vue b/resources/js/components/Product/Images.vue
index 613e53857..8401a18f2 100644
--- a/resources/js/components/Product/Images.vue
+++ b/resources/js/components/Product/Images.vue
@@ -4,6 +4,7 @@ import { useEventListener } from '@vueuse/core'
 export default {
     data: () => ({
         images: config.product.images,
+        media: config.product.product_gallery,
         active: 0,
         zoomed: false,
         touchStartX: 0,
@@ -32,7 +33,8 @@ export default {
                     ).length
                 ) {
                     self.images = simpleProduct.images
-                    self.active = Math.min(self.active, self.images.length - 1)
+                    self.media = simpleProduct.product_gallery
+                    self.active = Math.min(self.active, self.media.length - 1)
                 }
             })
         })
@@ -54,7 +56,7 @@ export default {
             if (e.key == 'ArrowLeft' && this.active > 0) {
                 // left
                 this.active--
-            } else if (e.key == 'ArrowRight' && this.active < this.images.length - 1) {
+            } else if (e.key == 'ArrowRight' && this.active < this.media.length - 1) {
                 // right
                 this.active++
             } else if (e.key == 'Escape') {
@@ -79,7 +81,7 @@ export default {
                 return
             }
 
-            if (distance < 0 && this.active < this.images.length - 1) {
+            if (distance < 0 && this.active < this.media.length - 1) {
                 this.change(this.active + 1)
             } else if (distance > 0 && this.active > 0) {
                 this.change(this.active - 1)
diff --git a/resources/views/product/partials/gallery/popup.blade.php b/resources/views/product/partials/gallery/popup.blade.php
index 1959bbaec..642ff12f1 100644
--- a/resources/views/product/partials/gallery/popup.blade.php
+++ b/resources/views/product/partials/gallery/popup.blade.php
@@ -1,11 +1,23 @@
-<div v-if="images.length && zoomed" class="fixed inset-0 bg-white cursor-zoom-out flex z-popup" v-cloak>
+<div v-if="media.length && zoomed" class="fixed inset-0 bg-white cursor-zoom-out flex z-popup" v-cloak>
     <div class="flex flex-1 items-center justify-center" v-on:click.prevent="toggleZoom">
         <img
-            :src="config.media_url + '/catalog/product' + images[active]"
+            v-if="media[active].media_type === 'image'"
+            :src="config.media_url + '/catalog/product' + media[active].image"
             alt="{{ $product->name }}"
             class="object-contain max-h-full mx-auto block"
             loading="lazy"
         />
+        <iframe
+            v-else-if="media[active].media_type === 'external-video'"
+            class="h-[calc(100%-200px)] w-[calc(100%-200px)]"
+            :src="media[active].video_url"
+            allow="autoplay"
+            width="100%"
+            height="100%"
+            frameborder="0"
+            loading="lazy"
+        >
+        </iframe>
         <div class="z-popup-actions pointer-events-none fixed top-3 right-3">
             <x-heroicon-o-x-mark class="size-6" />
         </div>
@@ -13,7 +25,7 @@ class="object-contain max-h-full mx-auto block"
     <button class="z-popup-actions top-1/2 left-3 -translate-y-1/2 absolute" v-if="active" v-on:click="change(active-1)" aria-label="@lang('Prev')">
         <x-heroicon-o-chevron-left class="size-8 text-muted" />
     </button>
-    <button class="z-popup-actions top-1/2 right-3 -translate-y-1/2 absolute" v-if="active != images.length-1" v-on:click="change(active+1)" aria-label="@lang('Next')">
+    <button class="z-popup-actions top-1/2 right-3 -translate-y-1/2 absolute" v-if="active != media.length-1" v-on:click="change(active+1)" aria-label="@lang('Next')">
         <x-heroicon-o-chevron-right class="size-8 text-muted" />
     </button>
 </div>
diff --git a/resources/views/product/partials/gallery/slider.blade.php b/resources/views/product/partials/gallery/slider.blade.php
index 7d874480c..8bbc9ea09 100644
--- a/resources/views/product/partials/gallery/slider.blade.php
+++ b/resources/views/product/partials/gallery/slider.blade.php
@@ -1,13 +1,14 @@
-<div class="relative" v-if="images.length">
+<div class="relative" v-if="media.length">
     <a
         v-on:click.prevent="toggleZoom"
-        v-bind:href="config.media_url + '/catalog/product' + images[active]"
+        v-bind:href="config.media_url + '/catalog/product' + media[active].image"
         class="flex h-[440px] cursor-zoom-in items-center justify-center rounded border p-5"
     >
         <img
             {{-- src should always be below v-bind:src --}}
-            v-bind:src="window.url('/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product' + images[active] + '.webp')"
-            src="{{ url('/storage/'.config('rapidez.store').'/resizes/400/magento/catalog/product'.Arr::first($selectedChild->images).'.webp') }}"
+            v-if="media[active].media_type === 'image'"
+            v-bind:src="window.url('/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product' + media[active].image + '.webp')"
+            src="{{ url('/storage/'.config('rapidez.store').'/resizes/400/magento/catalog/product'.Arr::first($selectedChild->product_gallery)['image'].'.webp') }}"
             alt="{{ $product->name }}"
             class="max-h-full object-contain"
             style="view-transition-name: image-{{ $product->sku }}"
@@ -15,13 +16,25 @@ class="max-h-full object-contain"
             width="400"
             height="400"
         />
+        <iframe
+            v-else-if="media[active].media_type === 'external-video'"
+            v-cloak
+            class="h-full w-full"
+            :src="media[active].video_url"
+            allow="autoplay"
+            width="100%"
+            height="100%"
+            frameborder="0"
+            loading="lazy"
+        >
+        </iframe>
     </a>
 
-    @if (count($selectedChild->images ?? []) > 1)
+    @if (count($selectedChild->product_gallery ?? []) > 1)
         <button v-if="active" v-on:click="change(active-1)" class="z-10 top-1/2 left-3 -translate-y-1/2 absolute" aria-label="@lang('Prev')" v-cloak>
             <x-heroicon-o-chevron-left class="size-8 text" />
         </button>
-        <button v-if="active != images.length-1" v-on:click="change(active+1)" class="z-10 top-1/2 right-3 -translate-y-1/2 absolute" aria-label="@lang('Next')">
+        <button v-if="active != media.length-1" v-on:click="change(active+1)" class="z-10 top-1/2 right-3 -translate-y-1/2 absolute" aria-label="@lang('Next')">
             <x-heroicon-o-chevron-right class="size-8 text" />
         </button>
     @endif
diff --git a/resources/views/product/partials/gallery/thumbnails.blade.php b/resources/views/product/partials/gallery/thumbnails.blade.php
index 92ee9b478..2f4ca885f 100644
--- a/resources/views/product/partials/gallery/thumbnails.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails.blade.php
@@ -10,8 +10,8 @@
     @for ($imageId = 0; $imageId < max($breakpoints); $imageId++)
         <button
             @attributes([
-                'v-cloak' => !($imageId < count($selectedChild->images) && count($selectedChild->images) > 1),
-                'v-if' => $imageId . ' < images.length && images.length > 1',
+                'v-cloak' => !($imageId < count($selectedChild->product_gallery) && count($selectedChild->product_gallery) > 1),
+                'v-if' => $imageId . ' < media.length && media.length > 1',
             ])
             @class([
                 'max-w-24 relative flex aspect-square flex-1 items-center justify-center overflow-hidden rounded border bg-white p-1.5 outline-primary transition-all',
@@ -30,10 +30,14 @@
         >
             <img
                 {{-- src should always be above v-bind:src --}}
-                @if ($imageId < count($selectedChild->images))
-                    src="{{ url('/storage/'.config('rapidez.store').'/resizes/80x80/magento/catalog/product'.$selectedChild->images[$imageId].'.webp') }}"
+                @if ($imageId < count($selectedChild->product_gallery))
+                    @if($selectedChild->product_gallery[$imageId]['media_type'] === 'external-video')
+                        src="{{ config('rapidez.media_url')  }}/catalog/product{{ $selectedChild->product_gallery[$imageId]['image'] }}"
+                    @else
+                        src="{{ url('/storage/'.config('rapidez.store').'/resizes/80x80/magento/catalog/product'.$selectedChild->product_gallery[$imageId]['image'].'.webp') }}"
+                    @endif
                 @endif
-                v-bind:src="window.url('/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + images[{{ $imageId }}] + '.webp')"
+                v-bind:src="window.url(media[{{ $imageId }}].media_type === 'external-video' ? window.config.media_url + '/catalog/product' + media[{{ $imageId }}].image : '/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + media[{{ $imageId }}].image + '.webp')"
                 alt="{{ $product->name }}"
                 class="block max-h-full w-auto object-contain"
                 width="80"
diff --git a/resources/views/product/partials/gallery/thumbnails/show-more.blade.php b/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
index bf7417734..b7e75b1d8 100644
--- a/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
@@ -1,8 +1,8 @@
 {{-- This component shows an overlay on the last shown thumbnail if there are more thumbnails after it. --}}
 
 <div @attributes([
-    'v-cloak' => !(count($selectedChild->images) - $imageId - 1),
-    'v-if' => 'images.length - ' . $imageId . ' - 1',
+    'v-cloak' => !(count($selectedChild->product_gallery) - $imageId - 1),
+    'v-if' => 'media.length - ' . $imageId . ' - 1',
 ])>
     <span
         @class([
@@ -17,9 +17,9 @@
     >
         <span
             class="size-9 flex items-center justify-center rounded-full bg-white text-sm font-bold text shadow-md"
-            v-txt="'+' + (images.length - {{ $imageId }} - 1)"
+            v-txt="'+' + (media.length - {{ $imageId }} - 1)"
         >
-            +{{ count($selectedChild->images) - $imageId - 1 }}
+            +{{ count($selectedChild->product_gallery) - $imageId - 1 }}
         </span>
     </span>
 </div>
diff --git a/resources/views/product/partials/images.blade.php b/resources/views/product/partials/images.blade.php
index 8b7956871..38afb1f16 100644
--- a/resources/views/product/partials/images.blade.php
+++ b/resources/views/product/partials/images.blade.php
@@ -1,5 +1,5 @@
 <div class="relative flex flex-col flex-1">
-    <images v-slot="{ images, active, zoomed, toggleZoom, change }">
+    <images v-slot="{ images, media, active, zoomed, toggleZoom, change }">
         <div class="flex-1" ref="root">
             <div class="sticky top-5 bg-white">
                 @include('rapidez::product.partials.gallery.slider')
diff --git a/src/Http/Controllers/ProductController.php b/src/Http/Controllers/ProductController.php
index 2c8a1bef5..5c504c71a 100644
--- a/src/Http/Controllers/ProductController.php
+++ b/src/Http/Controllers/ProductController.php
@@ -34,6 +34,7 @@ public function show(int $productId)
             'special_price',
             'prices',
             'images',
+            'product_gallery',
             'url',
             'in_stock',
             'min_sale_qty',
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 30d4469ce..4ca313e74 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Relations\BelongsToManyCallback;
 use Rapidez\Core\Models\Scopes\Product\EnabledScope;
@@ -57,6 +58,7 @@ class Product extends Model
     protected $appends = [
         'grouped',
         'images',
+        'product_gallery',
         'in_stock',
         'price',
         'special_price',
@@ -102,6 +104,19 @@ public function gallery(): BelongsToMany
         );
     }
 
+    protected function productGallery(): Attribute
+    {
+        return Attribute::get(
+            fn (): array => $this->gallery->sortBy('productImageValue.position')->map(function (ProductImage $value) {
+                return [
+                    'media_type' => $value->media_type,
+                    'image'      => $value->value,
+                    'video_url'  => isset($value->video) ? Str::embedUrl($value->video->url) : null,
+                ];
+            })->values()->toArray()
+        );
+    }
+
     protected function images(): Attribute
     {
         return Attribute::get(
diff --git a/src/Models/ProductImage.php b/src/Models/ProductImage.php
index 779539ed1..25242a275 100644
--- a/src/Models/ProductImage.php
+++ b/src/Models/ProductImage.php
@@ -11,7 +11,7 @@ class ProductImage extends Model
 
     protected $primaryKey = 'value_id';
 
-    protected $with = ['productImageValue'];
+    protected $with = ['productImageValue', 'video'];
 
     protected static function booted(): void
     {
@@ -31,4 +31,9 @@ public function productImageValue(): BelongsTo
     {
         return $this->belongsTo(config('rapidez.models.product_image_value'), 'value_id', 'value_id');
     }
+
+    public function video(): BelongsTo
+    {
+        return $this->belongsTo(config('rapidez.models.product_video_value'), 'value_id', 'value_id');
+    }
 }
diff --git a/src/Models/ProductVideoValue.php b/src/Models/ProductVideoValue.php
new file mode 100644
index 000000000..66bf8cae5
--- /dev/null
+++ b/src/Models/ProductVideoValue.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rapidez\Core\Models;
+
+class ProductVideoValue extends Model
+{
+    protected $table = 'catalog_product_entity_media_gallery_value_video';
+
+    protected $primaryKey = 'value_id';
+}
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 3dae77667..44f2b7363 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -302,6 +302,78 @@ function ($filename) use ($manifest) {
             );
         });
 
+        Str::macro(
+            'embedUrl',
+            function ($url) {
+                if (Str::contains($url, 'vimeo')) {
+                    $url = str_replace('/vimeo.com', '/player.vimeo.com/video', $url);
+
+                    // Handle private vimeo urls.
+                    $hash = null;
+                    if (! Str::contains($url, 'progressive_redirect') && Str::substrCount($url, '/') > 4) {
+                        $hash = Str::afterLast($url, '/');
+                        $url = Str::beforeLast($url, '/');
+
+                        if (Str::contains($hash, '?')) {
+                            $url .= '?' . Str::after($hash, '?');
+                            $hash = Str::before($hash, '?');
+                        }
+                    }
+
+                    $paramsToAdd = '?dnt=1&watch_full_video=false&vimeo_logo=false&speed=false&chromecast=false&byline=false&badge=false&ask_ai=false&airplay=false';
+                    if ($hash) {
+                        $paramsToAdd .= '&h=' . $hash;
+                    }
+
+                    if (Str::contains($url, '?')) {
+                        $url = str_replace('?', $paramsToAdd . '&', $url);
+                    } else {
+                        $url .= $paramsToAdd;
+                    }
+
+                    return $url;
+                }
+
+                if (Str::contains($url, 'youtu.be')) {
+                    $url = str_replace('youtu.be', 'www.youtube.com/embed', $url);
+
+                    // Check for start at point and replace it with correct parameter.
+                    if (Str::contains($url, '?t=')) {
+                        $url = str_replace('?t=', '?start=', $url);
+                    }
+                }
+
+                if (Str::contains($url, 'youtube.com/watch?v=')) {
+                    $url = str_replace('watch?v=', 'embed/', $url);
+
+                    if (Str::contains($url, '&t=')) {
+                        $url = str_replace('&t=', '?start=', $url);
+                    }
+                }
+
+                if (Str::contains($url, 'youtube.com/shorts/')) {
+                    $url = str_replace('shorts/', 'embed/', $url);
+                }
+
+                if (Str::contains($url, 'youtube.com')) {
+                    $url = str_replace('youtube.com', 'youtube-nocookie.com', $url);
+                }
+
+                // This avoids SSL issues when using the non-www version
+                if (Str::contains($url, '//youtube-nocookie.com')) {
+                    $url = str_replace('//youtube-nocookie.com', '//www.youtube-nocookie.com', $url);
+                }
+
+                $url .= '&fs=0';
+
+                if (Str::contains($url, '&') && ! Str::contains($url, '?')) {
+                    $url = Str::replaceFirst('&', '?', $url);
+                }
+
+                return $url;
+            }
+        );
+
         return $this;
     }
 

From f37559c3821188026fc1d4258c34457193f8b4fe Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Fri, 19 Dec 2025 09:37:19 +0000
Subject: [PATCH 2/5] Apply fixes from Duster

---
 resources/views/product/partials/gallery/thumbnails.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/product/partials/gallery/thumbnails.blade.php b/resources/views/product/partials/gallery/thumbnails.blade.php
index 2f4ca885f..03b450076 100644
--- a/resources/views/product/partials/gallery/thumbnails.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails.blade.php
@@ -31,8 +31,8 @@
             <img
                 {{-- src should always be above v-bind:src --}}
                 @if ($imageId < count($selectedChild->product_gallery))
-                    @if($selectedChild->product_gallery[$imageId]['media_type'] === 'external-video')
-                        src="{{ config('rapidez.media_url')  }}/catalog/product{{ $selectedChild->product_gallery[$imageId]['image'] }}"
+                    @if ($selectedChild->product_gallery[$imageId]['media_type'] === 'external-video')
+                        src="{{ config('rapidez.media_url') }}/catalog/product{{ $selectedChild->product_gallery[$imageId]['image'] }}"
                     @else
                         src="{{ url('/storage/'.config('rapidez.store').'/resizes/80x80/magento/catalog/product'.$selectedChild->product_gallery[$imageId]['image'].'.webp') }}"
                     @endif

From fc0f4849abf96c7291b4e821ff506d16c38e3485 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Fri, 19 Dec 2025 10:36:53 +0000
Subject: [PATCH 3/5] [CI] Update Snapshots

---
 .../add-product-simple-1-webkit-linux.png                     | 4 ++--
 .../category-filter-1-Mobile-Safari-linux.png                 | 4 ++--
 .../category-filter-1-chromium-linux.png                      | 4 ++--
 .../category-filter-1-firefox-linux.png                       | 4 ++--
 .../category-filter-1-webkit-linux.png                        | 4 ++--
 .../category-pagination-1-chromium-linux.png                  | 4 ++--
 .../category-pagination-1-firefox-linux.png                   | 4 ++--
 .../category-pagination-1-webkit-linux.png                    | 4 ++--
 ...egory-with-configurable-products-1-Mobile-Chrome-linux.png | 4 ++--
 ...egory-with-configurable-products-1-Mobile-Safari-linux.png | 4 ++--
 .../category-with-configurable-products-1-chromium-linux.png  | 4 ++--
 .../category-with-configurable-products-1-firefox-linux.png   | 4 ++--
 .../category-with-configurable-products-1-webkit-linux.png    | 4 ++--
 .../category-with-simple-products-1-Mobile-Chrome-linux.png   | 4 ++--
 .../category-with-simple-products-1-Mobile-Safari-linux.png   | 4 ++--
 .../category-with-simple-products-1-chromium-linux.png        | 4 ++--
 .../category-with-simple-products-1-firefox-linux.png         | 4 ++--
 .../category-with-simple-products-1-webkit-linux.png          | 4 ++--
 .../default---as-user-1-Mobile-Chrome-linux.png               | 4 ++--
 .../default---as-user-1-Mobile-Safari-linux.png               | 4 ++--
 .../default---as-user-1-chromium-linux.png                    | 4 ++--
 .../default---as-user-1-firefox-linux.png                     | 4 ++--
 .../default---as-user-1-webkit-linux.png                      | 4 ++--
 .../default---as-user-2-Mobile-Chrome-linux.png               | 4 ++--
 .../default---as-user-2-Mobile-Safari-linux.png               | 4 ++--
 .../default---as-user-2-chromium-linux.png                    | 4 ++--
 .../default---as-user-2-firefox-linux.png                     | 4 ++--
 .../default---as-user-2-webkit-linux.png                      | 4 ++--
 .../onestep---as-user-1-Mobile-Chrome-linux.png               | 4 ++--
 .../onestep---as-user-1-Mobile-Safari-linux.png               | 4 ++--
 .../onestep---as-user-1-chromium-linux.png                    | 4 ++--
 .../onestep---as-user-1-firefox-linux.png                     | 4 ++--
 .../onestep---as-user-1-webkit-linux.png                      | 4 ++--
 33 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/tests/playwright/cart.spec.js-snapshots/add-product-simple-1-webkit-linux.png b/tests/playwright/cart.spec.js-snapshots/add-product-simple-1-webkit-linux.png
index 22ae5ca8b..8df20a71b 100644
--- a/tests/playwright/cart.spec.js-snapshots/add-product-simple-1-webkit-linux.png
+++ b/tests/playwright/cart.spec.js-snapshots/add-product-simple-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff93576c6af33c23eb968fb7e32b028395f8463a4dca2cac9231a40bac881753
-size 181858
+oid sha256:1cf05887b6a084022f4ebc6e5c6c85e58f46fb40aa4a75876a1fa8143e6cb9a0
+size 181855
diff --git a/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Safari-linux.png b/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Safari-linux.png
index 7bcf7f584..072dc8214 100644
--- a/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Safari-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dba26919f3dc2deac7b31e3453135edbe7411be18219fa79a4e41548d5547f2e
-size 312064
+oid sha256:650bce83f0185d777ca00eb3f1d6a38041f34bb4ff7c6daf1a53a2c28c037b5c
+size 311539
diff --git a/tests/playwright/category.spec.js-snapshots/category-filter-1-chromium-linux.png b/tests/playwright/category.spec.js-snapshots/category-filter-1-chromium-linux.png
index 2d4aba2c8..7b7b03024 100644
--- a/tests/playwright/category.spec.js-snapshots/category-filter-1-chromium-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-filter-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdab63bddbd93ab202f36f0cfd4d6663e2e4b78c532a1f669e8bc917275c80cf
-size 376860
+oid sha256:2515f9a802408b72a68bd677a596c304800ac76a3ad45c0488f9126a929c8b8b
+size 376479
diff --git a/tests/playwright/category.spec.js-snapshots/category-filter-1-firefox-linux.png b/tests/playwright/category.spec.js-snapshots/category-filter-1-firefox-linux.png
index 25ac90e41..9c0f8e63f 100644
--- a/tests/playwright/category.spec.js-snapshots/category-filter-1-firefox-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-filter-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf8c5a0802530932d321b092598156e4eb3cc9b251720b46900ef2616d85fcc1
-size 516002
+oid sha256:c181fe89f23981d488fa55ab5c37dd8051842b4062097df6ed4e3fd0d52970cd
+size 515570
diff --git a/tests/playwright/category.spec.js-snapshots/category-filter-1-webkit-linux.png b/tests/playwright/category.spec.js-snapshots/category-filter-1-webkit-linux.png
index e90f946e8..5d94d451b 100644
--- a/tests/playwright/category.spec.js-snapshots/category-filter-1-webkit-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-filter-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c838b82da31f413ef87ad20275ecf9b3873e5209ec6495aa7ec865eaf3b93785
-size 424213
+oid sha256:de1024fd35baa9595e894a190c4783507b29c89f5b0334b99327527f501ac2cc
+size 423799
diff --git a/tests/playwright/category.spec.js-snapshots/category-pagination-1-chromium-linux.png b/tests/playwright/category.spec.js-snapshots/category-pagination-1-chromium-linux.png
index 68742603c..1246d8166 100644
--- a/tests/playwright/category.spec.js-snapshots/category-pagination-1-chromium-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-pagination-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03d48fbe80e4a15c4b98e817c3c5fcb012164fa9651bd6437eb92355df344071
-size 240217
+oid sha256:99719cab4a421183b0a1d3c47d10f8f3c4c48de4e64a17fd1793933e38b2f387
+size 239971
diff --git a/tests/playwright/category.spec.js-snapshots/category-pagination-1-firefox-linux.png b/tests/playwright/category.spec.js-snapshots/category-pagination-1-firefox-linux.png
index 52890a750..a2ed9e60f 100644
--- a/tests/playwright/category.spec.js-snapshots/category-pagination-1-firefox-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-pagination-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:567c40f3bcdc5365d6633428d233f32ad0fe3d80d9aabb5d0fe82200632e8a17
-size 339771
+oid sha256:ee10a802662e7a371ecd62e218de5751e8409d32d710a590dc84e13d56bbae4d
+size 339562
diff --git a/tests/playwright/category.spec.js-snapshots/category-pagination-1-webkit-linux.png b/tests/playwright/category.spec.js-snapshots/category-pagination-1-webkit-linux.png
index bb92154c0..708707e7d 100644
--- a/tests/playwright/category.spec.js-snapshots/category-pagination-1-webkit-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-pagination-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5ff1248495cbd0caa441229e909cdb2fa7429b221452b50f8268f4fbcdf6d7d
-size 271966
+oid sha256:457a025e24eaec5834c1776daa911c954eec208702da76fc707ad08307875231
+size 271591
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Chrome-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Chrome-linux.png
index 0a53165dc..29133edd5 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7c101cf194bfa0deb31f1a149d5a0aa3bfb6dcd16f4efb62b1eca1356b7d771
-size 512515
+oid sha256:c65736898daec71eaf0fde29d0d3e256b8e34a0637ede7464cc325d2cee6a3fc
+size 512165
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Safari-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Safari-linux.png
index da404a145..a9c2e4ca4 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Safari-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89668c46173ec59f099e57361edc74477dcc80e82da61e53c19f0884e8cee3bb
-size 557451
+oid sha256:f23e339b949ccc48113b3d928041d21314d9daefa66a605e97305d49359a5eed
+size 556924
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-chromium-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-chromium-linux.png
index d897c6758..4168be5c3 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-chromium-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09fce0100e411c2b07d0fe519620c4f56ed65115d9febe3c7bba0524523d2cf9
-size 587347
+oid sha256:6c030f0ece4581f2fa6aa46bfb8bf32d85a9ec686581c0c68ab5e4b626e683e9
+size 576067
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-firefox-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-firefox-linux.png
index 775a3d386..58ce3830f 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-firefox-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a5376e327d4bd17a3a02ae61ec0b616ece494e02db161ec98da5d38e414f47b
-size 870745
+oid sha256:f221f393e5b0723f8e8f45443429516141af16a0d4424c7e7f64ac9a380cbca2
+size 857792
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-webkit-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-webkit-linux.png
index 4e8d5c460..207346254 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-webkit-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-configurable-products-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cb7fea38d85b2e23c1f4d44f93c28cac520619d64a6f809ab19672f1c473692
-size 662704
+oid sha256:c129d7480d034e47ae426d9640de2d146eee56bdfc9264fd09d5916f1fc251a9
+size 650414
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
index 2e10d5bbe..2ab755046 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3d2c3afe8d56bc2c89d81539c06d42da428b802e7ce664c770521f18b93e8db
-size 382891
+oid sha256:c6212ecf8bf76a4ba40ecf0d9d176acc469a190399d537c7f177a75c6c55eb13
+size 380503
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
index 04f5dee5f..579b9be04 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09a60719b9e5f3bb631e5116cb0016aed1e209628029609a2c12fcc9fc1e29db
-size 418104
+oid sha256:d03cea220e6a0caba8f507e5f20eb17b8e4c4e79b1b9e4fa6fceef4d868d7232
+size 415679
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-chromium-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-chromium-linux.png
index 189ea80f9..c11396cce 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-chromium-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:843f898c9d34524a402b0301aa0d9d938401590e83331f4214c9e536af86ebab
-size 459347
+oid sha256:b974d7eb69cf011145df6f34d7dd4855086f6a586b12428f3ca48249374bd158
+size 459078
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-firefox-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-firefox-linux.png
index 26995a312..29eec50b2 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-firefox-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ad4c60aeed6bdea67f06f0dd04cbe50239bfb136939887c08117bb94b1ecfa5
-size 627946
+oid sha256:10aca0f8fd3589f6173263d6557c975546b2f56fdde6ca6652839a1367350e18
+size 627751
diff --git a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-webkit-linux.png b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-webkit-linux.png
index 9f327474a..5a71029fe 100644
--- a/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-webkit-linux.png
+++ b/tests/playwright/category.spec.js-snapshots/category-with-simple-products-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0886848320b5a07055f77c908409f934677208a61839bc921e79c4cbc0387d3f
-size 511758
+oid sha256:1e77dbbc913c5fe445802ca48efca76c9f604b4ae45aa0542295b7ec4024674e
+size 511416
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
index 7cf75f602..7a4d14bde 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5441da80aaf8b4022a2f8c28b86dbbed04d45014176d9479dc1c4668f23edebf
-size 26307
+oid sha256:469432d3fe7a1b87095273ec5a768a379e5ffdba837e66e5cb1c4edccb8c6754
+size 26344
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
index b6e8a7d89..4af3f2d2a 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:316e721aec5e0f1d12021c4e1ed77de41e2a7f632914e72b64b3fdfdb2edfa7e
-size 29865
+oid sha256:e8a78208bec3173beafdf556d4fead986e08ab9e3022b5c056879ceaac09c89a
+size 29897
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
index d58e9a276..e7b74443d 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ea2ec8a4822cb69396d84f21c3d2752d9ab5fd48c068031d8de7a51be13a98f
-size 37108
+oid sha256:1b3b656837920d109f12634d3837be442d4e8dc1d5d8622d43374ba1c6978a4e
+size 37097
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
index b28965c1b..0f2b002ce 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce28a29f72f37d7f61320ad8932238927253da9de0d76f71988cbcf281be3d2e
-size 61911
+oid sha256:4dd7cc9e447aadc5b1a97a82912fc252a79739367f814414da6a3e8e2363ce0f
+size 61896
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
index b390d4bf7..1d899925b 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b470f8b0915bca3e6c74fc041af2008f5a674a55697de6231b3c07e77dcf6c81
-size 43352
+oid sha256:1172c1544ab81da9e1552372d381b49279c3fb4f5a1cce8ace90c3cb7401b577
+size 43383
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
index 22b76a257..48a294119 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04328e7d9eed2515d1ef52a788ac6da972cfa52e62e4e6a676512c8d4f2482eb
-size 70259
+oid sha256:97010059089dd7ff42d296faabb37e202fb44ce8edbf605fd9d42a128f027002
+size 63608
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
index d74e4d903..f9549125a 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac7ad891a586199906e985387fdc8f9e5a849ff37275f92bc5522c688adf6caa
-size 78274
+oid sha256:ea6ce7212e29a00ff3a1ebb368a505363f37051da6ba1aaf1693ce9ee27c20aa
+size 71183
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
index 5a1ea2858..901cbf1c2 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:857f8eeaab0c8197bb51d0b683c602c15063317011bfc293f8695d4dd5d831ac
-size 75880
+oid sha256:40855969627994f533e0fb063b67d4d34bbeaa6a96d36d1bd3912ba45db099bd
+size 69390
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
index 9851fe80a..af9d155f7 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5703a4cea356f8415217afdf268bf7c728b5814050bed73913b79ded6f8d420
-size 118152
+oid sha256:30f3587c6b3c54c1d9d0cf255e91ef6d29fb4cc8e5bd5d1da220976d914f046b
+size 110675
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
index b0352b7cf..2f4d48c94 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80dd8aad64a6232445cfe172e823ab44fe4b76efe86cf48e9dfa4ea664e68123
-size 90107
+oid sha256:61b4c3d3fb4cf82fc631c99aa1346befe7e6cf562e6eb139b88d725db7187a40
+size 83096
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
index 87f5eef52..f5a8ac3e5 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:363f349f80081f7bc5478d3a71f142d00846a4f8986e864c2ea8fd1a7cbbe2d8
-size 87881
+oid sha256:12762495b5f8a4f2e8d1821cf7a67be87f266680575ec8f8c7b2eb087f41b99a
+size 81251
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
index 66bf72583..30735218e 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd30c18e575b01f95ea259a43eb77502a3cfdda0d3e5186825073d470d051a65
-size 97904
+oid sha256:ed011bcabb3b2e30ae34e590d928e95ddf710bc8a6cf3bbd82f08a2730213946
+size 90924
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
index da6caaedf..3a59712e6 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ff5b6a81d433afa57aced9e45746b71cfabc14b1e370bb326d728567698940e
-size 85370
+oid sha256:ac311d491796bd51b3517581922768a15d04b326988eee159bb413a50fcdaf42
+size 78216
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
index edd4cc45b..c8175d051 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:699353ffa6204f3ebfecb45c4d20ff85e3a7344a174457d002ec45f3e2025e61
-size 135082
+oid sha256:ccd46c0fa21ce3d959f90c7187f56984b9673d5cc6607e97ec6261aed8f79c4a
+size 127648
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
index c9573ef3a..6db1900bb 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e06a5fce8904a66bc85245ebc4c0a405ace775444e2cd033ca5b5c47a582d640
-size 101366
+oid sha256:1839be0ff95e6bccf46d02f3c2647ddbeadbb324777d462c2348b7a0ada0fe27
+size 93988

From 22da71520be32b3efe5381c6f26a0ab60e434a3c Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Mon, 12 Jan 2026 14:31:20 +0100
Subject: [PATCH 4/5] Rename productGallery to media

---
 resources/js/components/Product/Images.vue             |  4 ++--
 .../views/product/partials/gallery/slider.blade.php    |  4 ++--
 .../product/partials/gallery/thumbnails.blade.php      | 10 +++++-----
 .../partials/gallery/thumbnails/show-more.blade.php    |  4 ++--
 src/Http/Controllers/ProductController.php             |  2 +-
 src/Models/Product.php                                 |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/Product/Images.vue b/resources/js/components/Product/Images.vue
index 8401a18f2..9553b328f 100644
--- a/resources/js/components/Product/Images.vue
+++ b/resources/js/components/Product/Images.vue
@@ -4,7 +4,7 @@ import { useEventListener } from '@vueuse/core'
 export default {
     data: () => ({
         images: config.product.images,
-        media: config.product.product_gallery,
+        media: config.product.media,
         active: 0,
         zoomed: false,
         touchStartX: 0,
@@ -33,7 +33,7 @@ export default {
                     ).length
                 ) {
                     self.images = simpleProduct.images
-                    self.media = simpleProduct.product_gallery
+                    self.media = simpleProduct.media
                     self.active = Math.min(self.active, self.media.length - 1)
                 }
             })
diff --git a/resources/views/product/partials/gallery/slider.blade.php b/resources/views/product/partials/gallery/slider.blade.php
index 8bbc9ea09..d851a66ea 100644
--- a/resources/views/product/partials/gallery/slider.blade.php
+++ b/resources/views/product/partials/gallery/slider.blade.php
@@ -8,7 +8,7 @@ class="flex h-[440px] cursor-zoom-in items-center justify-center rounded border
             {{-- src should always be below v-bind:src --}}
             v-if="media[active].media_type === 'image'"
             v-bind:src="window.url('/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product' + media[active].image + '.webp')"
-            src="{{ url('/storage/'.config('rapidez.store').'/resizes/400/magento/catalog/product'.Arr::first($selectedChild->product_gallery)['image'].'.webp') }}"
+            src="{{ url('/storage/'.config('rapidez.store').'/resizes/400/magento/catalog/product'.Arr::first($selectedChild->media)['image'].'.webp') }}"
             alt="{{ $product->name }}"
             class="max-h-full object-contain"
             style="view-transition-name: image-{{ $product->sku }}"
@@ -30,7 +30,7 @@ class="h-full w-full"
         </iframe>
     </a>
 
-    @if (count($selectedChild->product_gallery ?? []) > 1)
+    @if (count($selectedChild->media ?? []) > 1)
         <button v-if="active" v-on:click="change(active-1)" class="z-10 top-1/2 left-3 -translate-y-1/2 absolute" aria-label="@lang('Prev')" v-cloak>
             <x-heroicon-o-chevron-left class="size-8 text" />
         </button>
diff --git a/resources/views/product/partials/gallery/thumbnails.blade.php b/resources/views/product/partials/gallery/thumbnails.blade.php
index 03b450076..c87babd88 100644
--- a/resources/views/product/partials/gallery/thumbnails.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails.blade.php
@@ -10,7 +10,7 @@
     @for ($imageId = 0; $imageId < max($breakpoints); $imageId++)
         <button
             @attributes([
-                'v-cloak' => !($imageId < count($selectedChild->product_gallery) && count($selectedChild->product_gallery) > 1),
+                'v-cloak' => !($imageId < count($selectedChild->media) && count($selectedChild->media) > 1),
                 'v-if' => $imageId . ' < media.length && media.length > 1',
             ])
             @class([
@@ -30,11 +30,11 @@
         >
             <img
                 {{-- src should always be above v-bind:src --}}
-                @if ($imageId < count($selectedChild->product_gallery))
-                    @if ($selectedChild->product_gallery[$imageId]['media_type'] === 'external-video')
-                        src="{{ config('rapidez.media_url') }}/catalog/product{{ $selectedChild->product_gallery[$imageId]['image'] }}"
+                @if ($imageId < count($selectedChild->media))
+                    @if ($selectedChild->media[$imageId]['media_type'] === 'external-video')
+                        src="{{ config('rapidez.media_url') }}/catalog/product{{ $selectedChild->media[$imageId]['image'] }}"
                     @else
-                        src="{{ url('/storage/'.config('rapidez.store').'/resizes/80x80/magento/catalog/product'.$selectedChild->product_gallery[$imageId]['image'].'.webp') }}"
+                        src="{{ url('/storage/'.config('rapidez.store').'/resizes/80x80/magento/catalog/product'.$selectedChild->media[$imageId]['image'].'.webp') }}"
                     @endif
                 @endif
                 v-bind:src="window.url(media[{{ $imageId }}].media_type === 'external-video' ? window.config.media_url + '/catalog/product' + media[{{ $imageId }}].image : '/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + media[{{ $imageId }}].image + '.webp')"
diff --git a/resources/views/product/partials/gallery/thumbnails/show-more.blade.php b/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
index b7e75b1d8..275d77fc3 100644
--- a/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails/show-more.blade.php
@@ -1,7 +1,7 @@
 {{-- This component shows an overlay on the last shown thumbnail if there are more thumbnails after it. --}}
 
 <div @attributes([
-    'v-cloak' => !(count($selectedChild->product_gallery) - $imageId - 1),
+    'v-cloak' => !(count($selectedChild->media) - $imageId - 1),
     'v-if' => 'media.length - ' . $imageId . ' - 1',
 ])>
     <span
@@ -19,7 +19,7 @@
             class="size-9 flex items-center justify-center rounded-full bg-white text-sm font-bold text shadow-md"
             v-txt="'+' + (media.length - {{ $imageId }} - 1)"
         >
-            +{{ count($selectedChild->product_gallery) - $imageId - 1 }}
+            +{{ count($selectedChild->media) - $imageId - 1 }}
         </span>
     </span>
 </div>
diff --git a/src/Http/Controllers/ProductController.php b/src/Http/Controllers/ProductController.php
index 5c504c71a..b69ef37ed 100644
--- a/src/Http/Controllers/ProductController.php
+++ b/src/Http/Controllers/ProductController.php
@@ -34,7 +34,7 @@ public function show(int $productId)
             'special_price',
             'prices',
             'images',
-            'product_gallery',
+            'media',
             'url',
             'in_stock',
             'min_sale_qty',
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 4ca313e74..d108d77b9 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -58,7 +58,7 @@ class Product extends Model
     protected $appends = [
         'grouped',
         'images',
-        'product_gallery',
+        'media',
         'in_stock',
         'price',
         'special_price',
@@ -104,7 +104,7 @@ public function gallery(): BelongsToMany
         );
     }
 
-    protected function productGallery(): Attribute
+    protected function media(): Attribute
     {
         return Attribute::get(
             fn (): array => $this->gallery->sortBy('productImageValue.position')->map(function (ProductImage $value) {

From bf03dfb46370f3498433f2d95fd407ec6c290227 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Tue, 13 Jan 2026 14:49:20 +0100
Subject: [PATCH 5/5] Add PHPStan ignore line for video URL

---
 src/Models/Product.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/Product.php b/src/Models/Product.php
index d108d77b9..71aae964e 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -111,7 +111,7 @@ protected function media(): Attribute
                 return [
                     'media_type' => $value->media_type,
                     'image'      => $value->value,
-                    'video_url'  => isset($value->video) ? Str::embedUrl($value->video->url) : null,
+                    'video_url'  => isset($value->video) ? Str::embedUrl($value->video->url) : null, // @phpstan-ignore-line
                 ];
             })->values()->toArray()
         );