diff --git a/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php index 535293e54..b2bf1203b 100644 --- a/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php @@ -41,11 +41,13 @@ class CustomerController extends Controller * * @return response JSON */ - public function getProfile() { + public function getProfile() + { return response()->json($this->customer, 200); } - public function updateProfile($id) { + public function updateProfile($id) + { $validator = Validator::make(request()->all(), [ 'first_name' => 'string|required', 'last_name' => 'string|required', diff --git a/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php b/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php index a74189487..d2fbd9446 100644 --- a/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php @@ -34,22 +34,19 @@ class WishlistController extends Controller } } - public function unAuthorized() { + public function unAuthorized() + { return response()->json($this->customer, 401); } public function getWishlist() { - if($this->customer == false) { - return response()->json($this->customer, 401); - } else { - $wishlist = $this->customer->wishlist_items; + $wishlist = $this->customer->wishlist_items; - if($wishlist->count() > 0) { - return response()->json($wishlist, 200); - } else { - return response()->json(['message' => 'Wishlist Empty', 'Items' => null], 200); - } + if($wishlist->count() > 0) { + return response()->json($wishlist, 200); + } else { + return response()->json(['message' => 'Wishlist Empty', 'Items' => null], 200); } } @@ -92,7 +89,8 @@ class WishlistController extends Controller * * @param integer $itemId */ - public function delete($itemId) { + public function delete($itemId) + { $result = $this->wishlist->deleteWhere(['customer_id' => auth()->guard('customer')->user()->id, 'channel_id' => core()->getCurrentChannel()->id, 'id' => $itemId]); if($result) { diff --git a/packages/Webkul/API/Http/api.php b/packages/Webkul/API/Http/api.php index d7ac91159..a3934a13d 100644 --- a/packages/Webkul/API/Http/api.php +++ b/packages/Webkul/API/Http/api.php @@ -1,5 +1,7 @@ json(['message' => 'unauthorized'])->name('login'); +}); Route::group(['middleware' => 'api','namespace' => 'Webkul\API\Http\Controllers\Customer', 'prefix' => 'api/customer'], function ($router) { Route::post('/register', 'RegistrationController@create'); }); diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 972af7ef3..a3936c7ca 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -86,6 +86,8 @@ class CartController extends Controller * @return Mixed */ public function add($id) { + // dd($id, request()->all()); + $result = Cart::add($id, request()->except('_token')); if($result) { diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index e0e662b24..ca060580c 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -918,7 +918,7 @@ section.slider-block { } .dropdown-content .item-details{ - height: 75px; + max-height: 125px; } .item-details .item-name { @@ -927,6 +927,12 @@ section.slider-block { margin-bottom: 8px; } + .item-details .item-options { + font-size: 16px; + font-weight: bold; + margin-bottom: 8px; + } + .item-details .item-price { margin-bottom: 8px; } diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index d4938ec8c..160ed765c 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -5,28 +5,20 @@ @stop @section('content-wrapper') - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
- @if ($cart) -
{{ __('shop::app.checkout.cart.title') }}
-
- @csrf - @foreach($cart->items as $item) - type == "configurable") $productBaseImage = $productImageHelper->getProductBaseImage($item->child->product); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index 8c87977c3..54bacd9a7 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -21,35 +21,14 @@