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

---
 packages/Sarga/API/Http/Controllers/Checkout.php    | 10 +---------
 .../API/Http/Resources/Customer/OrderResource.php   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/Checkout.php b/packages/Sarga/API/Http/Controllers/Checkout.php
index ffcca5df1..7e874ecee 100644
--- a/packages/Sarga/API/Http/Controllers/Checkout.php
+++ b/packages/Sarga/API/Http/Controllers/Checkout.php
@@ -150,15 +150,7 @@ class Checkout extends CheckoutController
             ]);
         }
 
-        $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);
+        $order = $orderRepository->create(Cart::prepareDataForOrder());
 
         Cart::deActivateCart();
 
diff --git a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
index 0b45ea434..c7e5f726e 100644
--- a/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
+++ b/packages/Sarga/API/Http/Resources/Customer/OrderResource.php
@@ -4,6 +4,7 @@ namespace Sarga\API\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
+use Illuminate\Support\Facades\Config;
 use Webkul\Marketplace\Repositories\ProductRepository;
 use Webkul\RestApi\Http\Resources\V1\Admin\Sale\InvoiceResource;
 use Webkul\RestApi\Http\Resources\V1\Admin\Sale\OrderAddressResource;
@@ -33,6 +34,7 @@ class OrderResource extends JsonResource
             'shipping_title'                     => $this->shipping_title,
             'payment_title'                      => core()->getConfigData('sales.paymentmethods.' . $this->payment->method . '.title'),
             'shipping_description'               => $this->shipping_description,
+            'shipping_date'                      => $this->deliveryDate() ?? " ",
             'coupon_code'                        => $this->coupon_code,
             'is_gift'                            => $this->is_gift,
             'total_item_count'                   => (int) $this->total_item_count,
@@ -94,4 +96,15 @@ class OrderResource extends JsonResource
         }
         return $data;
     }
+
+    private function deliveryDate(){
+        $method = explode("_", $this->shipping_method);
+
+        $methodClass = Config::get('carriers.'.$method[0].'.class');
+
+        $methodObject = new $methodClass;
+
+        return $methodObject->estimatedDelivery();
+
+    }
 }
\ No newline at end of file