fix(Cart): add corrected cart discount fields

Author: Jens Schulze

src/Model/Cart/CustomLineItem.php

@@ -34,6 +34,12 @@
  * @method CustomLineItem setTaxRate(TaxRate $taxRate = null)
  * @method CustomFieldObject getCustom()
  * @method CustomLineItem setCustom(CustomFieldObject $custom = null)
+ * @method Money getTotalPrice()
+ * @method CustomLineItem setTotalPrice(Money $totalPrice = null)
+ * @method DiscountedPricePerQuantityCollection getDiscountedPricePerQuantity()
+ * @codingStandardsIgnoreStart
+ * @method CustomLineItem setDiscountedPricePerQuantity(DiscountedPricePerQuantityCollection $discountedPricePerQuantity = null)
+ * @codingStandardsIgnoreEnd
  */
 class CustomLineItem extends JsonObject
 {
@@ -49,6 +55,10 @@ public function fieldDefinitions()
             'taxCategory' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxCategoryReference'],
             'taxRate' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxRate'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
+            'totalPrice' => [static::TYPE => '\Commercetools\Core\Model\Common\Money'],
+            'discountedPricePerQuantity' => [
+                static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
+            ],
         ];
     }
 }

src/Model/Cart/DiscountedPricePerQuantity.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author @ct-jensschulze <[email protected]>
+ */
+
+namespace Commercetools\Core\Model\Cart;
+
+use Commercetools\Core\Model\Common\JsonObject;
+
+/**
+ * @package Commercetools\Core\Model\Cart
+ * @apidoc http://dev.sphere.io/http-api-projects-carts.html#discounted-line-item-price-for-quantity
+ * @method int getQuantity()
+ * @method DiscountedPricePerQuantity setQuantity(int $quantity = null)
+ * @method DiscountedLineItemPrice getDiscountedPrice()
+ * @method DiscountedPricePerQuantity setDiscountedPrice(DiscountedLineItemPrice $discountedPrice = null)
+ */
+class DiscountedPricePerQuantity extends JsonObject
+{
+    public function fieldDefinitions()
+    {
+        return [
+            'quantity' => [static::TYPE => 'int'],
+            'discountedPrice' => [static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedLineItemPrice']
+        ];
+    }
+}

src/Model/Cart/DiscountedPricePerQuantityCollection.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @author @ct-jensschulze <[email protected]>
+ */
+
+namespace Commercetools\Core\Model\Cart;
+
+use Commercetools\Core\Model\Common\Collection;
+
+/**
+ * @package Commercetools\Core\Model\Cart
+ *
+ * @method DiscountedPricePerQuantityCollection add(DiscountedPricePerQuantity $element)
+ * @method DiscountedPricePerQuantity current()
+ * @method DiscountedPricePerQuantity getAt($offset)
+ */
+class DiscountedPricePerQuantityCollection extends Collection
+{
+    protected $type = '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantity';
+}

src/Model/Cart/LineItem.php

@@ -45,6 +45,12 @@
  * @method LineItem setDistributionChannel(ChannelReference $distributionChannel = null)
  * @method CustomFieldObject getCustom()
  * @method LineItem setCustom(CustomFieldObject $custom = null)
+ * @method Money getTotalPrice()
+ * @method LineItem setTotalPrice(Money $totalPrice = null)
+ * @method DiscountedPricePerQuantityCollection getDiscountedPricePerQuantity()
+ * @codingStandardsIgnoreStart
+ * @method LineItem setDiscountedPricePerQuantity(DiscountedPricePerQuantityCollection $discountedPricePerQuantity = null)
+ * @codingStandardsIgnoreEnd
  */
 class LineItem extends JsonObject
 {
@@ -61,19 +67,12 @@ public function fieldDefinitions()
             'state' => [static::TYPE => '\Commercetools\Core\Model\Order\ItemStateCollection'],
             'taxRate' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxRate'],
             'supplyChannel' => [static::TYPE => '\Commercetools\Core\Model\Channel\ChannelReference'],
-            'discountedPrice' => [static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedLineItemPrice'],
             'distributionChannel' => [static::TYPE => '\Commercetools\Core\Model\Channel\ChannelReference'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
+            'totalPrice' => [static::TYPE => '\Commercetools\Core\Model\Common\Money'],
+            'discountedPricePerQuantity' => [
+                static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
+            ],
         ];
     }
-
-    /**
-     * @return Money
-     */
-    public function getTotal()
-    {
-        $price = $this->getPrice()->getValue();
-        $amount = $this->getQuantity() * $price->getCentAmount();
-        return Money::ofCurrencyAndAmount($price->getCurrencyCode(), $amount, $this->getContext());
-    }
 }

src/Model/Order/Order.php

@@ -18,6 +18,7 @@
 use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use Commercetools\Core\Model\Common\DateTimeDecorator;
 use Commercetools\Core\Model\State\StateReference;
+use Commercetools\Core\Model\Payment\PaymentInfo;
 
 /**
  * @package Commercetools\Core\Model\Order

tests/fixtures/models.yaml

@@ -38,8 +38,9 @@ lineItem:
     - taxRate
     - supplyChannel
     - distributionChannel
-    - discountedPrice
     - custom
+    - discountedPricePerQuantity
+    - totalPrice
 
 customLineItem:
   domain: cart
@@ -54,6 +55,8 @@ customLineItem:
     - taxCategory
     - taxRate
     - custom
+    - discountedPricePerQuantity
+    - totalPrice
 
 taxedPrice:
   domain: common