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
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.
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
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.
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.
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
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
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
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
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