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

Merge pull request #30 from bagisto/prashant 

Path Errors Fixed
This commit is contained in:
JItendra Singh 2018-09-28 18:59:42 +05:30 committed by GitHub
parent 21a8028a47 34833ff995
commit fa5473d168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -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,

16
packages/Webkul/Checkout/src/Cart.php
View File

@ -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

4
packages/Webkul/Checkout/src/Http/ViewComposers/CartComposer.php
View File

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

4
packages/Webkul/Checkout/src/Providers/CartServiceProvider.php → packages/Webkul/Checkout/src/Providers/CheckoutServiceProvider.php
View File

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

2
packages/Webkul/Shipping/src/Carriers/FlatRate.php
View File

@ -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;
/**

2
packages/Webkul/Shipping/src/Carriers/Free.php
View File

@ -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;
/**

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

@ -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
*

6
packages/Webkul/Shop/src/Http/Controllers/CartController.php
View File

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

6
packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
View File

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