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

Merge remote-tracking branch 'upstream/master' into issue-4615

This commit is contained in:
devansh bawari 2021-02-12 19:15:26 +05:30
parent b6e0621e9e 5f16a87b2c
commit fa540e0262
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/API/Http/Resources/Catalog/Product.php
View File

@ -61,7 +61,7 @@ class Product extends JsonResource
/* product's checks */
'in_stock' => $product->haveSufficientQuantity(1),
'is_saved' => false,
'is_wishlisted' => $this->wishlistHelper->getWishlistProduct($product),
'is_wishlisted' => $this->wishlistHelper->getWishlistProduct($product) ? true : false,
'is_item_in_cart' => \Cart::hasProduct($product),
'show_quantity_changer' => $this->when(
$product->type !== 'grouped',

4
packages/Webkul/Customer/src/Helpers/Wishlist.php
View File

@ -43,9 +43,9 @@ class Wishlist
}
if ($wishlist) {
return true;
return $wishlist;
}
return false;
return null;
}
}

2
packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
View File

@ -194,7 +194,7 @@
$('img#pro-img').data('zoom-image', $('img#pro-img').data('image')).ezPlus();
}
var wishlist = " <?php echo $wishListHelper->getWishlistProduct($product); ?> ";
var wishlist = "{{ $wishListHelper->getWishlistProduct($product) ? 'true' : 'false' }}";
$(document).mousemove(function(event) {
if ($('.add-to-wishlist').length || wishlist != 0) {

22
packages/Webkul/Velocity/src/Resources/views/shop/products/wishlist.blade.php
View File

@ -4,22 +4,22 @@
@auth('customer')
@php
$isWished = $wishListHelper->getWishlistProduct($product);
/* search wishlist on the basis of product's id so that wishlist id can be catched */
$wishlist = $wishListHelper->getWishlistProduct($product);
/* link making */
$href = isset($route) ? $route : ($wishlist ? route('customer.wishlist.remove', $wishlist->id) : route('customer.wishlist.add', $product->product_id));
/* title */
$title = $wishlist ? __('velocity::app.shop.wishlist.remove-wishlist-text') : __('velocity::app.shop.wishlist.add-wishlist-text');
@endphp
<a
class="unset wishlist-icon {{ $addWishlistClass ?? '' }} text-right"
@if(isset($route))
href="{{ $route }}"
@elseif (! $isWished)
href="{{ route('customer.wishlist.add', $product->product_id) }}"
title="{{ __('velocity::app.shop.wishlist.add-wishlist-text') }}"
@elseif (isset($itemId) && $itemId)
href="{{ route('customer.wishlist.remove', $itemId) }}"
title="{{ __('velocity::app.shop.wishlist.remove-wishlist-text') }}"
@endif>
href="{{ $href }}"
title="{{ $title }}">
<wishlist-component active="{{ ! $isWished }}"></wishlist-component>
<wishlist-component active="{{ $wishlist ? false : true }}"></wishlist-component>
@if (isset($text))
{!! $text !!}