merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort fixing

This commit is contained in:
merdan 2022-04-16 11:41:03 +05:00
parent 197e6a8f63
commit b08b98e8aa
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Sarga/API/Http/Controllers/Checkout.php
View File

@ -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();

13
packages/Sarga/API/Http/Resources/Customer/OrderResource.php
View File

@ -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();
}
}