Merge branch 'next' into 'master'

Next

See merge request !12

src/QUI/ERP/Shipping/Shipping.php

@@ -312,6 +312,21 @@ public function getShippingPriceFactor(
         return null;
     }
 
+    /**
+     * @param AbstractOrder $Order
+     * @return QUI\ERP\Products\Interfaces\PriceFactorInterface|null
+     *
+     * @deprecated use getShippingPriceFactor
+     */
+    public function getShippingPriceFactorByOrder(
+        AbstractOrder $Order
+    ): ?QUI\ERP\Products\Interfaces\PriceFactorInterface {
+        QUI\System\Log::addNotice(
+            'Shipping->getShippingPriceFactorByOrder() is deprecated, use getShippingPriceFactor'
+        );
+        return $this->getShippingPriceFactor($Order);
+    }
+
     /**
      * Get all valid shipping entries for an erp entity
      *
@@ -326,9 +341,7 @@ public function getValidShippingEntries(QUI\ERP\ErpEntityInterface $Entity): arr
         $shippingList = [];
 
         foreach ($userShipping as $ShippingEntry) {
-            if ($Entity instanceof QUI\ERP\ErpEntityInterface) {
-                $ShippingEntry->setErpEntity($Entity);
-            }
+            $ShippingEntry->setErpEntity($Entity);
 
             if (
                 $ShippingEntry->isValid()
@@ -342,6 +355,19 @@ public function getValidShippingEntries(QUI\ERP\ErpEntityInterface $Entity): arr
         return $shippingList;
     }
 
+    /**
+     * @param AbstractOrder $Order
+     * @return Types\ShippingEntry[]
+     * @deprecated use getValidShippingEntries
+     */
+    public function getValidShippingEntriesByOrder(AbstractOrder $Order): array
+    {
+        QUI\System\Log::addNotice(
+            'Shipping->getValidShippingEntriesByOrder() is deprecated, use getValidShippingEntries'
+        );
+        return $this->getValidShippingEntries($Order);
+    }
+
     /**
      * Return the unit field ids, for the shipping rule definition
      *