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

Merge branch 'master' of https://github.com/bagisto/bagisto into rahul

This commit is contained in:
rahul shukla 2018-10-25 10:19:17 +05:30
parent 832d75485f 2cdf0aedf0
commit 52999c971e
6 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/Resources/views/users/sessions/create.blade.php
View File

@ -33,14 +33,6 @@
<a href="{{ route('admin.forget-password.create') }}">{{ __('admin::app.users.sessions.forget-password-link-title') }}</a>
</div>
<div class="control-group">
<span class="checkbox">
<input type="checkbox" id="remember" name="remember" value="1">
<label class="checkbox-view" for="remember"></label>
{{ __('admin::app.users.sessions.remember-me') }}
</span>
</div>
<div class="button-group">
<button class="btn btn-xl btn-primary">{{ __('admin::app.users.sessions.submit-btn-title') }}</button>
</div>

3
packages/Webkul/Product/src/Repositories/ProductGridRepository.php
View File

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

16
packages/Webkul/Shop/src/Http/routes.php
View File

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

5
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

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

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

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

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

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