Commit graph

34672 commits

Author SHA1 Message Date
Michał Pysiak
bd4e576b23
Allow promotion coupon to be filtered by promotion code (#16646)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-07-30 13:36:47 +02:00
Wojdylak
8efd01bd7f
Minor improvements 2024-07-30 13:26:41 +02:00
Michał Pysiak
a43660f199
Fix ShopUser docs example 2024-07-30 13:12:38 +02:00
Michał Pysiak
d89058f9d7
Fix ShopUser docs example 2024-07-30 13:02:06 +02:00
Kamil Grygierzec
530bd80002
[PromotionCoupon] replace filtering by promotion iri with filtering by promotion code 2024-07-30 12:28:17 +02:00
Kamil Grygierzec
c14937cff9
[PromotionCoupon] Enable todo api scenario for filtering by code 2024-07-30 12:08:42 +02:00
Michał Pysiak
da38d8c8bd
minor #16647 Deprecate PromotionCouponPromotionFilter (TheMilek)
This PR was merged into the 1.14 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.14 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes <!-- don't forget to update the UPGRADE-*.md file -->
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
 - Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->
deprecates as it has been removed [here](https://github.com/Sylius/Sylius/pull/16646)


Commits
-------
  Deprecate PromotionCouponPromotionFilter
2024-07-30 09:34:14 +02:00
Karol
adc034b8ef
[UPMERGE] 1.13 -> 1.14 (#16652)
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.14 -m "Resolve conflicts between 1.13 and 1.14"
```

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-07-30 08:19:43 +02:00
Wojdylak
5c1295008f
[Addressing] Add matthiasnoback/symfony-dependency-injection-test 2024-07-30 08:15:42 +02:00
Michał Pysiak
ecbd4fa32c
[CS][DX] Refactor (#16653)
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
2024-07-30 08:08:36 +02:00
Karol
545565fe59
[UPMERGE] 1.14 -> 2.0 (#16651)
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.14 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-07-30 07:57:49 +02:00
Sylius Bot
e646f68c79 [CS][DX] Refactor 2024-07-30 02:17:43 +00:00
Wojdylak
92786087cf
[Zone] Fix unit tests 2024-07-29 16:51:00 +02:00
Wojdylak
7dd0704711
[Addressing] Add matthiasnoback/symfony-config-test 2024-07-29 16:35:52 +02:00
Kamil Grygierzec
7958895598
[API] Upgrade Customer resource (#16619)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-07-29 16:28:22 +02:00
Wojdylak
be38e8c00a
Update upgrade file 2024-07-29 16:15:23 +02:00
Wojdylak
f2219c2031
[Zone] Add specific validators for zone types 2024-07-29 15:59:42 +02:00
Kamil Grygierzec
f8ce9f8a17
Deprecate PromotionCouponPromotionFilter 2024-07-29 15:21:43 +02:00
Wojdylak
9b14e9bdf0
[Api][Zone] Add exception handling for deleting zones associated to tax rates 2024-07-29 11:59:38 +02:00
Karol
546d50f102
[Behat] Reorder promotion API tags (#16644)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-07-29 11:29:37 +02:00
Kamil Grygierzec
e697e19819
[Behat] Reorder promotion API tags 2024-07-29 11:05:25 +02:00
Kamil Grygierzec
8c9a2db5f7
minor #16638 Refactor GUS info (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

![image](https://github.com/user-attachments/assets/6ecda25d-b4d3-4f93-bec5-d1f4094a8be0)

Commits
-------
  Refactor GUS info
2024-07-29 10:28:17 +02:00
Kamil Grygierzec
7d9c78a1cf
[Admin] Add global alert for form errors (#16634)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT


![image](https://github.com/user-attachments/assets/099ce8fc-9c1d-462a-925f-cbacf3a0479d)
2024-07-29 10:19:17 +02:00
Michał Pysiak
323e6d9402
Revert added context builder 2024-07-29 08:44:23 +02:00
Kamil Grygierzec
ceb602e986
minor #16639 Fix PostgreSQL CI Full to run (Wojdylak)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.13
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #14786
| License         | MIT


Commits
-------
  Fix Full CI to run 2.0
2024-07-29 08:37:59 +02:00
Michał Pysiak
0c11dbea31
[UPMERGE] 1.13 -> 1.14 (#16641)
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.14 -m "Resolve conflicts between 1.13 and 1.14"
```

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-07-29 07:06:15 +02:00
Michał Pysiak
9725da14a4
[API] Promotion GET Collection (#16625)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- 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 | continuation of
https://github.com/Sylius/Sylius/pull/16613, related to
https://github.com/Sylius/Sylius/pull/16622,
https://github.com/Sylius/Sylius/pull/16624
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->

Current endpoints state:
<img width="673" alt="image"
src="https://github.com/user-attachments/assets/984c6836-212f-4d7b-9392-a190ce001a65">
2024-07-29 06:36:23 +02:00
Kamil Grygierzec
b75c79e947
minor #16633 [ChannelsTest] Use inArray to check locales (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 | [action](https://github.com/Sylius/Sylius/actions/runs/10086616660/job/27889633254) 
| License         | MIT

Fixed intermittent test failures in GitHub Actions

Commits
-------
  [ChannelsTest] Use inArray to check locales
2024-07-26 16:58:12 +02:00
Wojdylak
4680ee39ab
Fix Full CI to run 2.0 2024-07-26 15:42:47 +02:00
Wojdylak
545a22ea62
Refactor GUS info 2024-07-26 14:47:46 +02:00
Kamil Grygierzec
d3f092f91d
introduce new paramter for filtering non archived entities 2024-07-25 14:44:48 +02:00
Kamil Grygierzec
225ce2048d
review fixes 2024-07-25 14:44:48 +02:00
Kamil Grygierzec
f29d5af98e
Remove additional post after rebase 2024-07-25 13:12:46 +02:00
Rafikooo
96284ee77e
[Behat] Enable API managing promotions suite 2024-07-25 13:12:46 +02:00
Rafikooo
33050b7e8e
[Unit] Adjust promotion collection response 2024-07-25 13:12:46 +02:00
Rafikooo
c396c93237
[API] Configure Promotion get collection endpoint 2024-07-25 13:12:46 +02:00
Rafikooo
47aeeb7638
[Unit] Restore promotion collection retrieval test 2024-07-25 13:12:46 +02:00
Rafikooo
0e40a4cbd5
[API] Configure Promotion Update endpoint 2024-07-25 13:12:45 +02:00
Rafikooo
45302f1596
[API] Configure Promotion Creation endpoint 2024-07-25 13:12:45 +02:00
Kamil Grygierzec
c428451134
[API] Cover zones (#16628)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | N/A
| License         | MIT
2024-07-25 12:21:50 +02:00
Wojdylak
cef262a4b4
[Api][Zone] Minor improvements 2024-07-25 11:28:33 +02:00
Wojdylak
3032d49ef5
[Admin] Add global alert for form errors 2024-07-25 11:22:09 +02:00
Karol
91b9bd754d
Reorder the behat tags in Promotion Coupon scenarios (#16632)
| Q               | A
|-----------------|-----
| Branch?         | api-plaform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
continuation of https://github.com/Sylius/Sylius/pull/16623
2024-07-25 09:09:45 +02:00
Wojdylak
4e877734f2
[ChannelsTest] Use inArray to check locales 2024-07-25 08:55:59 +02:00
Michał Pysiak
fb36e52f16
Minor changes 2024-07-25 08:55:39 +02:00
Michał Pysiak
86cf4c8a44
Remove legacy configuration 2024-07-25 08:52:50 +02:00
Michał Pysiak
0a7ac37f57
Fix generating id in statistics 2024-07-25 08:52:50 +02:00
Michał Pysiak
ca34aff2a9
Minor fixes 2024-07-25 08:52:50 +02:00
Michał Pysiak
3802da5b0c
Minor fixes 2024-07-25 08:52:49 +02:00
Michał Pysiak
2e36b942a9
[API] Remove legacy api configuration 2024-07-25 08:52:49 +02:00