Fixing the errors?

Sylius · Oct 17, 2023 · 3e7c4aa · 3e7c4aa
1 parent 670065d
commit 3e7c4aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php
@@ -86,7 +86,7 @@ public function buildGrid(GridBuilderInterface $gridBuilder): void
                             ],
                         ],
                     ]),
-                    Action::create('pay', 'pay')
+                    Action::create('pay', 'shop_pay')
                         ->setOptions([
                             'link' => [
                                 'route' => 'sylius_shop_order_show',

diff --git a/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php
@@ -26,6 +26,7 @@
 use Sylius\Component\Taxonomy\Repository\TaxonRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Webmozart\Assert\Assert;
 
 final class ProductGrid extends AbstractGrid implements ResourceAwareGridInterface
@@ -56,15 +57,21 @@ public function buildGrid(GridBuilderInterface $gridBuilder): void
         Assert::notNull($this->resquest);
         $localeCode = $this->localeContext->getLocaleCode();
 
+        // @see Sylius\Bundle\ResourceBundle\ExpressionLanguage\NotNullExpressionFunctionProvider
+        $taxon = $this->taxonRepository->findOneBySlug(
+                    $this->resquest->attributes->get('slug'),
+                    $localeCode,
+        );
+        if ($taxon === null)  {
+            throw new NotFoundHttpException('Requested page is invalid');
+        }
+
         $gridBuilder
             ->setRepositoryMethod('createShopListQueryBuilder', [
                 $this->channelContext->getChannel(),
-                $this->taxonRepository->findOneBySlug(
-                    $this->resquest->attributes->get('slug'),
-                    $localeCode,
-                ),
+                $taxon,
                 $localeCode,
-                $this->resquest->query->get('sorting') ?? [],
+                $this->resquest->query->all('sorting'),
                 $this->includeAllDescendants,
             ])
             ->orderBy('position', 'asc')