Commit graph

36102 commits

Author SHA1 Message Date
Grzegorz Sadowski
4e19386c7e
[UPMERGE] 2.0 -> payment-request (#17016)
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/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```

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-09-25 10:25:02 +02:00
Grzegorz Sadowski
65128bd24b
[UPMERGE] 2.0 -> payment-request (#17005)
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/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```

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-09-25 09:41:03 +02:00
Grzegorz Sadowski
6901ad3c79
Add position to ProductImage resource (#16995)
| Q               | A
|-----------------|-----
| Branch?         | 2.0 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | yes
| 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
-->

![Screenshot 2024-09-23 at 14 52
11](https://github.com/user-attachments/assets/2eb464c3-f5f0-4dc8-810d-eafe738f3670)
2024-09-25 09:35:51 +02:00
Grzegorz Sadowski
2872d794f3
[Payum] Remove empty test suite config 2024-09-25 08:57:03 +02:00
Grzegorz Sadowski
9af70342d0
[API] Change FQCNs to parameters (#17013)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | yes
| 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-09-25 08:41:19 +02:00
Grzegorz Sadowski
d0deea8120
[CI] Fix matrix 2024-09-25 08:40:48 +02:00
Karol
4439b14057
Reorganise the twig hooks and templates for translations and divide (#17008)
| Q               | A
|-----------------|-----
| Branch?         | 2.0 <!-- 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-09-25 08:14:54 +02:00
Michał Pysiak
8404a99ed1
Change FQCNs to parameters 2024-09-25 07:56:37 +02:00
Grzegorz Sadowski
94930b8d20
Remove usage of deprecated MessageHandlerInterface 2024-09-25 07:44:46 +02:00
Michał Pysiak
76e7809475
[API] Make promotion coupon operations' names consistnent with other after refactor them (#17011)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | resolves
https://github.com/Sylius/Sylius/pull/16996#discussion_r1773308400
| 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-09-25 07:36:23 +02:00
Grzegorz Sadowski
64d6b9d526
Resolve conflicts between 2.0 and payment-request 2024-09-25 07:34:26 +02:00
Grzegorz Sadowski
dd7f27046c
Merge branch '1.14' into 2.0
* 1.14:
  [CI] Minor improvements
  [CI] Remove unused social media notifications action
2024-09-25 07:27:04 +02:00
Grzegorz Sadowski
60cf216ce3
Merge branch '1.13' into 1.14
* 1.13:
  [CI] Minor improvements
  [CI] Remove unused social media notifications action
2024-09-25 07:26:16 +02:00
Grzegorz Sadowski
2ea2e95a36
minor #17012 [CI] Remove unused social media notifications action + minor improvements (GSadee)
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<!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | 
| 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
-->


Commits
-------

432013ea84 [CI] Remove unused social media notifications action
8a3dec196d [CI] Minor improvements
2024-09-25 07:25:18 +02:00
Grzegorz Sadowski
8a3dec196d
[CI] Minor improvements 2024-09-25 07:21:54 +02:00
Grzegorz Sadowski
432013ea84
[CI] Remove unused social media notifications action 2024-09-25 07:21:31 +02:00
Grzegorz Sadowski
64f77cbdbf
[API] Make promotion coupon operations' names consistnent with other after refactor them 2024-09-25 06:46:20 +02:00
Grzegorz Sadowski
ac7ba32e02
[CS][DX] Refactor (#17010)
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
2024-09-25 06:32:57 +02:00
Sylius Bot
f7ea7919c1 [CS][DX] Refactor 2024-09-25 02:27:23 +00:00
Kamil Grygierzec
2f34f5b396
Separate migrations for Postgress and MySQL 2024-09-24 23:04:57 +02:00
Kamil Grygierzec
318522acfa
Fix the js tests 2024-09-24 23:04:46 +02:00
Kamil Grygierzec
c83f3524b6
Cover behat tests 2024-09-24 23:04:46 +02:00
Kamil Grygierzec
3600f870d1
[API] Add position to serialization and fix contract tests 2024-09-24 22:38:53 +02:00
Kamil Grygierzec
9732992383
Modify templates 2024-09-24 22:38:52 +02:00
Kamil Grygierzec
a075338ab4
add migration 2024-09-24 22:38:52 +02:00
Kamil Grygierzec
0e969c988d
Add position to ProductImage 2024-09-24 22:38:51 +02:00
Grzegorz Sadowski
ce205f43e0
[API] Promotion Coupons as Subresource (#16996)
| Q               | A
|-----------------|-----
| Branch?         | 2.0 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| License         | MIT

<img width="1049" alt="image"
src="https://github.com/user-attachments/assets/8914d080-6fda-4c3d-bbe8-64104cdc2218">
2024-09-24 15:15:32 +02:00
Kamil Grygierzec
a2d2b1fd6c
[Promotion] Reorganise the twig hooks for translations 2024-09-24 14:47:22 +02:00
Kamil Grygierzec
84da80fe8d
[ProductVariant] Reorganise the twig hooks for translations 2024-09-24 14:47:10 +02:00
Kamil Grygierzec
46db2235fb
[CatalogPromotion] Reorganise the twig hooks for translations 2024-09-24 14:46:32 +02:00
Kamil Grygierzec
c6e26735cc
[ProductOption] Reorganise the twig hooks for translations 2024-09-24 14:46:01 +02:00
Kamil Grygierzec
1a95d9a7a6
[ShippingMethod] Reorganise the twig hooks for translations 2024-09-24 14:44:53 +02:00
Grzegorz Sadowski
62fa744429
Update changelog for v2.0.0-ALPHA.2 2024-09-24 14:01:02 +02:00
Grzegorz Sadowski
cd1dda3e8c
Change application's version to v2.0.0-DEV 2024-09-24 13:35:47 +02:00
Grzegorz Sadowski
ee27ef4721
Generate changelog for v2.0.0-ALPHA.2 2024-09-24 13:33:45 +02:00
Grzegorz Sadowski
6e79c0d6a7
Change application's version to v2.0.0-ALPHA.2 2024-09-24 13:29:32 +02:00
Grzegorz Sadowski
b4e2da105f
Remove changelog for 1.14 2024-09-24 13:28:23 +02:00
Grzegorz Sadowski
6089f43484
Merge branch '1.14' into 2.0
* 1.14:
  Change application's version to v1.14.0-DEV
  Generate changelog for v1.14.0-ALPHA.1
  Change application's version to v1.14.0-ALPHA.1
2024-09-24 13:25:08 +02:00
Grzegorz Sadowski
049445e3e5
Change application's version to v1.14.0-DEV 2024-09-24 13:18:24 +02:00
Grzegorz Sadowski
768184a491
Generate changelog for v1.14.0-ALPHA.1 2024-09-24 13:15:50 +02:00
Grzegorz Sadowski
46ebd02cee
Change application's version to v1.14.0-ALPHA.1 2024-09-24 13:14:08 +02:00
Grzegorz Sadowski
0c0a8393de
Merge branch '1.14' into 2.0
* 1.14:
  Change application's version to v1.13.7-dev
  Generate changelog for v1.13.6
  Change application's version to v1.13.6
2024-09-24 13:06:45 +02:00
Grzegorz Sadowski
81446a6abe
Merge branch '1.13' into 1.14
* 1.13:
  Change application's version to v1.13.7-dev
  Generate changelog for v1.13.6
  Change application's version to v1.13.6
2024-09-24 13:05:57 +02:00
Grzegorz Sadowski
aa50b60421
Change application's version to v1.13.7-dev 2024-09-24 13:03:21 +02:00
Grzegorz Sadowski
c6d2002ec2
Generate changelog for v1.13.6 2024-09-24 13:02:43 +02:00
Grzegorz Sadowski
fa29546f7e
Change application's version to v1.13.6 2024-09-24 13:02:09 +02:00
Grzegorz Sadowski
8c20ae7a48
[Maintenance] Remove symfony-7 branch from upmerges (#17007)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | 
| 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-09-24 12:35:38 +02:00
Grzegorz Sadowski
8de8d35aa2
[Maintenance] Remove symfony-7 branch from upmerges 2024-09-24 12:24:48 +02:00
Rafikooo
b9c771cd8d
[API] Refactor promotion coupon state processors to correct namespaces and service IDs 2024-09-24 12:10:57 +02:00
Rafikooo
5ba8d3159e
[Unit] Add test cases for promotion coupon with non-existing promotion 2024-09-24 12:10:56 +02:00