Merge pull request #71 from bagisto/prashant

Prashant

packages/Webkul/Product/src/Repositories/ProductGridRepository.php

@@ -105,8 +105,7 @@ class ProductGridRepository extends Repository
 
                     $gridObject['quantity'] = $qty;
                 }
-
-                return $this->getModel()->where('product_id', $product->id)->update($gridObject);
+                return $this->getModel()->where('product_id', $variant->id)->update($gridObject);
             }
         }
         return false;

packages/Webkul/Shop/src/Http/routes.php

@@ -120,6 +120,22 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
 
             Route::get('wishlist/moveall', 'Webkul\Customer\Http\Controllers\WishlistController@moveAll')->name('customer.wishlist.moveall');
 
+            // Forget Password Routes
+            Route::get('/forget-password', 'Webkul\Customer\Http\Controllers\ForgetPasswordController@create')->defaults('_config', [
+                'view' => 'shop::customers.signup.forget-password'
+            ])->name('customer.forget-password.create');
+
+            Route::post('/forget-password', 'Webkul\Customer\Http\Controllers\ForgetPasswordController@store')->name('customer.forget-password.store');
+
+            //Reset Password create
+            Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [
+                'view' => 'shop::customers.signup.reset-password'
+            ])->name('password.reset');
+
+            Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [
+                'redirect' => 'customer.session.index'
+            ])->name('customer.reset-password.store');
+
             //customer account
             Route::prefix('account')->group(function () {
 

packages/Webkul/Shop/src/Resources/assets/sass/app.scss

@@ -574,7 +574,6 @@ section.slider-block {
         ul.nav {
             display: block;
             font-size:16px;
-            // height: 48px;
             max-width: 100%;
             width: auto;
             margin-left: auto;
@@ -598,10 +597,6 @@ section.slider-block {
             position: relative;
         }
 
-        .nav a:first-child{
-            // margin-left: 20px;
-        }
-
         .nav  li  > .icon{
             display: none;
         }

packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php

@@ -38,8 +38,10 @@
             @include ('shop::products.add-to', ['product' => $product])
         @else
             @if($product->type == "configurable")
-                <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.products.add-to-cart') }}</a>
+                <div class="cart-wish-wrap">
+                    <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.products.add-to-cart') }}</a>
                 @include('shop::products.wishlist')
+                </div>
             @else
                 <div class="cart-wish-wrap">
                     <form action="{{route('cart.add', $product->id)}}" method="POST">

packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php

@@ -99,7 +99,7 @@
             @endif
         @endforeach
         @if(count($actions))
-            <th>
+            <th style="width: 85px;">
                 {{ __('ui::app.datagrid.actions') }}
             </th>
         @endif