diff --git a/CHANGELOG.md b/CHANGELOG.md index 335b14b..a76ee0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Marketplace API client - change log +## 3.11.6 +- added support for `first_delivery_attempt` order field + ## 3.11.5 - reverted the changes from 3.11.1 - 3.11.4 diff --git a/Example/OrdersExample.php b/Example/OrdersExample.php index 0c9b450..20a2275 100644 --- a/Example/OrdersExample.php +++ b/Example/OrdersExample.php @@ -160,11 +160,12 @@ /** * ################################## - * Update order status with delivered at datetime + * Update order status with delivered at and first delivery attempt datetime * ################################## */ + $firstDeliveryAttempt = new \DateTime('2017-08-29 10:09:25'); $deliveredToCustomer = new \DateTime('2017-08-30 12:03:32'); - $responseStatus = $orders->put()->status($order->getOrderId(), Order::STATUS_DELIVERED, true, '', $deliveredToCustomer); + $responseStatus = $orders->put()->status($order->getOrderId(), Order::STATUS_DELIVERED, true, '', $deliveredToCustomer, $firstDeliveryAttempt); print('New order status: '); var_dump($responseStatus); print(PHP_EOL); diff --git a/composer.json b/composer.json index ae44ed1..3448dfc 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name" : "mallgroup/mpapi-client", "description" : "Mall marketplace API client", - "version" : "3.11.5", + "version" : "3.11.6", "require" : { "php" : "^5.5 || ^7.0", "guzzlehttp/guzzle" : ">=6.2.3", diff --git a/src/Endpoints/OrderUpdateEndpoints.php b/src/Endpoints/OrderUpdateEndpoints.php index dfe2463..9626047 100644 --- a/src/Endpoints/OrderUpdateEndpoints.php +++ b/src/Endpoints/OrderUpdateEndpoints.php @@ -58,24 +58,38 @@ class OrderUpdateEndpoints extends AbstractEndpoints /** * Update order status * - * @param integer $orderId - * @param string $status - * @param boolean $confirmed - * @param string $trackingNumber + * @param integer $orderId + * @param string $status + * @param boolean $confirmed + * @param string $trackingNumber * @param \DateTimeInterface|null $deliveredAt + * @param \DateTimeInterface|null $firstDeliveryAttempt * @return bool + * @throws \MPAPI\Exceptions\ClientIdException + * @throws \MPAPI\Exceptions\ForceTokenException */ - public function status($orderId, $status, $confirmed = true, $trackingNumber = '', \DateTimeInterface $deliveredAt = null) + public function status( + $orderId, + $status, + $confirmed = true, + $trackingNumber = '', + \DateTimeInterface $deliveredAt = null, + \DateTimeInterface $firstDeliveryAttempt = null + ) { $requestData = [ - 'status' => $status, - 'confirmed' => $confirmed + 'status' => $status, + 'confirmed' => $confirmed, ]; if ($deliveredAt !== null) { $requestData['delivered_at'] = $deliveredAt->format(self::DATETIME_FORMAT); } + if ($firstDeliveryAttempt !== null) { + $requestData['first_delivery_attempt'] = $firstDeliveryAttempt->format(self::DATETIME_FORMAT); + } + if (!empty($trackingNumber)) { $requestData['tracking_number'] = $trackingNumber; } diff --git a/src/Services/Client.php b/src/Services/Client.php index 6ab5355..1c79c3f 100644 --- a/src/Services/Client.php +++ b/src/Services/Client.php @@ -27,7 +27,7 @@ class Client * * @var string */ - const APPLICATION_NAME = 'mpapic-v3.11.5'; + const APPLICATION_NAME = 'mpapic-v3.11.6'; /** *