Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FrontendBundle] fix wishlist remove and allow purchasables #997

Merged
merged 2 commits into from
May 23, 2019
Merged

[FrontendBundle] fix wishlist remove and allow purchasables #997

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8037cbc
[FrontendBundle] fix wishlist remove and allow purchasables
dpfaffenbauer May 22, 2019
3f1edef
[StorageList] equals: Check if the product is the same type and also …
dpfaffenbauer May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[FrontendBundle] fix wishlist remove and allow purchasables
  • Loading branch information
@dpfaffenbauer
dpfaffenbauer committed May 22, 2019
commit 8037cbcd2b4366372f71c674e5ce9366261ae74a
12 changes: 6 additions & 6 deletions src/CoreShop/Bundle/FrontendBundle/Controller/WishlistController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace CoreShop\Bundle\FrontendBundle\Controller;

use CoreShop\Component\Core\Model\ProductInterface;
use CoreShop\Component\Order\Model\PurchasableInterface;
use CoreShop\Component\StorageList\Model\StorageListInterface;
use CoreShop\Component\StorageList\Model\StorageListItemInterface;
use CoreShop\Component\StorageList\StorageListManagerInterface;
Expand All @@ -28,9 +28,9 @@ class WishlistController extends FrontendController
*/
public function addItemAction(Request $request)
{
$product = $this->get('coreshop.repository.product')->find($request->get('product'));
$product = $this->get('coreshop.repository.stack.purchasable')->find($request->get('product'));

if (!$product instanceof ProductInterface) {
if (!$product instanceof PurchasableInterface) {
$redirect = $request->get('_redirect', $this->generateCoreShopUrl(null, 'coreshop_index'));

return $this->redirect($redirect);
Expand Down Expand Up @@ -65,16 +65,16 @@ public function addItemAction(Request $request)
*/
public function removeItemAction(Request $request)
{
$product = $this->get('coreshop.repository.product')->find($request->get('product'));
$product = $this->get('coreshop.repository.stack.purchasable')->find($request->get('product'));

if (!$product instanceof ProductInterface) {
if (!$product instanceof PurchasableInterface) {
return $this->redirectToRoute('coreshop_index');
}

$this->addFlash('success', $this->get('translator')->trans('coreshop.ui.item_removed'));

foreach ($this->getWishlist()->getItems() as $item) {
if ($item->getProduct() === $product) {
if ($item->getProduct() instanceof $product && $item->getProduct()->getId() === $product->getId()) {
$this->getWishlistModifier()->removeFromList($this->getWishlist(), $item);

break;
Expand Down