From 105a2c758b71022ff7f2f8d119d516ad4e80282a Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Sat, 16 Apr 2022 11:01:51 +0500
Subject: [PATCH] sort fixing

---
 packages/Sarga/API/Http/Controllers/Checkout.php | 11 ++++++++++-
 packages/Sarga/Admin/src/Shipment/Courier.php    |  5 +++++
 packages/Sarga/Admin/src/Shipment/Pickup.php     |  6 ++++++
 packages/Webkul/Shipping/src/Shipping.php        |  6 +++---
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/Checkout.php b/packages/Sarga/API/Http/Controllers/Checkout.php
index 2ad7149d0..ffcca5df1 100644
--- a/packages/Sarga/API/Http/Controllers/Checkout.php
+++ b/packages/Sarga/API/Http/Controllers/Checkout.php
@@ -3,6 +3,7 @@
 namespace Sarga\API\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use Sarga\API\Http\Resources\Checkout\CartResource;
 use Sarga\API\Http\Resources\Checkout\PickupAddress;
@@ -149,7 +150,15 @@ class Checkout extends CheckoutController
             ]);
         }
 
-        $order = $orderRepository->create(Cart::prepareDataForOrder());
+        $data = Cart::prepareDataForOrder();
+
+        $methodClass = Config::get('carriers.'.$cart->selected_shipping_rate->carrier.'.class');
+
+        $methodObject = new $methodClass;
+
+        $data['shipping_description'] = $methodObject->estimatedDelivery();
+
+        $order = $orderRepository->create($data);
 
         Cart::deActivateCart();
 
diff --git a/packages/Sarga/Admin/src/Shipment/Courier.php b/packages/Sarga/Admin/src/Shipment/Courier.php
index 66bae855a..cba3734cd 100644
--- a/packages/Sarga/Admin/src/Shipment/Courier.php
+++ b/packages/Sarga/Admin/src/Shipment/Courier.php
@@ -3,6 +3,7 @@
 namespace Sarga\Admin\Shipment;
 
 
+use Carbon\Carbon;
 use Webkul\Checkout\Facades\Cart;
 use Webkul\Checkout\Models\CartShippingRate;
 use Webkul\Shipping\Carriers\AbstractShipping;
@@ -61,4 +62,8 @@ class Courier extends AbstractShipping
         return $cartShippingRate;
     }
 
+    public function estimatedDelivery(){
+        return Carbon::today()->addDays($this->getConfigData('delivery_day_min'))->toDateString().' / '.
+            Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->toDateString();
+    }
 }
\ 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 2ab1b622c..73157f989 100644
--- a/packages/Sarga/Admin/src/Shipment/Pickup.php
+++ b/packages/Sarga/Admin/src/Shipment/Pickup.php
@@ -3,6 +3,7 @@
 namespace Sarga\Admin\Shipment;
 
 
+use Carbon\Carbon;
 use Webkul\Checkout\Facades\Cart;
 use Webkul\Checkout\Models\CartShippingRate;
 use Webkul\Shipping\Carriers\AbstractShipping;
@@ -60,4 +61,9 @@ class Pickup extends AbstractShipping
 
         return $cartShippingRate;
     }
+
+    public function estimatedDelivery(){
+        return Carbon::today()->addDays($this->getConfigData('delivery_day_min'))->toDateString().' / '.
+            Carbon::today()->addDays($this->getConfigData('delivery_day_max'))->toDateString();
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php
index 93c52a348..b0467360c 100755
--- a/packages/Webkul/Shipping/src/Shipping.php
+++ b/packages/Webkul/Shipping/src/Shipping.php
@@ -135,9 +135,9 @@ class Shipping
                 'description'  => $object->getDescription(),
                 'formatted_price'   => core()->currency($object->getConfigData('weight_price')),
                 'price'   => core()->convertPrice($object->getConfigData('weight_price')),
-                'outlet_delivery'    => (double)$object->getConfigData('outlet_delivery'),
-                'delivery_day_min'   => (double)$object->getConfigData('delivery_day_min'),
-                'delivery_day_max'   => (double)$object->getConfigData('delivery_day_max'),
+                'outlet_delivery'    => (int)$object->getConfigData('outlet_delivery'),
+                'delivery_day_min'   => (int)$object->getConfigData('delivery_day_min'),
+                'delivery_day_max'   => (int)$object->getConfigData('delivery_day_max'),
             ];
         }