Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/shipping into dev

src/QUI/ERP/Shipping/Order/Shipping.php

@@ -208,27 +208,11 @@ public function validate()
     }
 
     /**
-     * @return array
+     * @return QUI\ERP\Shipping\Types\ShippingEntry[]
      */
     protected function getValidShipping()
     {
-        $Order = $this->getOrder();
-        $User  = $Order->getCustomer();
-
-        $userShipping = QUI\ERP\Shipping\Shipping::getInstance()->getUserShipping($User, $Order);
-        $shippingList = [];
-
-        foreach ($userShipping as $ShippingEntry) {
-            $ShippingEntry->setOrder($Order);
-
-            if ($ShippingEntry->isValid()
-                && $ShippingEntry->canUsedInOrder($Order)
-                && $ShippingEntry->canUsedBy($User, $Order)) {
-                $shippingList[] = $ShippingEntry;
-            }
-        }
-
-        return $shippingList;
+        return ShippingHandler::getInstance()->getValidShippingEntriesByOrder($this->getOrder());
     }
 
     /**

src/QUI/ERP/Shipping/Shipping.php

@@ -278,6 +278,32 @@ public function getUserShipping($User = null, $Order = null)
         });
     }
 
+    /**
+     * Get all valid shipping entries for an order
+     *
+     * @param QUI\ERP\Order\AbstractOrder $Order
+     * @return QUI\ERP\Shipping\Types\ShippingEntry[]
+     */
+    public function getValidShippingEntriesByOrder(QUI\ERP\Order\AbstractOrder $Order)
+    {
+        $User = $Order->getCustomer();
+
+        $userShipping = QUI\ERP\Shipping\Shipping::getInstance()->getUserShipping($User, $Order);
+        $shippingList = [];
+
+        foreach ($userShipping as $ShippingEntry) {
+            $ShippingEntry->setOrder($Order);
+
+            if ($ShippingEntry->isValid()
+                && $ShippingEntry->canUsedInOrder($Order)
+                && $ShippingEntry->canUsedBy($User, $Order)) {
+                $shippingList[] = $ShippingEntry;
+            }
+        }
+
+        return $shippingList;
+    }
+
     /**
      * Return the unit field ids, for the shipping rule definition
      *