Revert "Merge branch 'cleanmaster' into modules"

This reverts commit d0ff5260f7, reversing changes made to 67d0101dbe.
2013-12-20 11:16:42 +01:00
parent d0ff5260f7
commit b3ac365b45
332 changed files with 3575 additions and 4787 deletions
--- a/core/lib/Thelia/Model/Cart.php
+++ b/core/lib/Thelia/Model/Cart.php
@@ -83,6 +83,7 @@ class Cart extends BaseCart

        foreach($this->getCartItems() as $cartItem) {
            $subtotal = $cartItem->getRealPrice();
+            $subtotal -= $cartItem->getDiscount();
            /* we round it for the unit price, before the quantity factor */
            $subtotal = round($taxCalculator->load($cartItem->getProduct(), $country)->getTaxedPrice($subtotal), 2);
            $subtotal *= $cartItem->getQuantity();
@@ -101,6 +102,7 @@ class Cart extends BaseCart

        foreach($this->getCartItems() as $cartItem) {
            $subtotal = $cartItem->getRealPrice();
+            $subtotal -= $cartItem->getDiscount();
            $subtotal *= $cartItem->getQuantity();

            $total += $subtotal;