Make sure cart item price includes discount; Add discount, price_excl_tax and price_incl_tax

Author: jissereitsma

DataLayer/Mapper/CartItemDataMapper.php

@@ -58,12 +58,16 @@ public function mapByCartItem(CartItem $cartItem): array
             $cartItemData = [];
         }
 
+        $price = $this->getPrice($cartItem);
         return array_merge($cartItemData, [
             'item_sku' => $cartItem->getSku(),
             'item_name' => $cartItem->getName(),
             'order_item_id' => $cartItem->getItemId(),
             'quantity' => (float) $cartItem->getQty(),
-            'price' => $this->getPrice($cartItem)
+            'price_excl_tax' => $cartItem->getRowTotal() / $cartItem->getQty(),
+            'price_incl_tax' => $cartItem->getRowTotalInclTax() / $cartItem->getQty(),
+            'price' => $price,
+            'discount' => $this->getPriceDiscount($cartItem, $price)
         ]);
     }
 
@@ -82,14 +86,19 @@ private function getPrice(CartItem $cartItem): float
         switch ($displayType) {
             case Config::DISPLAY_TYPE_EXCLUDING_TAX:
             case Config::DISPLAY_TYPE_BOTH:
-                $price = $cartItem->getConvertedPrice();
+                $price = ($cartItem->getRowTotal() - $cartItem->getDiscountAmount()) / $cartItem->getQty();
                 break;
             case Config::DISPLAY_TYPE_INCLUDING_TAX:
             default:
-                $price = $cartItem->getPriceInclTax();
+                $price = $cartItem->getRowTotalInclTax() / $cartItem->getQty();
                 break;
         }
 
         return $this->priceFormatter->format((float)$price);
     }
+
+    private function getPriceDiscount(CartItem $cartItem, float $price): float
+    {
+        return $cartItem->getDiscountAmount() / $cartItem->getQty();
+    }
 }