Tax management

alpixel · Apr 9, 2018 · 718832f · 718832f
1 parent a0d831d
commit 718832f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/Entity/Order.php b/Entity/Order.php
@@ -85,6 +85,13 @@ class Order
      */
     private $totalWoTax;
 
+    /**
+     * @var float
+     *
+     * @ORM\Column(name="total", type="decimal", precision=10, scale=2)
+     */
+    private $total;
+
     /**
      * @var string
      *
@@ -370,4 +377,24 @@ public function setDiscount($discount)
 
         return $this;
     }
+
+    /**
+     * @return float
+     */
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+    /**
+     * @param float $total
+     * @return Order
+     */
+    public function setTotal($total = null)
+    {
+        $this->total = $total;
+
+        return $this;
+    }
+
 }
diff --git a/EventListener/AnalyticsSubscriber.php b/EventListener/AnalyticsSubscriber.php
@@ -105,7 +105,7 @@ public function onOrderPostPersist(OrderEvent $event)
 
         $data = [
             'ti' => $order->getId(),
-            'tr' => $order->getTotalWoTax(),
+            'tr' => $order->getTotal(),
             'tt' => 0,
             'cu' => $order->getCurrency(),
         ];

diff --git a/Helper/Cart/CartManager.php b/Helper/Cart/CartManager.php
@@ -148,8 +148,13 @@ public function getCurrentCart(Customer $customer = null)
      * @throws CartAccessDeniedException
      * @throws CartNotFoundException
      */
-    public function getTotal($withProductDiscount = true, $withCartDiscount = true, $cartId = null, $withShipment = true)
-    {
+    public function getTotal(
+        $withProductDiscount = true,
+        $withCartDiscount = true,
+        $cartId = null,
+        $withShipment = true,
+        $withTaxes = 0
+    ) {
         $total = 0;
 
         if ($cartId === null) {
@@ -186,6 +191,10 @@ public function getTotal($withProductDiscount = true, $withCartDiscount = true,
             $total += $shipment->getPrice();
         }
 
+        if (!empty($withTaxes)) {
+            $total += ($total * $withTaxes / 100);
+        }
+
         return $total;
     }
 
@@ -468,7 +477,7 @@ public function memorize(Cart $cart, $newName = null, $deleteAfterMemorize = tru
      */
     public function switchCart(Cart $cart, Customer $customer = null, $keepSavedCart = true)
     {
-        if($customer === null) {
+        if ($customer === null) {
             $customer = $this->customer;
         }
 

diff --git a/Helper/Order/OrderManager.php b/Helper/Order/OrderManager.php
@@ -99,8 +99,9 @@ public function newOrder(Cart $cart, Customer $customer)
         }
 
         $order->setDiscount($this->cartManager->getCartDiscount());
-        $order->setBareTotalWoTax($this->cartManager->getTotal(true, false));
-        $order->setTotalWoTax($this->cartManager->getTotal(true, true));
+        $order->setBareTotalWoTax($this->cartManager->getTotal(true, false, null, true, 0));
+        $order->setTotalWoTax($this->cartManager->getTotal(true, true, null, true, 0));
+        $order->setTotal($this->cartManager->getTotal(true, true, null, true, $customer->getVatRate()));
 
         return $order
             ->setCart($cart)