Merge branch 'release/v1.0.0-RC5'

Author: Jens Schulze

CHANGELOG.md

@@ -5,7 +5,8 @@
 ### Features
 
 * **LineItems:** add update actions for custom types on line items ([c64fad0](https://github.com/sphereio/commercetools-php-sdk/commit/c64fad0))
-* **Payment:** add payment update actions for cart ([13e1860](https://github.com/sphereio/commercetools-php-sdk/commit/13e1860))
+* **Payment:** add payment info to cart and order ([e279d1a](https://github.com/sphereio/commercetools-php-sdk/commit/e279d1a))
+* **Payment:** add payment update actions for cart and order ([13e1860](https://github.com/sphereio/commercetools-php-sdk/commit/13e1860))
 
 
 

src/Model/Cart/Cart.php

@@ -12,6 +12,7 @@
 use Commercetools\Core\Model\CustomerGroup\CustomerGroupReference;
 use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use Commercetools\Core\Model\Common\DateTimeDecorator;
+use Commercetools\Core\Model\Payment\PaymentInfo;
 
 /**
  * @package Commercetools\Core\Model\Cart
@@ -54,6 +55,8 @@
  * @method Cart setDiscountCodes(DiscountCodeInfoCollection $discountCodes = null)
  * @method CustomFieldObject getCustom()
  * @method Cart setCustom(CustomFieldObject $custom = null)
+ * @method PaymentInfo getPaymentInfo()
+ * @method Cart setPaymentInfo(PaymentInfo $paymentInfo = null)
  */
 class Cart extends Resource
 {
@@ -85,6 +88,7 @@ public function fieldDefinitions()
             'shippingInfo' => [static::TYPE => '\Commercetools\Core\Model\Cart\ShippingInfo'],
             'discountCodes' => [static::TYPE => '\Commercetools\Core\Model\Cart\DiscountCodeInfoCollection'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
+            'paymentInfo' => [static::TYPE => '\Commercetools\Core\Model\Cart\PaymentInfo'],
         ];
     }
 }

src/Model/Order/Order.php

@@ -76,6 +76,8 @@
  * @method Order setCustom(CustomFieldObject $custom = null)
  * @method StateReference getState()
  * @method Order setState(StateReference $state = null)
+ * @method PaymentInfo getPaymentInfo()
+ * @method Order setPaymentInfo(PaymentInfo $paymentInfo = null)
  */
 class Order extends Resource
 {
@@ -114,7 +116,8 @@ public function fieldDefinitions()
             'lastMessageSequenceNumber' => [static::TYPE => 'int'],
             'cart' => [static::TYPE => '\Commercetools\Core\Model\Cart\CartReference'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
-            'state' => [static::TYPE => '\Commercetools\Core\Model\State\StateReference']
+            'state' => [static::TYPE => '\Commercetools\Core\Model\State\StateReference'],
+            'paymentInfo' => [static::TYPE => '\Commercetools\Core\Model\Cart\PaymentInfo'],
         ];
     }
 }

src/Model/Payment/PaymentInfo.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @author @ct-jensschulze <[email protected]>
+ */
+
+namespace Commercetools\Core\Model\Payment;
+
+use Commercetools\Core\Model\Common\JsonObject;
+
+/**
+ * @package Commercetools\Core\Model\Payment
+ *
+ * @method PaymentCollection getPayments()
+ * @method PaymentInfo setPayments(PaymentCollection $payments = null)
+ */
+class PaymentInfo extends JsonObject
+{
+    public function fieldDefinitions()
+    {
+        return [
+            'payments' => [static::TYPE => '\Commercetools\Core\Model\Payment\PaymentCollection'],
+        ];
+    }
+}

src/Model/Payment/PaymentReference.php

@@ -8,6 +8,16 @@
 use Commercetools\Core\Model\Common\Context;
 use Commercetools\Core\Model\Common\Reference;
 
+/**
+ * @package Commercetools\Core\Model\Payment
+ *
+ * @method string getTypeId()
+ * @method PaymentReference setTypeId(string $typeId = null)
+ * @method string getId()
+ * @method PaymentReference setId(string $id = null)
+ * @method Payment getObj()
+ * @method PaymentReference setObj(Payment $obj = null)
+ */
 class PaymentReference extends Reference
 {
     const TYPE_PAYMENT = 'payment';

src/Request/Carts/Command/CartAddPaymentAction.php

@@ -7,7 +7,16 @@
 
 use Commercetools\Core\Model\Common\Context;
 use Commercetools\Core\Request\AbstractAction;
+use Commercetools\Core\Model\Payment\PaymentReference;
 
+/**
+ * @package Commercetools\Core\Request\Carts\Command
+ *
+ * @method string getAction()
+ * @method CartAddPaymentAction setAction(string $action = null)
+ * @method PaymentReference getPayment()
+ * @method CartAddPaymentAction setPayment(PaymentReference $payment = null)
+ */
 class CartAddPaymentAction extends AbstractAction
 {
     public function fieldDefinitions()

src/Request/Carts/Command/CartRemovePaymentAction.php

@@ -7,7 +7,16 @@
 
 use Commercetools\Core\Model\Common\Context;
 use Commercetools\Core\Request\AbstractAction;
+use Commercetools\Core\Model\Payment\PaymentReference;
 
+/**
+ * @package Commercetools\Core\Request\Carts\Command
+ *
+ * @method string getAction()
+ * @method CartRemovePaymentAction setAction(string $action = null)
+ * @method PaymentReference getPayment()
+ * @method CartRemovePaymentAction setPayment(PaymentReference $payment = null)
+ */
 class CartRemovePaymentAction extends AbstractAction
 {
     public function fieldDefinitions()

src/Request/Orders/Command/OrderAddPaymentAction.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @author @ct-jensschulze <[email protected]>
+ */
+
+namespace Commercetools\Core\Request\Orders\Command;
+
+use Commercetools\Core\Request\Carts\Command\CartAddPaymentAction;
+use Commercetools\Core\Model\Payment\PaymentReference;
+
+/**
+ * @package Commercetools\Core\Request\Orders\Command
+ *
+ * @method string getAction()
+ * @method OrderAddPaymentAction setAction(string $action = null)
+ * @method PaymentReference getPayment()
+ * @method OrderAddPaymentAction setPayment(PaymentReference $payment = null)
+ */
+class OrderAddPaymentAction extends CartAddPaymentAction
+{
+
+}

src/Request/Orders/Command/OrderRemovePaymentAction.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @author @ct-jensschulze <[email protected]>
+ */
+
+namespace Commercetools\Core\Request\Orders\Command;
+
+use Commercetools\Core\Request\Carts\Command\CartRemovePaymentAction;
+use Commercetools\Core\Model\Payment\PaymentReference;
+
+/**
+ * @package Commercetools\Core\Request\Orders\Command
+ *
+ * @method string getAction()
+ * @method OrderRemovePaymentAction setAction(string $action = null)
+ * @method PaymentReference getPayment()
+ * @method OrderRemovePaymentAction setPayment(PaymentReference $payment = null)
+ */
+class OrderRemovePaymentAction extends CartRemovePaymentAction
+{
+
+}

tests/fixtures/models.yaml

@@ -21,6 +21,7 @@ cart:
     - shippingInfo
     - discountCodes
     - custom
+    - paymentInfo
 
 lineItem:
   domain: cart
@@ -336,6 +337,7 @@ order:
     - cart
     - custom
     - state
+    - paymentInfo
 
 syncInfo:
   domain: order