diff --git a/config/app.php b/config/app.php index a42f0875f..328d1a18f 100644 --- a/config/app.php +++ b/config/app.php @@ -189,7 +189,7 @@ return [ Webkul\Inventory\Providers\InventoryServiceProvider::class, Webkul\Product\Providers\ProductServiceProvider::class, Webkul\Theme\Providers\ThemeServiceProvider::class, - Webkul\Checkout\Providers\CartServiceProvider::class, + Webkul\Checkout\Providers\CheckoutServiceProvider::class, Webkul\Shipping\Providers\ShippingServiceProvider::class, Webkul\Payment\Providers\PaymentServiceProvider::class, Webkul\Sales\Providers\SalesServiceProvider::class, diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index f481dc51f..ec1c41953 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1,14 +1,14 @@ loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); diff --git a/packages/Webkul/Shipping/src/Carriers/FlatRate.php b/packages/Webkul/Shipping/src/Carriers/FlatRate.php index 715f11538..6f9e48953 100644 --- a/packages/Webkul/Shipping/src/Carriers/FlatRate.php +++ b/packages/Webkul/Shipping/src/Carriers/FlatRate.php @@ -3,7 +3,7 @@ namespace Webkul\Shipping\Carriers; use Config; -use Webkul\Cart\Models\CartShippingRate; +use Webkul\Checkout\Models\CartShippingRate; use Webkul\Shipping\Facades\Shipping; /** diff --git a/packages/Webkul/Shipping/src/Carriers/Free.php b/packages/Webkul/Shipping/src/Carriers/Free.php index 5ef07c928..784de27ba 100644 --- a/packages/Webkul/Shipping/src/Carriers/Free.php +++ b/packages/Webkul/Shipping/src/Carriers/Free.php @@ -3,7 +3,7 @@ namespace Webkul\Shipping\Carriers; use Config; -use Webkul\Cart\Models\CartShippingRate; +use Webkul\Checkout\Models\CartShippingRate; use Webkul\Shipping\Facades\Shipping; /** diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php index fb8d06406..33f96fae7 100644 --- a/packages/Webkul/Shipping/src/Shipping.php +++ b/packages/Webkul/Shipping/src/Shipping.php @@ -3,7 +3,7 @@ namespace Webkul\Shipping; use Illuminate\Support\Facades\Config; -use Webkul\Cart\Facades\Cart; +use Webkul\Checkout\Facades\Cart; /** * Class Shipping. @@ -49,7 +49,7 @@ class Shipping 'html' => view('shop::checkout.onepage.shipping', ['shippingRateGroups' => $this->getGroupedAllShippingRates()])->render() ]; } - + /** * Persist shipping rate to database * @@ -64,7 +64,7 @@ class Shipping $rate->delete(); } } - + /** * Persist shipping rate to database * diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 2aad9aaaa..537f8d112 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -1,11 +1,11 @@