fix for Shipping Rule "ShippingRule" -> pass price to getPriceModification method and implement getPrice method

dpfaffenbauer · dpfaffenbauer · commit fce3a27c2749 · 2017-06-07T16:07:49.000+01:00
diff --git a/lib/CoreShop/Model/Carrier/ShippingRule/Action/ShippingRule.php b/lib/CoreShop/Model/Carrier/ShippingRule/Action/ShippingRule.php
@@ -34,6 +34,23 @@ class ShippingRule extends AbstractAction
      */
     public $shippingRule;
 
+    /**
+     * get price for shipping
+     *
+     * @param Model\Carrier $carrier
+     * @param Cart $cart
+     * @param Model\User\Address $address
+     *
+     * @return float|boolean $price
+     */
+    public function getPrice(Model\Carrier $carrier, Cart $cart, Model\User\Address $address)
+    {
+        $carrierShippingRule = CarrierShippingRule::getById($this->getShippingRule());
+
+        if ($carrierShippingRule instanceof CarrierShippingRule) {
+            return $carrierShippingRule->getPrice($carrier, $cart, $address);
+        }
+    }
 
     /**
      * get addition/discount for shipping
@@ -50,7 +67,7 @@ public function getPriceModification(Model\Carrier $carrier, Cart $cart, Model\U
         $carrierShippingRule = CarrierShippingRule::getById($this->getShippingRule());
 
         if ($carrierShippingRule instanceof CarrierShippingRule) {
-            return $carrierShippingRule->getPrice($carrier, $cart, $address);
+            return $carrierShippingRule->getPriceModification($carrier, $cart, $address, $price);
         }
 
         return 0;
