From 7b3e3e10c6863f45761bee69b1006d26ec7457c9 Mon Sep 17 00:00:00 2001 From: tomas-novotny Date: Mon, 22 May 2023 17:01:15 +0200 Subject: [PATCH] Fix datetime format for orderpickup request --- src/Service/DefaultPackageService.php | 4 ++-- .../Service/DefaultPackageServiceTest.php | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Service/DefaultPackageService.php b/src/Service/DefaultPackageService.php index cbdbbc1..7fcfe03 100644 --- a/src/Service/DefaultPackageService.php +++ b/src/Service/DefaultPackageService.php @@ -197,8 +197,8 @@ public function orderPickup( ): void { $response = $this->client->call(Version::V2V1, $carrier, Method::ORDER_PICKUP, [ 'date' => $dateFrom->format('Y-m-d'), - 'time_from' => $dateFrom->format('H:s'), - 'time_to' => $dateTo->format('H:s'), + 'time_from' => $dateFrom->format('H:i'), + 'time_to' => $dateTo->format('H:i'), 'weight' => $weight, 'package_count' => $packageCount, 'message' => $message, diff --git a/tests/Unit/Service/DefaultPackageServiceTest.php b/tests/Unit/Service/DefaultPackageServiceTest.php index 770770f..82b0717 100644 --- a/tests/Unit/Service/DefaultPackageServiceTest.php +++ b/tests/Unit/Service/DefaultPackageServiceTest.php @@ -635,8 +635,8 @@ public function testOrderB2AShipment(): void public function testOrderPickup(): void { $carrier = Carrier::PPL; - $dateFrom = new DateTimeImmutable('2020-08-01 16:00:00'); - $dateTo = new DateTimeImmutable('2020-08-01 19:00:00'); + $dateFrom = new DateTimeImmutable('2020-08-01 16:10:00'); + $dateTo = new DateTimeImmutable('2020-08-01 19:20:00'); $weight = 15.6; $packageCount = 2; $message = 'testMessage'; @@ -649,9 +649,9 @@ public function testOrderPickup(): void $carrier, Method::ORDER_PICKUP, [ - 'date' => $dateFrom->format('Y-m-d'), - 'time_from' => $dateFrom->format('H:s'), - 'time_to' => $dateTo->format('H:s'), + 'date' => '2020-08-01', + 'time_from' => '16:10', + 'time_to' => '19:20', 'weight' => $weight, 'package_count' => $packageCount, 'message' => $message, @@ -677,8 +677,8 @@ public function testOrderPickupWithError(): void $this->expectExceptionMessage($errorMessage); $carrier = Carrier::PPL; - $dateFrom = new DateTimeImmutable('2020-08-01 16:00:00'); - $dateTo = new DateTimeImmutable('2020-08-01 19:00:00'); + $dateFrom = new DateTimeImmutable('2020-08-01 16:10:00'); + $dateTo = new DateTimeImmutable('2020-08-01 19:20:00'); $weight = 15.6; $packageCount = 2; $message = 'testMessage'; @@ -693,9 +693,9 @@ public function testOrderPickupWithError(): void $carrier, Method::ORDER_PICKUP, [ - 'date' => $dateFrom->format('Y-m-d'), - 'time_from' => $dateFrom->format('H:s'), - 'time_to' => $dateTo->format('H:s'), + 'date' => '2020-08-01', + 'time_from' => '16:10', + 'time_to' => '19:20', 'weight' => $weight, 'package_count' => $packageCount, 'message' => $message,