* 1.12:
fix english word and add shipment state in admin show shipment
apply suggestion with new translation key
add english translation
[ApiBundle][Maintenance] Remove conflict with doctrine/dbal:3.*
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13 <!-- see the comment below --> |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| 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
-------
9ae966d756 Cover Api steps in paying offline during checkout scenario
This PR was merged into the 1.13 branch.
Discussion
----------
Updates the requirements on [sylius/calendar](https://github.com/Sylius/Calendar) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/Sylius/Calendar/releases">sylius/calendar's releases</a>.</em></p>
<blockquote>
<h2>v0.5.0</h2>
<h3>Details</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/13">#13</a> Move Behat dependencies to the test app (<a href="https://github.com/coldic3"><code>@coldic3</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/14">#14</a> [GitHub Actions] Configure workflow to run on the workflow_dispatch event (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/Sylius/Calendar/blob/main/CHANGELOG.md">sylius/calendar's changelog</a>.</em></p>
<blockquote>
<h3>v0.5.0 (2023-03-31)</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/13">#13</a> Move Behat dependencies to the test app (<a href="https://github.com/coldic3"><code>@coldic3</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/14">#14</a> [GitHub Actions] Configure workflow to run on the workflow_dispatch event (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
</ul>
<h3>v0.4.0 (2022-09-05)</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/9">#9</a> Add support for Symfony 6 (<a href="https://github.com/loic425"><code>@loic425</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/10">#10</a> [Composer][Maintenance] Allow plugins - symfony/flex, config directory moved, phpunit's bump (<a href="https://github.com/Rafikooo"><code>@Rafikooo</code></a>)</li>
</ul>
<h3>v0.3.0 (2022-01-28)</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/8">#8</a> [Behat] Add calendar hook to remove temporary date after scenario (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
</ul>
<h3>v0.2.0 (2022-01-28)</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/7">#7</a> Make it a bundle (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
</ul>
<h3>v0.1.0 (2022-01-25)</h3>
<ul>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/1">#1</a> [Calendar] add provider with current date (<a href="https://github.com/AdamKasp"><code>@AdamKasp</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/2">#2</a> configure application with behats and symfony (<a href="https://github.com/AdamKasp"><code>@AdamKasp</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/3">#3</a> Composer version correction (<a href="https://github.com/TheMilek"><code>@TheMilek</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/4">#4</a> [Composer] Update composer lock + fix indentation (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
<li><a href="https://redirect.github.com/Sylius/Calendar/issues/5">#5</a> Initialize empty changelog file (<a href="https://github.com/GSadee"><code>@GSadee</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/Sylius/Calendar/commits/v0.5.0">compare view</a></li>
</ul>
</details>
<br />
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Commits
-------
34671f22aa Update sylius/calendar requirement from ^0.3 || ^0.4 to ^0.5.0
5e5ada7059 Allow to install sylius/calendar:^0.5
08cdd3413c Import sylius/calendar Behat services
20697acdf4 Ignore on.push event in CI for dependabot's branches
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.12 |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | |
| License | MIT |
Commits
-------
7dd12907e7 add possibility to configure shipping_address_in_checkout_required with fixtures
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
It'll prevent running minimal CI twice.
Commits
-------
de1423777d Ignore upmerge branches CI build on push event
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 |
Commits
-------
acfc256b57 Update BuildTestApp actions within workflows
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
-------
2f56278d9d Cover reapplying promotion on cart changes scenarios in API
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 | contains changes from #14937 and #14936, they'll disappear after merge
| License | MIT
Commits
-------
a743297922 Cover applying correct taxes for shipping with tax rate included in price scenarios
* 1.12:
[Migrations] Check MySqlPlatform class existance case-sensitive
bugfix #14925 [Migrations] Sylius-Standard installation fix (Rafikooo)
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | 1.12
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| License | MIT
The `bin/console sylius:install` command ends with the following error when using the PostgreSQL database:
<img width="1660" alt="image" src="https://user-images.githubusercontent.com/40125720/231223850-5f44fb63-4fa2-4799-828b-2cd8f65774b6.png">
Commits
-------
b4cb9e7702 [Migrations] Check MySqlPlatform class existance case-sensitive
This PR was merged into the 1.12 branch.
Discussion
----------
| Q | A
| --------------- | -----
| Branch? | 1.12
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| License | MIT
The `bin/console sylius:install` command ends with the following error when using the PostgreSQL database:
<img width="1660" alt="image" src="https://user-images.githubusercontent.com/40125720/231223850-5f44fb63-4fa2-4799-828b-2cd8f65774b6.png">
Commits
-------
b4cb9e7702 [Migrations] Check MySqlPlatform class existance case-sensitive
This PR was merged into the 1.13 branch.
Discussion
----------
This PR has been generated automatically.
For more details see [refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
Commits
-------
5923a45553 [CS][DX] Refactor
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 | to be merged after #14937
| License | MIT |
Commits
-------
7fc6734ca2 Add calculating OrderItemsSubtotal to the Order model
add6f4a285 Cover applying correct taxes for shipping scenarios
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | no
| New feature? | kinda
| BC breaks? | no
| Deprecations? | yes
| Related tickets |
| License | MIT
The logic in `\Sylius\Bundle\ShopBundle\Calculator\OrderItemsSubtotalCalculator` is simple and can be moved to the model.
Commits
-------
c68fd42d99 Add calculating OrderItemsSubtotal to the Order model
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 | |
| License | MIT |
I mark this scenario as a `no-api` because in the API, "thank you" page with payment methods doesn't exist. There is a `GET
/api/v2/shop/payment-methods` endpoint but it's independent of the order.
Commits
-------
fec60fffa9 [Behat][API] Add "no-api" tag to the changing payment method page scenario
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 | contains changes from #14941
| License | MIT
Commits
-------
f750f33357 Silence Http\Message\MessageFactory deprecation report
dc4cd8a71c Cover handling different currencies on multiple channels via API scenarios
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A |
|-----------------|--------------------------------------------------------------|
| Branch? | 1.13
| Bug fix? | kinda?
| New feature? | kinda
| BC breaks? | no
| Deprecations? | no
| Related tickets |
| License | MIT
Commits
-------
39b3e61e47 Allow to filter products via API only by enabled taxon
fef6e4e5dc Silence Http\Message\MessageFactory deprecation report
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 |
| License | MIT
Commits
-------
628a131be1 Silence Http\Message\MessageFactory deprecation report
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
This reverts commit de58169f58.
Commits
-------
057960f4ac Revert "Add conflict for doctrine/orm:2.14.2"
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 |
| License | MIT
Commits
-------
895ae9fd63 Cover accessing non-existing product via API scenario
