Merge pull request #28788 from okom3pom/fix-carrier-free-shipping-met…

…hode Fix carrier Exeption with free shipping
PrestaShop · Jun 21, 2022 · 23842fe · 23842fe
2 parents c6565e9 + b9d5191
commit 23842fe
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/classes/Carrier.php b/classes/Carrier.php
@@ -185,6 +185,12 @@ public function __construct($id = null, $id_lang = null)
     {
         parent::__construct($id, $id_lang);
         $this->image_dir = _PS_SHIP_IMG_DIR_;
+        /*
+         * keep retrocompatibility SHIPPING_METHOD_DEFAULT
+         */
+        if ($this->shipping_method == Carrier::SHIPPING_METHOD_DEFAULT) {
+            $this->shipping_method = ((int) Configuration::get('PS_SHIPPING_METHOD') ? Carrier::SHIPPING_METHOD_WEIGHT : Carrier::SHIPPING_METHOD_PRICE);
+        }
     }
 
     public static function resetStaticCache()