Adding a subtotal property to the cart endpoint

doc/swagger.yml

@@ -1322,9 +1322,14 @@ definitions:
             quantity:
                 type: "integer"
                 example: 2
+            subtotal:
+                type: "integer"
+                example: 2000
+                description: "Raw subtotal without the distributed order discounts (unit price * quantity + unit discount)"
             total:
                 type: "integer"
                 example: 1000
+                description: "The total also includes the distributed discount"
             product:
                 type: "object"
                 allOf:

spec/Factory/Cart/CartItemViewFactorySpec.php

@@ -41,6 +41,7 @@ function it_builds_cart_item_view(
         $cartItem->getId()->willReturn(2);
         $cartItem->getQuantity()->willReturn(3);
         $cartItem->getTotal()->willReturn(900);
+        $cartItem->getSubtotal()->willReturn(800);
         $cartItem->getProduct()->willReturn($tShirt);
         $cartItem->getVariant()->willReturn($tShirtVariant);
 
@@ -51,6 +52,7 @@ function it_builds_cart_item_view(
         $cartItemView = new ItemView();
         $cartItemView->id = 2;
         $cartItemView->quantity = 3;
+        $cartItemView->subTotal = 800;
         $cartItemView->total = 900;
         $cartItemView->product = new ProductView();
         $cartItemView->product->variants = [new ProductVariantView()];

src/Factory/Cart/CartItemViewFactory.php

@@ -40,6 +40,7 @@ public function create(OrderItemInterface $item, ChannelInterface $channel, stri
         $itemView->id = $item->getId();
         $itemView->quantity = $item->getQuantity();
         $itemView->total = $item->getTotal();
+        $itemView->subTotal = $item->getSubtotal();
         $itemView->product = $this->productViewFactory->create($item->getProduct(), $channel, $locale);
         $itemView->product->variants = [$this->productVariantViewFactory->create($item->getVariant(), $channel, $locale)];
 

src/View/ItemView.php

@@ -17,6 +17,9 @@ class ItemView
     /** @var int */
     public $total;
 
+    /** @var int */
+    public $subTotal;
+
     /** @var ProductView */
     public $product;
 

tests/Responses/Expected/cart/add_multiple_products_to_cart_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 5997,
             "total": 5997,
             "product": {
                 "code": "LOGAN_MUG_CODE",
@@ -69,6 +70,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 5997,
             "total": 5997,
             "product": {
                 "code": "LOGAN_T_SHIRT_CODE",
@@ -127,6 +129,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 1500,
             "total": 1500,
             "product": {
                 "code": "LOGAN_HAT_CODE",

tests/Responses/Expected/cart/add_multiple_products_to_new_cart_response.json

@@ -8,6 +8,7 @@
     {
       "id": @integer@,
       "quantity": 3,
+      "subTotal": 5997,
       "total": 5997,
       "product": {
         "code": "LOGAN_MUG_CODE",
@@ -69,6 +70,7 @@
     {
       "id": @integer@,
       "quantity": 3,
+      "subTotal": 5997,
       "total": 5997,
       "product": {
         "code": "LOGAN_T_SHIRT_CODE",
@@ -127,6 +129,7 @@
     {
       "id": @integer@,
       "quantity": 3,
+      "subTotal": 1500,
       "total": 1500,
       "product": {
         "code": "LOGAN_HAT_CODE",

tests/Responses/Expected/cart/add_product_variant_based_on_options_multiple_times_to_cart_response.json

@@ -9,6 +9,7 @@
             "id": @integer@,
             "quantity": 6,
             "total": 3000,
+            "subTotal": 3000,
             "product": {
                 "code": "LOGAN_HAT_CODE",
                 "name": "Logan Hat",

tests/Responses/Expected/cart/add_product_variant_based_on_options_to_cart_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 1500,
             "total": 1500,
             "product": {
                 "code": "LOGAN_HAT_CODE",

tests/Responses/Expected/cart/add_product_variant_multiple_times_to_cart_response.json

@@ -9,6 +9,7 @@
             "id": @integer@,
             "quantity": 6,
             "total": 11994,
+            "subTotal": 11994,
             "product": {
                 "code": "LOGAN_T_SHIRT_CODE",
                 "name": "Logan T-Shirt",

tests/Responses/Expected/cart/add_product_variant_to_cart_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 5997,
             "total": 5997,
             "product": {
                 "code": "LOGAN_T_SHIRT_CODE",

tests/Responses/Expected/cart/add_simple_product_multiple_times_to_cart_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 2,
+            "subTotal": 3998,
             "total": 3998,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/add_simple_product_to_cart_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 5997,
             "total": 5997,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/add_simple_product_to_new_cart_response.json

@@ -8,6 +8,7 @@
     {
       "id": @integer@,
       "quantity": 3,
+      "subTotal": 5997,
       "total": 5997,
       "product": {
         "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/cart_with_coupon_based_promotion_applied_response.json

@@ -9,6 +9,7 @@
             "id": @integer@,
             "quantity": 5,
             "total": 8995,
+            "subTotal": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",
                 "name": "Logan Mug",

tests/Responses/Expected/cart/filled_cart_with_product_variant_summary_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 5997,
             "total": 5997,
             "product": {
                 "code": "LOGAN_T_SHIRT_CODE",
@@ -66,6 +67,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 1500,
             "total": 1500,
             "product": {
                 "code": "LOGAN_HAT_CODE",

tests/Responses/Expected/cart/filled_cart_with_simple_product_summary_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/german_filled_cart_with_product_variant_summary_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 3,
+            "subTotal": 1770,
             "total": 1770,
             "product": {
                 "code": "LOGAN_HAT_CODE",

tests/Responses/Expected/cart/german_filled_cart_with_simple_product_summary_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 10495,
             "total": 10495,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/recalculated_cart_after_log_in.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 1,
+            "subTotal": 1999,
             "total": 1599,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/cart/reprocessed_cart_after_deleting_an_item.json

@@ -9,6 +9,7 @@
             "id": @integer@,
             "quantity": 1,
             "total": 1999,
+            "subTotal": 1999,
             "product": {
                 "code": "LOGAN_MUG_CODE",
                 "name": "Logan Mug",

tests/Responses/Expected/checkout/cart_addressed_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/cart_addressed_with_different_shipping_and_billing_address_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/cart_addressed_with_province_codes_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/cart_with_chosen_payment_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/cart_with_chosen_shipment_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/cart_with_chosen_shipment_with_per_item_rate_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/checkout/modified_cart_with_chosen_shipment_with_per_item_rate_response.json

@@ -8,6 +8,7 @@
         {
             "id": @integer@,
             "quantity": 2,
+            "subTotal": 3998,
             "total": 3998,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/order/order_details_response.json

@@ -9,6 +9,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/order/order_details_response_guest.json

@@ -9,6 +9,7 @@
         {
             "id": @integer@,
             "quantity": 5,
+            "subTotal": 9995,
             "total": 9995,
             "product": {
                 "code": "LOGAN_MUG_CODE",

tests/Responses/Expected/order/orders_list_response.json

@@ -10,6 +10,7 @@
             {
                 "id": @integer@,
                 "quantity": 5,
+                "subTotal": 9995,
                 "total": 9995,
                 "product": {
                     "code": "LOGAN_MUG_CODE",