Fix for #308

2014-04-17 23:44:19 +02:00
parent 0bdac59881
commit 68cbc986e1
1 changed files with 8 additions and 1 deletions
--- a/core/lib/Thelia/Action/Order.php
+++ b/core/lib/Thelia/Action/Order.php
@@ -106,7 +106,14 @@ class Order extends BaseAction implements EventSubscriberInterface
    {
        $order = $event->getOrder();

-        $order->setDeliveryModuleId($event->getDeliveryModule());
+        $deliveryModuleId = $event->getDeliveryModule();
+
+        $order->setDeliveryModuleId($deliveryModuleId);
+
+        // Reset postage cost if the delivery module had been removed
+        if ($deliveryModuleId <= 0) {
+            $order->setPostage(0);
+        }

        $event->setOrder($order);
    }