Merge pull request #1681 from amitsharma322/gli-2684

Fixed: Cart rule creation at booking time failed if no prior cart rules existed.

Author: rohit053

classes/CartRule.php

@@ -1477,10 +1477,7 @@ public static function autoAddToCart(?Context $context = null)
      */
     public static function isFeatureActive()
     {
-        static $is_feature_active = null;
-        if ($is_feature_active === null) {
-            $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
-        }
+        $is_feature_active = (bool)Configuration::get('PS_CART_RULE_FEATURE_ACTIVE');
         return $is_feature_active;
     }
 

classes/webservice/WebserviceSpecificManagementBookings.php

@@ -507,7 +507,7 @@ public function formatRoomInRequestData($data)
                 $formattedRooms[$key]['occupancy'] = $occupancy;
                 if (isset($room['id_tax_rules_group'])) {
                     $formattedRooms[$key]['id_tax_rules_group'] = $room['id_tax_rules_group'];
-                } else if ($room['total_tax']) {
+                } else if (isset($room['total_tax'])) {
                     $formattedRooms[$key]['total_tax'] = $room['total_tax'];
                 }
             }