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

Merge pull request #1884 from rahulshukla-webkul/development 

Issue #1463
This commit is contained in:
Jitendra Singh 2019-12-12 17:23:31 +05:30 committed by GitHub
parent 2a6ba89999 90fd1d45e5
commit feb2ee0ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
View File

@ -59,15 +59,12 @@ class WishlistController extends Controller
/**
* Displays the listing resources if the customer having items in wishlist.
*
*
* @return \Illuminate\View\View
*/
public function index()
{
$wishlistItems = $this->wishlistRepository->findWhere([
'channel_id' => core()->getCurrentChannel()->id,
'customer_id' => auth()->guard('customer')->user()->id]
);
$wishlistItems = $this->wishlistRepository->getCustomerWhishlist();
return view($this->_config['view'])->with('items', $wishlistItems);
}

3
packages/Webkul/Customer/src/Repositories/WishlistRepository.php
View File

@ -62,8 +62,7 @@ class WishlistRepository extends Repository
return $this->model->find($id)->item_wishlist;
}
/**
/**
* get customer wishlist Items.
*
* @return mixed

6
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -296,7 +296,7 @@
else
paymentHtml = Vue.compile(response.data.html)
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] + 1;
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
shippingMethods = response.data.shippingMethods;
@ -320,7 +320,7 @@
this_this.disable_button = false;
paymentHtml = Vue.compile(response.data.html)
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] + 1;
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
paymentMethods = response.data.paymentMethods;
@ -344,7 +344,7 @@
this_this.disable_button = false;
reviewHtml = Vue.compile(response.data.html)
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] + 1;
this_this.completed_step = this_this.step_numbers[response.data.jump_to_section] - 1;
this_this.current_step = this_this.step_numbers[response.data.jump_to_section];
this_this.getOrderSummary();

10
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
View File

@ -22,7 +22,7 @@
<a href="{{ route('customer.wishlist.removeall') }}">{{ __('shop::app.customer.account.wishlist.deleteall') }}</a>
</div>
@endif
<div class="horizontal-rule"></div>
</div>
@ -43,10 +43,10 @@
<div class="info">
<div class="product-name">
{{ $item->product->name }}
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
@ -76,6 +76,10 @@
<div class="horizontal-rule mb-10 mt-10"></div>
@endforeach
<div class="bottom-toolbar">
{{ $items->links() }}
</div>
@else
<div class="empty">
{{ __('customer::app.wishlist.empty') }}