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

Migrating the shop grid configuration to php #15419

Open
wants to merge 7 commits into
base: 2.0
Choose a base branch
from
+248 −2
Open

Migrating the shop grid configuration to php #15419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfaf4af
Applying the shop grids
mamazu Oct 8, 2023
97d8268
Fixing the errors?
mamazu Oct 16, 2023
2d73ce1
Adding dirty fix for test
mamazu Oct 17, 2023
5a5240b
Fixing errors and adding label back
mamazu Oct 17, 2023
e1258a6
Apply suggestions from code review
mamazu Oct 18, 2023
cb9a90c
Using the right actions
mamazu Oct 18, 2023
c433a7d
Removing custom template
mamazu Sep 27, 2024
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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
  • Loading branch information
@mamazu @diimpp
mamazu and diimpp committed Sep 27, 2024
commit e1258a69a68790fa12b89d4c12aa6c652ba54365
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
* (c) Sylius Sp. z o.o.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down Expand Up @@ -95,7 +95,7 @@ public function buildGrid(GridBuilderInterface $gridBuilder): void
'tokenValue' => 'resource.tokenvalue',
],
],
])
]),
),
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
* (c) Sylius Sp. z o.o.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down Expand Up @@ -40,7 +40,7 @@ public function __construct(
private TaxonRepositoryInterface $taxonRepository,
private LocaleContextInterface $localeContext,
private RequestStack $requestStack,
private bool $includeAllDescendants,
private bool $includeAllDescendants,
) {
}

Expand All @@ -52,7 +52,7 @@ public static function getName(): string
public function buildGrid(GridBuilderInterface $gridBuilder): void
{
$request = $this->requestStack->getMainRequest();
Assert::notNull($request, 'The '.self::class. ' does not work in CLI mode');
Assert::notNull($request, 'No main request available.');

$localeCode = $this->localeContext->getLocaleCode();

Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This file is part of the Sylius package.

(c) Paweł Jędrzejewski
(c) Sylius Sp. z o.o.

For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
Expand Down