From 197e6a8f639caaf02550421403d573c25d05b6b5 Mon Sep 17 00:00:00 2001 From: merdan Date: Sat, 16 Apr 2022 11:17:19 +0500 Subject: [PATCH] sort fixing --- packages/Sarga/Admin/src/Shipment/Courier.php | 3 +-- packages/Sarga/Admin/src/Shipment/Pickup.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/Sarga/Admin/src/Shipment/Courier.php b/packages/Sarga/Admin/src/Shipment/Courier.php index cba3734cd..1e3766192 100644 --- a/packages/Sarga/Admin/src/Shipment/Courier.php +++ b/packages/Sarga/Admin/src/Shipment/Courier.php @@ -63,7 +63,6 @@ class Courier extends AbstractShipping } public function estimatedDelivery(){ - return Carbon::today()->addDays($this->getConfigData('delivery_day_min'))->toDateString().' / '. - Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->toDateString(); + return Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->format('d.m.Y'); } } \ No newline at end of file diff --git a/packages/Sarga/Admin/src/Shipment/Pickup.php b/packages/Sarga/Admin/src/Shipment/Pickup.php index 73157f989..ab7859ad7 100644 --- a/packages/Sarga/Admin/src/Shipment/Pickup.php +++ b/packages/Sarga/Admin/src/Shipment/Pickup.php @@ -63,7 +63,6 @@ class Pickup extends AbstractShipping } public function estimatedDelivery(){ - return Carbon::today()->addDays($this->getConfigData('delivery_day_min'))->toDateString().' / '. - Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->toDateString(); + return Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->format('d.m.Y'); } } \ No newline at end of file