Commit graph

33796 commits

Author SHA1 Message Date
Michał Pysiak
4716a2f5f8 Fix behats tags 2024-07-03 11:33:25 +02:00
Michał Pysiak
a5a5e1a907 Make NewOrders component live 2024-07-03 11:33:25 +02:00
Michał Pysiak
dd988e3802 Fix behats 2024-07-03 11:33:25 +02:00
Michał Pysiak
eab7b8d0b5 Change channel select button 2024-07-03 11:33:25 +02:00
Michał Pysiak
490b292b3d Refactor and fixes 2024-07-03 11:33:25 +02:00
Rafikooo
b88dd5ec30 [Admin] Add a preliminary dashboard statistics implementation 2024-07-03 11:33:25 +02:00
Rafikooo
9dfac78847 [Admin] Add dashboard component improvements 2024-07-03 11:33:25 +02:00
Rafikooo
485e293b37 [Behat] Configure dashboard defined elements 2024-07-03 11:33:25 +02:00
Rafikooo
2df2e86256 [Behat] Enable dashboard statistics scenarios 2024-07-03 11:33:25 +02:00
kulczy
d7809bff1d
Change ship button styling (#16507)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT


![image](https://github.com/Sylius/Sylius/assets/129760562/168bb16d-a686-4516-b24d-3fbed22410f3)
2024-07-03 10:30:50 +02:00
Grzegorz Sadowski
b6a7e9738f
Merge branch '1.14' into 2.0
* 1.14:
  Change application's version to v1.13.4-dev
  Generate changelog for v1.13.3
  Change application's version to v1.13.3
2024-07-02 10:48:19 +02:00
Grzegorz Sadowski
6f732828e8
Merge branch '1.13' into 1.14
* 1.13:
  Change application's version to v1.13.4-dev
  Generate changelog for v1.13.3
  Change application's version to v1.13.3
2024-07-02 10:47:32 +02:00
Grzegorz Sadowski
19dacea52c
Change application's version to v1.13.4-dev 2024-07-02 10:31:36 +02:00
Grzegorz Sadowski
6d092ebceb
Generate changelog for v1.13.3 2024-07-02 10:31:07 +02:00
Grzegorz Sadowski
33c1cf8da3
Change application's version to v1.13.3 2024-07-02 10:30:28 +02:00
Grzegorz Sadowski
05dbffe6b7
Merge branch '1.14' into 2.0
* 1.14:
  Change application's version to v1.12.19-dev
  Generate changelog for v1.12.18
  Change application's version to v1.12.18
  Update repository.rst
  Update model.rst
2024-07-02 10:28:32 +02:00
Grzegorz Sadowski
ad78f64830
Merge branch '1.13' into 1.14
* 1.13:
  Change application's version to v1.12.19-dev
  Generate changelog for v1.12.18
  Change application's version to v1.12.18
  Update repository.rst
  Update model.rst
2024-07-02 10:28:11 +02:00
Grzegorz Sadowski
48d2951714
Merge branch '1.12' into 1.13
* 1.12:
  Change application's version to v1.12.19-dev
  Generate changelog for v1.12.18
  Change application's version to v1.12.18
2024-07-02 10:28:00 +02:00
Grzegorz Sadowski
a1b3fc00a3
Change application's version to v1.12.19-dev 2024-07-02 10:26:12 +02:00
Grzegorz Sadowski
ac4bd7772f
Generate changelog for v1.12.18 2024-07-02 10:25:37 +02:00
Grzegorz Sadowski
abecc9baeb
Change application's version to v1.12.18 2024-07-02 10:24:30 +02:00
Bartłomiej Sęk
886423b4de Change ship button styling 2024-07-02 10:20:49 +02:00
Grzegorz Sadowski
3179ddf03e
minor #16475 Update repository.rst (zairigimad)
This PR was merged into the 1.13 branch.

Discussion
----------

fix typo

| Q               | A
|-----------------|-----
| Branch?         | 1.12, 1.13, 1.14 or 2.0 <!-- 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 or 1.13 branches
 - 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
-------

cfcbd05dec Update repository.rst
2024-07-02 10:06:03 +02:00
Grzegorz Sadowski
e23b11a587
minor #16474 Update model.rst (zairigimad)
This PR was merged into the 1.13 branch.

Discussion
----------

fix typo

| Q               | A
|-----------------|-----
| Branch?         | 1.12, 1.13, 1.14 or 2.0 <!-- 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 or 1.13 branches
 - 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
-------

74a900caa8 Update model.rst
2024-07-02 10:05:40 +02:00
Sylius Bot
2e03f4dc69 [CS][DX] Refactor 2024-07-02 10:04:56 +02:00
Grzegorz Sadowski
bc1e6d0ab6
Merge branch '1.14' into 2.0
* 1.14:
  Minor fixes after PR review
  Fix products grid for mobile
  Update PR template
  [Documentation] Update Sylius 1.12 version on the release cycle page
  Add upmerge from 2.0 to symfony-7 branch
  Fix ProductTaxons' positioning logic
2024-07-01 16:42:30 +02:00
Grzegorz Sadowski
5c7d3e5a43
Merge branch '1.13' into 1.14
* 1.13:
  Minor fixes after PR review
  Fix products grid for mobile
  Update PR template
  [Documentation] Update Sylius 1.12 version on the release cycle page
  Fix ProductTaxons' positioning logic
2024-07-01 16:39:49 +02:00
Grzegorz Sadowski
0f487ec952
Merge branch '1.12' into 1.13
* 1.12:
  Minor fixes after PR review
  Fix products grid for mobile
  Update PR template
  [Documentation] Update Sylius 1.12 version on the release cycle page
  Fix ProductTaxons' positioning logic
2024-07-01 16:39:47 +02:00
Grzegorz Sadowski
d821dd6825
style #16380 Fix products grid for mobile (Yanick-K)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12 <!-- see the comment below -->
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | fixes [#16379](https://github.com/Sylius/Sylius/issues/16379)
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - 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
-->

On Mobile: 

Then 
![Capture d’écran 2024-06-12 à 17 30 07](https://github.com/Sylius/Sylius/assets/6756788/cd32d03d-ae39-400a-b7c4-fa19b2d6d3c3)


Now 
![Capture d’écran 2024-06-12 à 17 30 37](https://github.com/Sylius/Sylius/assets/6756788/6d1a3931-f6f6-4208-9854-22f76ee8a5e6)


Commits
-------

3536620e30 Fix products grid for mobile
2024-07-01 16:37:21 +02:00
Grzegorz Sadowski
f63e2a3a9a
bug #16477 Fix ProductTaxons' positioning logic (NoResponseMate)
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
| Related tickets | outlined in https://github.com/Sylius/Sylius/pull/15225#issuecomment-1790825230
| License         | MIT

The second issue:
>The other error is smaller, the count should not be reduced by 1 because the positioner will check for $newPosition >= $maxPosition. If you move a product to the last one in the taxon it will change it to the second-last position.

does not occur since when the `$newPosition >= $maxPosition` check is true, the position is set to `-1` instead of being reduced by 1. After that, the default Gedmo logic kicks in and `-1` gets converted into the last position.

Commits
-------

4fa32f324c Fix ProductTaxons' positioning logic
2024-07-01 16:32:35 +02:00
Karol
bd3e203df1
minor #16500 [Documentation] Update Sylius 1.12 version on the release cycle page + update PR template (GSadee)
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<!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - 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
-------
  [Documentation] Update Sylius 1.12 version on the release cycle page
  Update PR template
  Minor fixes after PR review
2024-07-01 13:14:35 +02:00
Grzegorz Sadowski
f769343c14
Minor fixes after PR review 2024-07-01 12:33:53 +02:00
Yanick
3536620e30
Fix products grid for mobile 2024-07-01 11:59:11 +02:00
Wojdylak
65522265e3 [Admin][Taxon][Behat] Separate TreeElement from CreatePage 2024-07-01 11:33:42 +02:00
Wojdylak
64af074b2e [Admin][Taxon] Split tree to more hooks 2024-07-01 11:33:42 +02:00
Wojdylak
5cd2d24719 Fix phpstan 2024-07-01 11:33:42 +02:00
Wojdylak
e954c1fb0b [Admin][Taxon] Enable behat tests 2024-07-01 11:33:42 +02:00
Wojdylak
1dd7b4e602 [Admin][Taxon] Remove old script 2024-07-01 11:33:42 +02:00
Wojdylak
d7e5383bab [Admin] Taxon index 2024-07-01 11:33:42 +02:00
Grzegorz Sadowski
e31ba811bb
Update PR template 2024-07-01 11:19:17 +02:00
Grzegorz Sadowski
3bb6274e6c
[Documentation] Update Sylius 1.12 version on the release cycle page 2024-07-01 11:17:47 +02:00
Grzegorz Sadowski
c11fa818de
minor #16496 Add upmerge from 2.0 to symfony-7 branch (loic425)
This PR was merged into the 1.14 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 2.0 -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - 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
-------

3374d90803 Add upmerge from 2.0 to symfony-7 branch
2024-07-01 11:11:30 +02:00
Loïc Frémont
3374d90803
Add upmerge from 2.0 to symfony-7 branch 2024-07-01 11:09:04 +02:00
Michał Pysiak
1ee5edcaaa Minor changes 2024-07-01 08:49:02 +02:00
Michał Pysiak
e6a32f5294 Skip not working api scenarios 2024-07-01 08:49:02 +02:00
Michał Pysiak
24a8afef6f Enable tests 2024-07-01 08:49:02 +02:00
Jan Goralski
522a25c42c [Behat][Admin] Cover product attribute filtering 2024-07-01 07:06:07 +02:00
Jan Goralski
340ef1ed1f [ProductAttribute] Update ProductBundle repository config 2024-07-01 07:06:07 +02:00
Jan Goralski
9e9c3dacae [Admin][ProductAttribute] Upgrade index 2024-07-01 07:06:07 +02:00
Karol
a5253d90e0
[Admin] Extract and cover ProductTaxon index (#16478)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | yes
| Deprecations?   | no
| Related tickets | -
| License         | MIT

### Accessing from taxon:
![Screenshot 2024-06-27 at 09 27
40](https://github.com/Sylius/Sylius/assets/9448101/1ac11462-aef7-4732-807c-97e6bf8e0187)


### Product taxons' index
![Screenshot 2024-06-27 at 09 27
10](https://github.com/Sylius/Sylius/assets/9448101/a82c293a-4d4f-496f-b8e3-a9c4a8edd9af)
2024-06-28 11:23:10 +02:00