Commit graph

40507 commits

Author SHA1 Message Date
Tomasz Kaliński
b5b7bfd364 Add scenario for recovering order payment state after authorized payment cancellation 2026-06-22 08:11:36 +02:00
Tomasz Kaliński
5a5ae1c5c0 Add tests for order payment state resolution on cancel and fail events 2026-06-22 08:11:36 +02:00
Tomasz Kaliński
b7aa5f8387 Add support for canceling authorized payments and adjust payment transition states 2026-06-22 08:11:36 +02:00
Kamil Grygierzec
92ef8a2200
Use ResourceClassResolver in IriConverter to fix discriminator subcla… (#19046)
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
…ss IRI generation

| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes https://github.com/Sylius/Sylius/issues/18781
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-06-19 09:17:01 +02:00
Mateusz
cafc7ff9e9
Merge branch '2.2' into fix/discriminator-subclass-iri-generation 2026-06-18 15:03:54 +02:00
Mateusz
5d781137d4 Move IriConverter constructor change out of Deprecation section in UPGRADE-2.2.md 2026-06-18 14:53:36 +02:00
Kamil Grygierzec
e98c819ea4
Update UPGRADE-2.2.md (#19068)
Some checks are pending
Continuous Integration (Minimal) / Static checks (push) Waiting to run
Continuous Integration (Minimal) / Tests (MariaDB) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Frontend (push) Blocked by required conditions
Continuous Integration (Minimal) / Packages (push) Blocked by required conditions
| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | no
| New feature?    | no
| Backward compatibility breaks?      | no
| License         | MIT

Fixes a description error in the UPGRADE-2.2.md file.
2026-06-18 14:36:52 +02:00
Tomasz Kaliński
536acb44a9 Update UPGRADE-2.2.md 2026-06-18 14:12:21 +02:00
Kamil Grygierzec
c070c1a1ae
[2.2] Fix SyliusUiBundle compiler passes priority (#19057)
Some checks are pending
Continuous Integration (Minimal) / Static checks (push) Waiting to run
Continuous Integration (Minimal) / Tests (MariaDB) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Frontend (push) Blocked by required conditions
Continuous Integration (Minimal) / Packages (push) Blocked by required conditions
| Q               | A
|-----------------|-----
| Branch?         |2.2
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #18978
| License         | MIT

https://github.com/Sylius/Sylius/pull/18979
2026-06-18 13:52:19 +02:00
Kamil Grygierzec
9be988f3f1
Filter out disabled products from get by code item endpoint (#19033)
| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Related tickets | fixes #18718
| License         | MIT

## Core feature

`ChannelAndLocaleBasedExtension` now implements
`QueryItemExtensionInterface` in addition to
`QueryCollectionExtensionInterface`. `GET /shop/products/{code}` now
returns 404 when the product is disabled or
not available in the current channel/locale. Both collection and item
queries share a private apply() method. Assert on context keys replaced
with graceful early returns.
2026-06-18 13:51:04 +02:00
Tomasz Kaliński
271a3bbc38 Update UPGRADE-2.2.md 2026-06-17 16:12:16 +02:00
Tomasz Kaliński
6df4eb7b33 Update CHANGELOG and UPGRADE-API for 2.2.7 release adjustments 2026-06-17 16:03:29 +02:00
Mateusz
8a9700cbbf Add BC layer for IRIConverter constructor change 2026-06-16 13:59:34 +02:00
Mateusz
3b9b02265d Move discriminator subclass test resources to apiBundle test app 2026-06-16 13:00:06 +02:00
Valentin Salmeron
92694338b6 Fix SyliusUiBundle compiler passes priority 2026-06-15 10:17:56 +02:00
Mateusz
6b7d0037fc Add API contract test for discriminator subclass IRI generation 2026-06-12 14:17:07 +02:00
Grzegorz Sadowski
f8a27841f2
[DX] Break footer menu and shipment general templates into smaller hooks 2.2 (#19056)
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | 
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-06-12 09:36:04 +02:00
Mateusz
c01747140e [DX] Break footer link groups into individual hookable templates 2026-06-12 08:37:38 +02:00
Mateusz
4e2f6be26f [DX] Break footer menu and shipment general templates into smaller hooks 2026-06-12 08:37:38 +02:00
Rafał Jaskulski
2b27c22cca
[CS][DX] Refactor (#19023)
Some checks are pending
Continuous Integration (Minimal) / Static checks (push) Waiting to run
Continuous Integration (Minimal) / Tests (MariaDB) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Frontend (push) Blocked by required conditions
Continuous Integration (Minimal) / Packages (push) Blocked by required conditions
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).
2026-06-11 07:31:13 +02:00
Sylius Bot
97ea3445af [CS][DX] Refactor
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
2026-06-11 03:06:37 +00:00
Kamil Grygierzec
dd5184bd91
[Fix] Product Summary using wrong variant resolver (#19047)
Some checks are pending
Continuous Integration (Minimal) / Packages (push) Blocked by required conditions
Continuous Integration (Minimal) / Static checks (push) Waiting to run
Continuous Integration (Minimal) / Tests (MariaDB) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Blocked by required conditions
Continuous Integration (Minimal) / Frontend (push) Blocked by required conditions
| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

I encountered an issue where I'm using my own specific
`sylius.resolver.product_variant`, I discovered that the component
Product Summary was using the default resolver instead of the composite
one.

The PR is aiming to fix this.
2026-06-10 21:38:31 +02:00
Francis Hilaire
6a7c5cf6e3
Use composite service instead of the default one to allow other tagged service to resolve the right product variant 2026-06-03 17:56:05 +02:00
Mateusz
509e354a0a Use ResourceClassResolver in IriConverter to fix discriminator subclass IRI generation 2026-06-03 13:48:38 +02:00
Grzegorz Sadowski
80cfea8f52
Fix application's version
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
2026-06-02 12:50:57 +02:00
Grzegorz Sadowski
a90d41c9bf
Change application's version to v2.2.7-dev 2026-06-02 12:48:34 +02:00
Grzegorz Sadowski
a1a074a079
Generate changelog for v2.2.6 2026-06-02 12:48:14 +02:00
Grzegorz Sadowski
1da96abc9c
Change application's version to v2.2.6 2026-06-02 12:47:08 +02:00
Grzegorz Sadowski
45c6c33184
[UPMERGE] 2.1 -> 2.2 (#19042)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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.
2026-06-02 12:43:40 +02:00
TheMilek
197648f0ed
Resolve conflicts between 2.1 and 2.2 2026-06-02 12:43:00 +02:00
Grzegorz Sadowski
9315d9e1f4
[UPMERGE] 2.1 -> 2.2 (#19041)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.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.2 -m "Resolve conflicts between 2.1 and 2.2"
```

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.
2026-06-02 12:37:42 +02:00
TheMilek
903f5f5d1e
Resolve conflicts between 2.1 and 2.2 2026-06-02 12:21:47 +02:00
Grzegorz Sadowski
f2914c3200
Change application's version to v2.1.16-dev
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
2026-06-02 12:19:24 +02:00
Grzegorz Sadowski
894f297317
Generate changelog for v2.1.15 2026-06-02 12:18:44 +02:00
Grzegorz Sadowski
673da7c3a7
Change application's version to v2.1.15 2026-06-02 12:17:23 +02:00
Grzegorz Sadowski
e837ef08a7
[2.1] Check payment request ownership (#19040)
| Q               | A
|-----------------|-----
| Branch?         | 2.1 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-06-02 12:07:05 +02:00
Grzegorz Sadowski
eed16c4c7c
[2.1][API] Enforce channel eligibility check when changing payment method via account endpoint (#19039)
| Q               | A
|-----------------|-----
| Branch?         | 2.1 <!-- see the comment below -->
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-06-02 12:06:22 +02:00
Grzegorz Sadowski
e8764931d7
[2.1] Prevent stale cart LiveComponents from mutating completed orders (#19038)
| Q               | A
|-----------------|-----
| Branch?         | 2.1 <!-- see the comment below -->
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-06-02 12:05:30 +02:00
TheMilek
0af90b6e96
Check payment request ownership on POST 2026-06-02 08:50:05 +02:00
Wojdylak
19dbca7440
Cover createdByGuest case in payment request ownership 2026-06-02 08:50:05 +02:00
TheMilek
77f3d23992
Check payment request ownership 2026-06-02 08:50:04 +02:00
TheMilek
ca0e3eff98 Fixes 2026-06-01 16:14:43 +02:00
TheMilek
88f2d401aa Add upgrade file 2026-06-01 16:14:32 +02:00
TheMilek
538c6b422e Filter out properly the disabled products from item get by code 2026-06-01 16:13:33 +02:00
Tomasz Kaliński
4c120f3f05 Prevent stale cart LiveComponents from mutating completed orders 2026-05-27 12:45:01 +02:00
Grzegorz Sadowski
177b60dbeb
[API] Make PaymentMethodChanger resolver argument nullable 2026-05-26 12:23:22 +02:00
Grzegorz Sadowski
1178ecb72b
[API] Enforce channel eligibility check when changing payment method via account endpoint 2026-05-26 12:23:15 +02:00
Grzegorz Sadowski
6f5464b6a9
[API] Add regression tests for payment method channel eligibility 2026-05-26 12:23:08 +02:00
Grzegorz Sadowski
5aa6e48fa3
[API] Slim down Swagger UI override and drop broken auto-auth JS (#19026)
Some checks failed
Continuous Integration (Minimal) / Static checks (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MariaDB) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Javascript Tests (MySQL) (push) Has been cancelled
Continuous Integration (Minimal) / Tests (PostgreSQL) (push) Has been cancelled
Continuous Integration (Minimal) / Frontend (push) Has been cancelled
Continuous Integration (Minimal) / Packages (push) Has been cancelled
| Q               | A
|-----------------|-----
| Branch?         | 2.2
| Bug fix?        | yes?
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 2.2 branch
 - Features and deprecations must be submitted against the 2.3 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
-->
2026-05-25 11:27:45 +02:00
Grzegorz Sadowski
3f1297c409
[API] Slim down Swagger UI override and drop broken auto-auth JS 2026-05-25 10:44:45 +02:00