Merge pull request #148 from BitBagCommerce/OPSRC-620_add_products_to…

…_cart_error_500_fix Opsrc 620 add products to cart error 500 fix
BitBagCommerce · Aug 2, 2022 · 58444b1 · 58444b1
2 parents 8edc3fe + 2f14bcd
commit 58444b1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/src/Controller/Action/BaseWishlistProductsAction.php b/src/Controller/Action/BaseWishlistProductsAction.php
@@ -22,6 +22,7 @@
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 abstract class BaseWishlistProductsAction
 {
@@ -39,14 +40,17 @@ abstract class BaseWishlistProductsAction
 
     private WishlistRepositoryInterface $wishlistRepository;
 
+    private TranslatorInterface $translator;
+
     public function __construct(
         CartContextInterface $cartContext,
         FormFactoryInterface $formFactory,
         FlashBagInterface $flashBag,
         WishlistCommandProcessorInterface $wishlistCommandProcessor,
         MessageBusInterface $messageBus,
         UrlGeneratorInterface $urlGenerator,
-        WishlistRepositoryInterface $wishlistRepository
+        WishlistRepositoryInterface $wishlistRepository,
+        TranslatorInterface $translator
     ) {
         $this->cartContext = $cartContext;
         $this->formFactory = $formFactory;
@@ -55,22 +59,27 @@ public function __construct(
         $this->messageBus = $messageBus;
         $this->urlGenerator = $urlGenerator;
         $this->wishlistRepository = $wishlistRepository;
+        $this->translator = $translator;
     }
 
     public function __invoke(int $wishlistId, Request $request): Response
     {
-        $form = $this->createForm($wishlistId);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->handleCommand($form);
-
+        if ($this->createForm($wishlistId) == null) {
             return new RedirectResponse(
-                $this->urlGenerator->generate('bitbag_sylius_wishlist_plugin_shop_wishlist_show_chosen_wishlist', [
-                    'wishlistId' => $wishlistId,
-                ])
-            );
+                $this->urlGenerator->generate('bitbag_sylius_wishlist_plugin_shop_wishlist_list_wishlists'));
+        } else {
+            $form = $this->createForm($wishlistId);
+            $form->handleRequest($request);
+
+            if ($form->isSubmitted() && $form->isValid()) {
+                $this->handleCommand($form);
+
+                return new RedirectResponse(
+                    $this->urlGenerator->generate('bitbag_sylius_wishlist_plugin_shop_wishlist_show_chosen_wishlist', [
+                        'wishlistId' => $wishlistId,
+                    ])
+                );
+            }
         }
 
         foreach ($form->getErrors() as $error) {
@@ -86,15 +95,19 @@ public function __invoke(int $wishlistId, Request $request): Response
 
     abstract protected function handleCommand(FormInterface $form): void;
 
-    private function createForm(int $wishlistId): FormInterface
+    private function createForm(int $wishlistId): ?FormInterface
     {
         $wishlist = $this->wishlistRepository->find($wishlistId);
         $cart = $this->cartContext->getCart();
-
-        $commandsArray = $this->wishlistCommandProcessor->createWishlistItemsCollection($wishlist->getWishlistProducts());
-
-        return $this->formFactory->create(WishlistCollectionType::class, ['items' => $commandsArray], [
-            'cart' => $cart,
-        ]);
+        if ($wishlist == null) {
+            $this->flashBag->add('error', $this->translator->trans('bitbag_sylius_wishlist_plugin.ui.wishlist_not_exists'));
+            return null;
+        } else {
+            $commandsArray = $this->wishlistCommandProcessor->createWishlistItemsCollection($wishlist->getWishlistProducts());
+
+            return $this->formFactory->create(WishlistCollectionType::class, ['items' => $commandsArray], [
+                'cart' => $cart,
+            ]);
+        }
     }
 }
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -13,6 +13,7 @@ services:
             - "@sylius.command_bus"
             - "@router"
             - "@bitbag_sylius_wishlist_plugin.repository.wishlist"
+            - "@translator"
 
     bitbag_sylius_wishlist_plugin.controller.action.base_wishlists_listing_action:
         abstract: true

diff --git a/src/Resources/translations/messages.pl.yml b/src/Resources/translations/messages.pl.yml
@@ -27,3 +27,4 @@ bitbag_sylius_wishlist_plugin:
         variant_already_in_wishlist: Wariant znajduje się już w liście życzeń.
         selected_wishlist_items_successfully_exported: Wybrane produkty zostały pomyślnie wyeksportowane.
         copied_selected_wishlist_items: Wybrane produkty zostały pomyślnie skopiowane.
+        wishlist_not_exists: Your wishlist does not exists.