Merge branch 'master' into develop

Daalder · Jul 25, 2024 · f89ef6c · f89ef6c
2 parents 51bd816 + e293a34
commit f89ef6c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/Jobs/Feeds/AdmarktFeed.php b/src/Jobs/Feeds/AdmarktFeed.php
@@ -125,7 +125,7 @@ protected function productToFeedRow(Product $product)
 
         $i = 1;
         while ($i < 24) {
-            $fields['image'.$i] = (isset($product->images[$i - 1])) ? $product->images[$i - 1]->getPublicUrl() : '';
+            $fields['image'.$i] = (isset($product->images[$i - 1])) ? $product->images[$i - 1]->getPublicUrl(true) : '';
             $i++;
         }
 

diff --git a/src/Jobs/Feeds/BeslistFeed.php b/src/Jobs/Feeds/BeslistFeed.php
@@ -66,7 +66,7 @@ protected function productToFeedRow(Product $product)
             ->first();
 
         if ($image) {
-            $fields['image_link'] = $image->getPublicUrl();
+            $fields['image_link'] = $image->getPublicUrl(true);
         }
 
         //TODO don't hard code id for beslist

diff --git a/src/Jobs/Feeds/BolFeed.php b/src/Jobs/Feeds/BolFeed.php
@@ -59,7 +59,7 @@ protected function getProductQuery(): Builder
     protected function productToFeedRow(Product $product)
     {
         // fetch images
-        $images = implode(',', $product->images->map->getPublicUrl()->all());
+        $images = implode(',', $product->images->map->getPublicUrl(true)->all());
 
         // set bol price
         $shippingCost = 0;

diff --git a/src/Jobs/Feeds/FacebookFeed.php b/src/Jobs/Feeds/FacebookFeed.php
@@ -148,7 +148,7 @@ public function getFacebookFeedImageLinks(Product $product): array
         ];
 
         if (!empty($eligibleImages)) {
-            $eligibleImagesSrc = $eligibleImages->map->getPublicUrl();
+            $eligibleImagesSrc = $eligibleImages->map->getPublicUrl(true);
 
             $imageArray['mainImage'] = $eligibleImagesSrc->shift();
 

diff --git a/src/Jobs/Feeds/Feed.php b/src/Jobs/Feeds/Feed.php
@@ -376,7 +376,7 @@ protected function getImageLink(Product $product): ?string
     {
         $image = $product->images()->first();
 
-        return optional($image)->getPublicUrl();
+        return optional($image)->getPublicUrl(true);
     }
 
     protected function getCategories(Product $product): string

diff --git a/src/Jobs/Feeds/GoogleFeed.php b/src/Jobs/Feeds/GoogleFeed.php
@@ -129,7 +129,7 @@ protected function productToFeedRow(Product $product)
             ->first();
 
         if (! is_null($image)) {
-            $fields['image_link'] = $image->getPublicUrl();
+            $fields['image_link'] = $image->getPublicUrl(true);
         }
 
         return $fields;

diff --git a/src/Jobs/Feeds/NetrivalsFeed.php b/src/Jobs/Feeds/NetrivalsFeed.php
@@ -61,7 +61,7 @@ protected function productToFeedRow(Product $product)
             'product_id' => $product->id,
             'title' => $product->name,
             'price' => $this->priceFormatter->getFormattedPrice($product),
-            'image_url' => optional($product->images()->first())->getPublicUrl(),
+            'image_url' => optional($product->images()->first())->getPublicUrl(true),
             'product_type' => ($product->group_id !== null) ? $product->group->name : '(not set)',
             'brand' => optional($product->brand)->name,
             'ean' => $product->ean,

diff --git a/src/Jobs/Feeds/ShoprFeed.php b/src/Jobs/Feeds/ShoprFeed.php
@@ -62,7 +62,7 @@ protected function productToFeedRow(Product $product)
             'category' => $product->categories->first()->name,
             'delivery_time' => $product->shippingTime->name ?? $this->getDelivery($product),
             'additional_costs' => $shippingCost,
-            'image_1' => $product->images->first()->getPublicUrl(),
+            'image_1' => $product->images->first()->getPublicUrl(true),
             'group_id' => '', //gets filled later
             'gtin' => $product->ean,
             'brand' => '', //gets filled later

diff --git a/src/Jobs/Feeds/TradeTrackerFeed.php b/src/Jobs/Feeds/TradeTrackerFeed.php
@@ -107,7 +107,7 @@ protected function productToFeedRow(Product $product)
             $fields['brand'] = $product->brand->name;
         }
 
-        $images = $product->images->take(5)->map->getPublicUrl()->all();
+        $images = $product->images->take(5)->map->getPublicUrl(true)->all();
 
         foreach ($images as $key => $image) {
             $fields['imageURL-'.($key + 1)] = $image;