Commit graph

33010 commits

Author SHA1 Message Date
Grzegorz Sadowski
cdd979b241
refactor #15384 [DX] Dispatch ui event to allow customize every choice in payment method selection (Jibbarth)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                       |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes #X, partially #Y, mentioned in #Z                      |
| License         | MIT                                                          |

To help PaymentPlugin providers, let's dispatch an ui event inside choice of each payment method. This will allow paymentPlugins to add additionnal field easily without the pain while installing paymentPlugins to copy/paste template that override `SyliusShopBundle/Checkout/SelectPayment/_payment.html.twig` (for example in [Mollie](https://github.com/mollie/Sylius/blob/master/doc/installation.md#13-copy-sylius-templates-overridden-in-plugin-to-your-templates-directory-eg-templatesbundles)) or  `SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig` (like in [Payplug](https://github.com/payplug/SyliusPayPlugPlugin/blob/master/src/Resources/views/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig)) 

I targetted 1.13 as it could be considered as a new feature, and paymentPlugins will can start to use it configuring a sylius_ui event block, and still provide template to copy/paste for previous version. 

WDYT ? 

I'm also wondering if we should merge the GatewayFactory name inside the event name to avoid lot of check on method when creating a new block. 

Commits
-------

2f84fc45ef [Checkout][PaymentMethod] Dispatch ui event to allow customize every choice in payment method selection
5639e58a99 [Checkout][PaymentMethod] Extract description and inject it via the new event
2024-04-23 06:52:00 +02:00
Karol
33ed95187c
[UPMERGE] 2.0 -> bootstrap-admin-panel (#16154)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/bootstrap-admin-panel -m "Resolve conflicts between 2.0 and bootstrap-admin-panel"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-22 16:08:52 +02:00
Grzegorz Sadowski
95a02c84d0
Merge branch '1.13' into 2.0
* 1.13:
  Update dead link in drivers.rst
  [Maintenance] Remove unused reviews listener
  Add Sylius logo to docs
2024-04-22 15:55:36 +02:00
Grzegorz Sadowski
602e850dc9
minor #16147 [Maintenance] Remove unused reviews listener (NoResponseMate)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13                   |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no (listeners are excluded lel)      |
| Deprecations?   | no |
| Related tickets | -                      |
| License         | MIT                                                          |

This listener is not even registered, it's just dead code.

Commits
-------

a9b224296f [Maintenance] Remove unused reviews listener
2024-04-22 15:53:54 +02:00
kulczy
ca69a156dd Improve table headers 2024-04-22 15:32:03 +02:00
Wojdylak
c5bd5dcd02
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-04-22 15:31:06 +02:00
Grzegorz Sadowski
a2e6726488
[Behat][Admin][Promotion] Change driver for actions and rules scenarios 2024-04-22 13:54:12 +02:00
Grzegorz Sadowski
b8e4d6b44a
[Admin][Promotion] Remove data-skip-morph configuration in rules 2024-04-22 13:53:08 +02:00
Grzegorz Sadowski
d429378e4b
[Admin][Promotion] Refactor cart promotions rules and actions 2024-04-22 13:53:08 +02:00
Karol
3cd6f12ef2
[UPMERGE] 1.13 -> 2.0 (#16155)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-22 08:40:04 +02:00
Karol
29d2b89362
[UPMERGE] 1.12 -> 1.13 (#16153)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-22 08:39:34 +02:00
Wojdylak
0fefba789c
[Admin][CatalogPromotion] Add configuration for TaxonAutocompleteChoiceType 2024-04-22 08:35:55 +02:00
Wojdylak
9773705261
[Admin][CatalogPromotion] Minor improvements of code 2024-04-22 07:59:39 +02:00
Wojdylak
590b5157a4
[Admin][CatalogPromotion] Minor improvements in form component 2024-04-22 07:59:39 +02:00
Wojdylak
25b48f9b50
[Admin][CatalogPromotion] Minor improvements of naming id of form extensions 2024-04-22 07:59:38 +02:00
Wojdylak
fd9008493e
[Admin][CatalogPromotion] Minor improvements for form component 2024-04-22 07:59:37 +02:00
Wojdylak
ef0d92350b
[Admin][CatalogPromotion] Enable behat tests 2024-04-22 07:59:36 +02:00
Wojdylak
58c1aae02f
[Admin][CatalogPromotion] Add extension for actions and scopes types 2024-04-22 07:59:36 +02:00
Wojdylak
80bdd48632
[Admin][CatalogPromotion] Add ProductVariantAutocompleter class 2024-04-22 07:59:35 +02:00
Wojdylak
02392c4aa9
[Admin][CatalogPromotion] Add FormComponent 2024-04-22 07:59:34 +02:00
Wojdylak
e27a60867b
[Admin][CatalogPromotion] Add update page with hooks 2024-04-22 07:59:34 +02:00
Wojdylak
6d898ba16b
[Admin][CatalogPromotion] Add create page with hooks 2024-04-22 07:59:33 +02:00
Grzegorz Sadowski
905b8c3ace
feature #16152 [Admin][Customer] Implement and cover index management (NoResponseMate)
This PR was merged into the bootstrap-admin-panel branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | bootstrap-admin-panel                  |
| Bug fix?        | no                                                       |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | -                      |
| License         | MIT                                                          |


Commits
-------

b7740989e8 [Admin][Grid] Add a generic autocomplete filter
2a3758aab8 [Admin][Customer] Swap customer group filter to ux autocomplete
c66c6a0415 [Behat][Admin] Cover customers filtration
b7c4a21678 [Behat][Admin] Cover customers sorting
2024-04-22 06:51:36 +02:00
Michał Pysiak
397bf3e92c
Browse customer orders 2024-04-22 06:16:23 +02:00
Rafał Jaskulski
009dce57fe
docs #16158 Update dead link in drivers.rst (binhuq)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 or 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no/yes                                                       |
| New feature?    | no/yes                                                       |
| BC breaks?      | no/yes                                                       |
| Deprecations?   | no/yes <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes #X, partially #Y, mentioned in #Z                      |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------
  Update dead link in drivers.rst
2024-04-21 20:36:04 +02:00
binhuq
fad4e134c0
Update dead link in drivers.rst 2024-04-21 18:23:28 +07:00
Jan Goralski
1fb2d892eb
[Maintenance][Configuration] Deprecate unused options configuration nodes 2024-04-20 12:50:26 +02:00
Jan Goralski
b7c4a21678
[Behat][Admin] Cover customers sorting 2024-04-20 12:20:20 +02:00
Jan Goralski
c66c6a0415
[Behat][Admin] Cover customers filtration 2024-04-20 12:20:20 +02:00
Jan Goralski
2a3758aab8
[Admin][Customer] Swap customer group filter to ux autocomplete 2024-04-20 12:20:20 +02:00
Jan Goralski
b7740989e8
[Admin][Grid] Add a generic autocomplete filter 2024-04-20 12:20:20 +02:00
Jan Góralski
75ef757a81
minor #16150 Change the twig-hooks version constraint to ^0.1 (jakubtobiasz)
This PR was merged into the bootstrap-admin-panel branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | `bootstrap-admin-panel`           |


Commits
-------
  Change the twig-hooks version constraint to ^0.1
  Bump the minimal Twig version
  Match Twig's version to Symfony UX
2024-04-20 12:17:47 +02:00
Jacob Tobiasz
f93669afd8
Match Twig's version to Symfony UX 2024-04-19 19:43:59 +02:00
Jacob Tobiasz
e577e7357e
Bump the minimal Twig version 2024-04-19 19:29:40 +02:00
Jacob Tobiasz
256ada7713
Change the twig-hooks version constraint to ^0.1 2024-04-19 15:28:46 +02:00
Jan Goralski
6c35aec5db [Admin][Channel] Fix weird behaviour with excluded taxons 2024-04-19 12:22:00 +02:00
Karol
cff03d325c
minor #16134 Fix Sylius logo in READMEs of Bundles & Components (mpysiak)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                  |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | n/a                      |
| License         | MIT                                                          |

Fixes missing Sylius logo in ~~docs~~ READMEs of Bundles & Components


Commits
-------
  Add Sylius logo to docs
2024-04-19 12:13:54 +02:00
Jan Goralski
a9b224296f
[Maintenance] Remove unused reviews listener 2024-04-19 11:19:44 +02:00
Grzegorz Sadowski
466793c441
minor #16143 [Maintenance] Add branch 2.0 to refactor build (Wojdylak)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | N/A
| License         | MIT

Commits
-------

e2224c191e [Maintenance] Add branch 2.0 to refactor build
2024-04-19 09:54:24 +02:00
Wojdylak
db5954a9a4 [Maintenance] Ecs 2024-04-19 09:52:11 +02:00
Wojdylak
e2224c191e
[Maintenance] Add branch 2.0 to refactor build 2024-04-19 09:17:08 +02:00
Jan Goralski
9f895f24a1 [Behat][Admin] Enable product association type tests 2024-04-19 08:13:14 +02:00
Jan Goralski
b39cd0d9bf [Admin] Add default accordionId to translations macro 2024-04-19 08:13:14 +02:00
Jan Goralski
3a3fdb801e [Behat] Allow passing parameters to Crud's FormElement::getValidationMessage 2024-04-19 08:13:14 +02:00
Jan Goralski
670392dd46 [Admin][ProductAssociationType] Implement create and update pages 2024-04-19 08:13:14 +02:00
Jan Goralski
fb05956ee9 [Maintenance] Disable non-ui tests in CI 2024-04-19 07:40:13 +02:00
Grzegorz Sadowski
b49cb0dc76
Merge branch '2.0' into bootstrap-admin-panel
* 2.0:
  Add empty array check
  Revert conflict to twig/intl-extra
2024-04-19 07:36:10 +02:00
Grzegorz Sadowski
89b425a2f9
Merge branch '1.13' into 2.0
* 1.13:
  Add empty array check
  Revert conflict to twig/intl-extra
2024-04-19 07:34:50 +02:00
Grzegorz Sadowski
e97863ba1d
Merge branch '1.12' into 1.13
* 1.12:
  Revert conflict to twig/intl-extra
2024-04-19 07:33:43 +02:00
Jan Góralski
f26e6b1013
minor #16111 [Admin][Promotion] Add create and update pages (GSadee)
This PR was merged into the bootstrap-admin-panel branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | bootstrap-admin-panel|
| Bug fix?        | no                                                      |
| New feature?    |yes                                                       |
| BC breaks?      | yes                                                       |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------
  [Admin] Add Promotion edit page with hooks
  [Admin] Add Promotion create page with hooks
  [Admin] Add initial rules to Promotion edit page
  [Admin] Add initial actions to Promotion edit page
  [Admin] Implement autocompletes for Promotion's rules and action on edit page
  [Admin] Add rules and actions to Promotion create page
  [Behat][Admin] Enable deleting promotion scenario
  [Behat][Admin] Cover scenarios for adding promotion
  [Behat][Admin] Cover scenarios for adding promotion with a label
  [Behat][Admin] Cover scenarios for editing promotion
  [Behat][Admin] Use element instead of trait for promotion form
  [Admin] Improve appearance of channel based promotion rules and actions
  [Behat][Admin] Cover scenarios for adding promotion with action
  [Behat][Admin] Enable preventing deletion of promotion scenario
  [Behat] Improve AutocompleteHelper to allow to select by name or by value
  [Behat][Admin] Cover scenarios for adding promotion with rules and actions filters
  [Behat][Admin] Enable seeing correct percentage discounts scenario
  [Behat][Admin] Cover scenarios for promotions filters validation
  [Behat][Admin] Cover scenarios for promotions validation
  [Admin] Overwrite promotion rules configuration instead of morphing to fix replacing autocomplete fields
  [Behat][Admin] Minor clean up in promotion pages
  [Admin] Fix static analysis
  [Admin] Fix accordion for translations
  [Admin] Refactor naming of promotion Twig Hooks and templates
  [Behat][Admin] Revert removing getValidationMessage from Crud/CreatePage
  [Behat][Admin] Introduce shared FormElement
  [Admin] Remove unneeded labels for promotion rules and actions
  [Behat] Change driver of some scenarios to chromedriver
  [Behat] Minor fixes
  [Admin] Bring back delete button for promotion rules and actions
2024-04-18 16:04:24 +02:00