Merge branch 'WP-214' into 'main'

fix: critical error on method not exists

See merge request ecommerce_modules/cms/wordpress/wordpress!87

Author: vermorag

src/Helpers/CheckoutHelper.php

@@ -27,10 +27,27 @@ class CheckoutHelper
             ];
 
         /** @noinspection GlobalVariableUsageInspection */
+
+        public static function passOfficeToCartPackages(array $packages): array
+        {
+            return array_map(
+                static function (array $package) {
+                    $office = CheckoutHelper::getCurrentValue('office_code');
+
+                    if (!empty($office)) {
+                        $package['destination'][MetaKeys::OFFICE_CODE] = $office;
+                    }
+
+                    return $package;
+                },
+                $packages,
+            );
+        }
+
         public static function getCurrentValue(string $valueName, string $defaultValue = null): ?string
         {
             try {
-                $cdekValue = WC()->session->get(Config::DELIVERY_NAME."_$valueName");
+                $cdekValue = WC()->session->get(Config::DELIVERY_NAME . "_$valueName");
                 if (!empty($cdekValue)) {
                     return $cdekValue;
                 }
@@ -59,7 +76,7 @@ public static function getCurrentValue(string $valueName, string $defaultValue =
             }
 
             try {
-                $cdekValue = WC()->customer->get_meta(Config::DELIVERY_NAME."_$valueName");
+                $cdekValue = WC()->customer->get_meta(Config::DELIVERY_NAME . "_$valueName");
 
                 if (!empty($cdekValue)) {
                     return $cdekValue;
@@ -71,19 +88,36 @@ public static function getCurrentValue(string $valueName, string $defaultValue =
             return $checkout->get_value($valueName) ?: $defaultValue;
         }
 
-        public static function passOfficeToCartPackages(array $packages): array {
-            return array_map(
-                static function (array $package) {
-                    $office = CheckoutHelper::getCurrentValue('office_code');
+        public static function restoreFields(array $fields): array
+        {
+            if (self::getSelectedShippingRate() === null) {
+                return $fields;
+            }
 
-                    if (!empty($office)) {
-                        $package['destination'][MetaKeys::OFFICE_CODE] = $office;
+            $originalFields = WC()->checkout()->get_checkout_fields('billing');
+
+            foreach (self::AVAILABLE_FIELDSETS as $fieldset) {
+                $fieldsetInstance = new $fieldset;
+
+                assert($fieldsetInstance instanceof FieldsetContract);
+
+                if (!$fieldsetInstance->isApplicable()) {
+                    continue;
+                }
+
+                foreach ($fieldsetInstance->getFieldsNames() as $field) {
+                    if (empty($fields['billing'][$field])) {
+                        $fields['billing'][$field] = empty($originalFields[$field]) ?
+                            $fieldsetInstance->getFieldDefinition($field) : $originalFields[$field];
                     }
 
-                    return $package;
-                },
-                $packages,
-            );
+                    if ($fieldsetInstance->isRequiredField($field)) {
+                        $fields['billing'][$field]['required'] = true;
+                    }
+                }
+            }
+
+            return $fields;
         }
 
         public static function getSelectedShippingRate(?WC_Cart $cart = null): ?WC_Shipping_Rate
@@ -96,13 +130,17 @@ public static function getSelectedShippingRate(?WC_Cart $cart = null): ?WC_Shipp
                 return null;
             }
 
-            $methods = $cart->get_shipping_methods();
+            if (method_exists($cart, 'get_shipping_methods')) {
+                $methods = $cart->get_shipping_methods();
+            } else {
+                $methods = [];
+            }
 
             if (empty($methods)) {
                 $methods = $cart->calculate_shipping();
             }
 
-            if (is_null($methods)){
+            if (is_null($methods)) {
                 return null;
             }
 
@@ -120,37 +158,5 @@ public static function isShippingRateSuitable(WC_Shipping_Rate $rate): bool
         {
             return $rate->get_method_id() === Config::DELIVERY_NAME;
         }
-
-        public static function restoreFields(array $fields): array
-        {
-            if (self::getSelectedShippingRate() === null) {
-                return $fields;
-            }
-
-            $originalFields = WC()->checkout()->get_checkout_fields('billing');
-
-            foreach (self::AVAILABLE_FIELDSETS as $fieldset) {
-                $fieldsetInstance = new $fieldset;
-
-                assert($fieldsetInstance instanceof FieldsetContract);
-
-                if (!$fieldsetInstance->isApplicable()) {
-                    continue;
-                }
-
-                foreach ($fieldsetInstance->getFieldsNames() as $field) {
-                    if (empty($fields['billing'][$field])) {
-                        $fields['billing'][$field] = empty($originalFields[$field]) ?
-                            $fieldsetInstance->getFieldDefinition($field) : $originalFields[$field];
-                    }
-
-                    if ($fieldsetInstance->isRequiredField($field)) {
-                        $fields['billing'][$field]['required'] = true;
-                    }
-                }
-            }
-
-            return $fields;
-        }
     }
 }