Merge branch 'WP-59' into 'main'

fix: add check applicable for international orders See merge request ecommerce_modules/cms/wordpress/wordpress!26
cdek-it · Sep 11, 2024 · fab6159 · fab6159
2 parents 7d3377e + 33c68ee
commit fab6159
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Fieldsets/GeneralOrderFields.php b/src/Fieldsets/GeneralOrderFields.php
@@ -9,7 +9,7 @@ class GeneralOrderFields extends FieldsetContract
 {
     final public function isApplicable(): bool
     {
-        return empty(WC()->cart) || WC()->cart->needs_shipping();
+        return true;
     }
 
     final protected function getFields(): array

diff --git a/src/Helpers/CheckoutHelper.php b/src/Helpers/CheckoutHelper.php
@@ -93,6 +93,10 @@ public static function getOrderShippingMethod(WC_Order $order): WC_Order_Item_Sh
 
         public static function restoreCheckoutFields(array $fields): array
         {
+            if(!empty(WC()->cart) && !WC()->cart->needs_shipping()){
+                return $fields;
+            }
+
             $checkout = WC()->checkout();
 
             $originalFields = $checkout->get_checkout_fields('billing');