diff --git a/src/DTO/DellinTrack.php b/src/DTO/DellinTrack.php index 778d5d2..e2903f8 100644 --- a/src/DTO/DellinTrack.php +++ b/src/DTO/DellinTrack.php @@ -44,35 +44,30 @@ class DellinTrack extends DataTransferObject */ public static function fromArray(array $data): self { - $price = 0; + $data = $data['orders'][0]; $derivalDate = null; $arrivalDate = null; - $orderId = $data['order_id'] ?? null; + $orderId = $data['orderId'] ?? null; + $price = $data['totalSum'] ?? 0; - if (isset($data['documents'])) { - $index = array_search('shipping', array_column($data['documents'], 'document_type')); - if ($index !== false) { - $price = $data['documents'][$index]['total_sum'] ?? 0; - } - } $link = $orderId ? 'https://www.dellin.ru/tracker/orders/' . $orderId . '/' : ''; - if (isset($data['ordered_at'])) { - $derivalDate = Carbon::parse($data['ordered_at']); - } elseif (isset($data['order_dates']['derrival_from_osp_sender'])) { - $derivalDate = Carbon::parse($data['order_dates']['derrival_from_osp_sender']); + if (isset($data['orderDate'])) { + $derivalDate = Carbon::parse($data['orderDate']); + } elseif (isset($data['orderDates']['derivalFromOspSender'])) { + $derivalDate = Carbon::parse($data['orderDates']['derivalFromOspSender']); } - if (isset($data['arrival_date'])) { - $arrivalDate = Carbon::parse($data['arrival_date']); - } elseif (isset($data['order_dates']['arrival_to_osp_receiver'])) { - $arrivalDate = Carbon::parse($data['order_dates']['arrival_to_osp_receiver']); + if (isset($data['orderDates']['giveoutFromOspReceiver'])) { + $arrivalDate = Carbon::parse($data['orderDates']['giveoutFromOspReceiver']); + } elseif (isset($data['orderDates']['arrivalToOspReceiver'])) { + $arrivalDate = Carbon::parse($data['orderDates']['arrivalToOspReceiver']); } return new self( [ - 'status' => $data['state_name'] ?? null, + 'status' => $data['stateName'] ?? null, 'price' => (float) $price, 'link' => $link, 'startDate' => $derivalDate, diff --git a/src/Libraries/DellinClient.php b/src/Libraries/DellinClient.php index 60bd477..bc6a680 100644 --- a/src/Libraries/DellinClient.php +++ b/src/Libraries/DellinClient.php @@ -96,9 +96,9 @@ public function request(string $path, array $params = [], string $method = 'POST public function findByTrackNumber(string $trackNumber): DellinTrack { $data = $this->request( - 'v2/public/tracker', + 'v3/orders', [ - 'docid' => $trackNumber, + 'docIds' => [$trackNumber], ] );