Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dilowagner committed Sep 5, 2019
2 parents d758b28 + 177c6e7 commit decf2fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Resources/Order/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Order

/**
* @var \DateTime
* @JMS\Type("DateTime<'Y-m-d\TH:i:s.973Z'>")
* @JMS\Type("DateTime<'Y-m-d\TH:i:s.000-04:00'>")
*/
private $dateLastUpdated;

Expand Down
3 changes: 2 additions & 1 deletion tests/Resources/Order/OrdersSearchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public function assertingOrdersMappingAttributes()
$this->assertEquals("just paid", $order->getStatusDetail()->getDescription());
$this->assertEquals("123", $order->getStatusDetail()->getCode());
$this->assertEquals("2016-02-25", $order->getDateCreated()->format("Y-m-d"));
$this->assertEquals("2016-02-25", $order->getDateClosed()->format("Y-m-d"));
$this->assertEquals("2016-02-25", $order->getDateClosed()->format("Y-m-d"));
$this->assertEquals("2016-02-25UTC15:55:44", $order->getDateLastUpdated()->format("Y-m-dTH:i:s"));
$this->assertEquals(10, $order->getTotalAmount());
$this->assertEquals("ARS", $order->getCurrencyId());
$this->assertEquals(["not_delivered", "paid"], $order->getTags());
Expand Down
2 changes: 1 addition & 1 deletion tests/Resources/Order/orders.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"date_created": "2016-02-25T15:53:38.000-04:00",
"date_closed": "2016-02-25T15:53:37.000-04:00",
"expiration_date": "2016-03-17T15:53:38.000-04:00",
"date_last_updated": "2016-02-25T15:55:44.973Z",
"date_last_updated": "2016-02-25T15:55:44.000-04:00",
"hidden_for_seller": false,
"currency_id": "ARS",
"order_items": [
Expand Down

0 comments on commit decf2fc

Please sign in to comment.