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:01:51 +05:00
parent 05164c42c1
commit 105a2c758b
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
packages/Sarga/Admin/src/Shipment/Courier.php
View File

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

6
packages/Sarga/Admin/src/Shipment/Pickup.php
View File

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

6
packages/Webkul/Shipping/src/Shipping.php
View File

@ -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'),
];
}