One page checkout

CONTRIBUTORS.md

@@ -344,6 +344,7 @@ GitHub contributors:
 - Georges Cubas
 - Gerdus van Zyl
 - ggedamed
+- Giuseppe Tripiciano
 - Giant Leap Lab
 - Ginkosama
 - ginodev
@@ -399,6 +400,7 @@ GitHub contributors:
 - indesign47
 - Ines Sallemi
 - Inetbiz
+- Inform-All
 - ironwo0d
 - Ish Gupta
 - Ishiki
@@ -852,6 +854,7 @@ GitHub contributors:
 - Salim Benouamer
 - Sam Berry
 - sallemiines
+- Salvo Passaro
 - Sam
 - Sam Sanchez
 - Samir Shah

classes/Image.php

@@ -24,7 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
@@ -930,17 +929,15 @@ public function getPathForCreation()
      */
     private function deleteAutoGeneratedImage(array $imageType, string $imageFormat, array $filesToDelete): array
     {
-        $configuration = SymfonyContainer::getInstance()->get('prestashop.adapter.legacy.configuration');
-
         // Regular thumbnail
         $filesToDelete[] = $this->image_dir . $this->getExistingImgPath() . '-' . $imageType['name'] . '.' . $imageFormat;
 
         // Old 2x thumbnail, if present
         $filesToDelete[] = $this->image_dir . $this->getExistingImgPath() . '-' . $imageType['name'] . '2x.' . $imageFormat;
 
         // Watermarked thumbnail, if present
-        if ($configuration->get('WATERMARK_HASH')) {
-            $filesToDelete[] = $this->image_dir . $this->getExistingImgPath() . '-' . $imageType['name'] . '-' . $configuration->get('WATERMARK_HASH') . '.' . $imageFormat;
+        if (Configuration::get('WATERMARK_HASH')) {
+            $filesToDelete[] = $this->image_dir . $this->getExistingImgPath() . '-' . $imageType['name'] . '-' . Configuration::get('WATERMARK_HASH') . '.' . $imageFormat;
         }
 
         return $filesToDelete;

composer.json

@@ -58,7 +58,7 @@
         "prestashop/blockreassurance": "^5",
         "prestashop/blockwishlist": "^3.0",
         "prestashop/circuit-breaker": "^4.0",
-        "prestashop/classic": "^3",
+        "prestashop/classic": "~3.1.0",
         "prestashop/contactform": "^4",
         "prestashop/dashactivity": "^2",
         "prestashop/dashgoals": "^2",
@@ -71,7 +71,7 @@
         "prestashop/hummingbird": "^2.0",
         "prestashop/pagesnotfound": "^3",
         "prestashop/productcomments": "^8.0",
-        "prestashop/ps_apiresources": "dev-add-combinations-endpoint",
+        "prestashop/ps_apiresources": "dev-add-discountType-resource",
         "prestashop/ps_banner": "^2",
         "prestashop/ps_bestsellers": "^1.0",
         "prestashop/ps_brandlist": "^1.0",
@@ -212,7 +212,7 @@
         },
         "ps_apiresources": {
             "type": "vcs",
-            "url": "https://github.com/sebajps/ps_apiresources"
+            "url": "https://github.com/PrestaShop/ps_apiresources"
         }
     },
     "minimum-stability": "dev",