diff --git a/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php b/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php index 01e339c65d2fc9694e17a424b0b7384ea6361d42..254c913d0337b2e9b04ab374b506bd8c6acefe45 100644 --- a/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php +++ b/src/QUI/ERP/Shipping/Methods/Standard/ShippingType.php @@ -113,7 +113,7 @@ public function canUsedBy( $userGroupValue = $ShippingEntry->getAttribute('user_groups'); $areasValue = $ShippingEntry->getAttribute('areas'); - // if groups and areas are empty, everbody is allowed + // if groups and areas are empty, everybody is allowed if (empty($userGroupValue) && empty($areasValue)) { return true; } diff --git a/src/QUI/ERP/Shipping/Rules/ShippingRule.php b/src/QUI/ERP/Shipping/Rules/ShippingRule.php index 46a28865e1dddc6781ffa68b1c42ab5605854a92..ea2f77c680ebbdfccf0395279b76ce30c71cd373 100644 --- a/src/QUI/ERP/Shipping/Rules/ShippingRule.php +++ b/src/QUI/ERP/Shipping/Rules/ShippingRule.php @@ -355,6 +355,10 @@ public function canUsedInOrder($Order) $weight = FieldUtils::weightFieldToKilogram($Weight); } + if (\is_array($weight)) { + $weight = $weight['quantity']; + } + if (!isset($articleUnits[$unitId])) { $articleUnits[$unitId] = 0; } diff --git a/src/QUI/ERP/Shipping/Shipping.php b/src/QUI/ERP/Shipping/Shipping.php index 449f7f3ed4d8b127cbf592b2f894f249e0972116..2e7573d9cec3998ee8250a72cf092d0ba85965a2 100644 --- a/src/QUI/ERP/Shipping/Shipping.php +++ b/src/QUI/ERP/Shipping/Shipping.php @@ -92,7 +92,7 @@ public function getShippingProviders() $result = []; foreach ($providers as $provider) { - if (!class_exists($provider)) { + if (!\class_exists($provider)) { continue; }