From 34833ff9958feca9504f657b13a1468a30039a37 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 28 Sep 2018 18:58:54 +0530
Subject: [PATCH] Path Errors Fixed

---
 config/app.php                                   |  2 +-
 packages/Webkul/Checkout/src/Cart.php            | 16 ++++++++--------
 .../src/Http/ViewComposers/CartComposer.php      |  4 ++--
 ...eProvider.php => CheckoutServiceProvider.php} |  4 ++--
 .../Webkul/Shipping/src/Carriers/FlatRate.php    |  2 +-
 packages/Webkul/Shipping/src/Carriers/Free.php   |  2 +-
 packages/Webkul/Shipping/src/Shipping.php        |  6 +++---
 .../Shop/src/Http/Controllers/CartController.php |  6 +++---
 .../src/Http/Controllers/OnepageController.php   |  6 +++---
 9 files changed, 24 insertions(+), 24 deletions(-)
 rename packages/Webkul/Checkout/src/Providers/{CartServiceProvider.php => CheckoutServiceProvider.php} (95%)

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 @@
 <?php
 
-namespace Webkul\Cart;
+namespace Webkul\Checkout;
 
 use Carbon\Carbon;
-use Webkul\Cart\Repositories\CartRepository;
-use Webkul\Cart\Repositories\CartItemRepository;
-use Webkul\Cart\Repositories\CartAddressRepository;
+use Webkul\Checkout\Repositories\CartRepository;
+use Webkul\Checkout\Repositories\CartItemRepository;
+use Webkul\Checkout\Repositories\CartAddressRepository;
 use Webkul\Customer\Repositories\CustomerRepository;
 use Webkul\Product\Repositories\ProductRepository;
-use Webkul\Cart\Models\CartPayment;
+use Webkul\Checkout\Models\CartPayment;
 
 /**
  * Facade for all the methods to be implemented in Cart.
@@ -57,9 +57,9 @@ class Cart {
     /**
      * Create a new controller instance.
      *
-     * @param  Webkul\Cart\Repositories\CartRepository $cart
-     * @param  Webkul\Cart\Repositories\CartItemRepository $cartItem
-     * @param  Webkul\Cart\Repositories\CartAddressRepository $cartAddress
+     * @param  Webkul\Checkout\Repositories\CartRepository $cart
+     * @param  Webkul\Checkout\Repositories\CartItemRepository $cartItem
+     * @param  Webkul\Checkout\Repositories\CartAddressRepository $cartAddress
      * @param  Webkul\Customer\Repositories\CustomerRepository $customer
      * @param  Webkul\Product\Repositories\ProductRepository $product
      * @return void
diff --git a/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php b/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php
index 3d1516588..5fc83ca5d 100644
--- a/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php
+++ b/packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php
@@ -5,8 +5,8 @@ namespace Webkul\Checkout\Http\ViewComposers;
 use Illuminate\View\View;
 use Illuminate\Support\Collection;
 
-use Webkul\Cart\Repositories\CartRepository;
-use Webkul\Cart\Repositories\CartItemRepository;
+use Webkul\Checkout\Repositories\CartRepository;
+use Webkul\Checkout\Repositories\CartItemRepository;
 
 //Product Image Helper Class
 use Webkul\Product\Product\ProductImage;
diff --git a/packages/Webkul/Checkout/src/Providers/CartServiceProvider.php b/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
similarity index 95%
rename from packages/Webkul/Checkout/src/Providers/CartServiceProvider.php
rename to packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
index b4015ff4e..768a0bd21 100644
--- a/packages/Webkul/Checkout/src/Providers/CartServiceProvider.php
+++ b/packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
@@ -11,13 +11,13 @@ use Webkul\Customer\Http\Middleware\RedirectIfNotCustomer;
 use Webkul\Checkout\Facades\Cart;
 use Webkul\Checkout\Providers\ComposerServiceProvider;
 
-class CartServiceProvider extends ServiceProvider
+class CheckoutServiceProvider extends ServiceProvider
 {
 
     public function boot(Router $router)
     {
         include __DIR__ . '/../Http/helpers.php';
-        
+
         $this->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 @@
 <?php
 
-namespace Webkul\Cart\Http\Controllers;
+namespace Webkul\Shop\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Webkul\Cart\Repositories\CartRepository;
-use Webkul\Cart\Repositories\CartItemRepository;
+use Webkul\Checkout\Repositories\CartRepository;
+use Webkul\Checkout\Repositories\CartItemRepository;
 use Webkul\Product\Repositories\ProductRepository;
 use Webkul\Customer\Repositories\CustomerRepository;
 use Webkul\Product\Product\ProductImage;
diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
index b7009390a..3d8a45707 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
@@ -5,10 +5,10 @@ namespace Webkul\Shop\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Auth;
-use Webkul\Cart\Facades\Cart;
+use Webkul\Checkout\Facades\Cart;
 use Webkul\Shipping\Facades\Shipping;
 use Webkul\Payment\Facades\Payment;
-use Webkul\Cart\Http\Requests\CustomerAddressForm;
+use Webkul\Checkout\Http\Requests\CustomerAddressForm;
 
 /**
  * Chekout controller for the customer and guest for placing order
@@ -51,7 +51,7 @@ class OnepageController extends Controller
     /**
      * Saves customer address.
      *
-     * @param  \Webkul\Cart\Http\Requests\CustomerAddressForm $request
+     * @param  \Webkul\Checkout\Http\Requests\CustomerAddressForm $request
      * @return \Illuminate\Http\Response
     */
     public function saveAddress(CustomerAddressForm $request)