Merge branch 'WP-192' into 'main'

fix: check CDEK shipping on restore fields

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

Author: DEMAxx

src/Helpers/CheckoutHelper.php

@@ -68,7 +68,15 @@ public static function getCurrentValue(string $valueName, string $defaultValue =
 
         public static function restoreFields(array $fields): array
         {
-            if (!empty(WC()->cart) && !WC()->cart->needs_shipping()) {
+            $shippingDetector = ShippingDetector::new();
+
+            if (
+                !$shippingDetector->needShipping() ||
+                (
+                    !$shippingDetector->isShippingEmpty() &&
+                    $shippingDetector->getShipping() === null
+                )
+            ) {
                 return $fields;
             }
 

src/Helpers/ShippingDetector.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace {
+    defined('ABSPATH') or exit;
+}
+
+namespace Cdek\Helpers {
+
+    use Cdek\Config;
+    use Cdek\Traits\CanBeCreated;
+
+    class ShippingDetector
+    {
+        use CanBeCreated;
+        private ?array $shippingMethods = null;
+
+        public function __construct()
+        {
+            if(WC()->cart === false || WC()->cart->needs_shipping() === false) {
+                return;
+            }
+
+            $this->shippingMethods = WC()->session->get('chosen_shipping_methods', []);
+        }
+
+        public function needShipping(): bool
+        {
+            return $this->shippingMethods !== null;
+        }
+
+        public function getShipping(): ?string
+        {
+            if($this->isShippingEmpty()){
+                return null;
+            }
+
+            $shippingMethodIdSelected = $this->shippingMethods[0];
+
+            if ( strpos($shippingMethodIdSelected, Config::DELIVERY_NAME) === false ) {
+                return null;
+            }
+
+            return $shippingMethodIdSelected;
+        }
+
+        public function isShippingEmpty(): bool
+        {
+            return empty($this->shippingMethods[0]);
+        }
+    }
+}

src/UI/CheckoutMap.php

@@ -12,6 +12,7 @@
     use Cdek\CdekApi;
     use Cdek\Config;
     use Cdek\Helpers\CheckoutHelper;
+    use Cdek\Helpers\ShippingDetector;
     use Cdek\Model\Tariff;
     use Throwable;
 
@@ -66,14 +67,16 @@ private function isTariffDestinationCdekOffice($shippingMethodCurrent): bool
                 return false;
             }
 
-            $shippingMethodIdSelected = WC()->session->get('chosen_shipping_methods', []);
+            $shippingMethodIdSelected = ShippingDetector::new()->getShipping();
 
-            if (empty($shippingMethodIdSelected[0]) ||
-                $shippingMethodCurrent->get_id() !== $shippingMethodIdSelected[0]) {
+            if (
+                empty($shippingMethodIdSelected) ||
+                $shippingMethodCurrent->get_id() !== $shippingMethodIdSelected
+            ) {
                 return false;
             }
 
-            $tariffCode = explode(':', $shippingMethodIdSelected[0])[1];
+            $tariffCode = explode(':', $shippingMethodIdSelected)[1];
 
             return Tariff::isToOffice((int)$tariffCode);
         }

src/Validator/CheckoutValidator.php

@@ -10,11 +10,11 @@
 namespace Cdek\Validator {
 
     use Cdek\CdekApi;
-    use Cdek\Config;
     use Cdek\Exceptions\CacheException;
     use Cdek\Exceptions\External\ApiException;
     use Cdek\Exceptions\External\CoreAuthException;
     use Cdek\Helpers\CheckoutHelper;
+    use Cdek\Helpers\ShippingDetector;
     use Cdek\Model\Tariff;
     use Throwable;
 
@@ -23,23 +23,13 @@ class CheckoutValidator
 
         public function __invoke(): void
         {
-            if ( !WC()->cart->needs_shipping() ) {
-                return;
-            }
-
-            $shippingMethods = WC()->session->get('chosen_shipping_methods');
-
-            if ( empty($shippingMethods[0]) ) {
-                return;
-            }
-
-            $shippingMethodIdSelected = $shippingMethods[0];
+            $shippingDetector = ShippingDetector::new();
 
-            if ( strpos($shippingMethodIdSelected, Config::DELIVERY_NAME) === false ) {
+            if( $shippingDetector->getShipping() === null ) {
                 return;
             }
 
-            $tariffCode = explode(':', $shippingMethodIdSelected)[1];
+            $tariffCode = explode(':', $shippingDetector->getShipping())[1];
 
             if ( Tariff::isToOffice((int)$tariffCode) ) {
                 if ( empty(CheckoutHelper::getCurrentValue('office_code')) ) {