Commit graph

29393 commits

Author SHA1 Message Date
Sylius Bot
04da941bb5 [CS][DX] Refactor 2023-09-04 16:48:39 +02:00
Grzegorz Sadowski
8dcf095c27
bug #15225 Fix updating product taxons positions (jakubtobiasz)
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 | fixes #11218
| License         | MIT


Commits
-------

07cff26e31 Fix updating product taxons positions
8a18c4de81 Extract positioning logic
25414ef287 Provide post-CR fixes
31f5b4f648 Merge positioner.xml with services.xml
1ff37abda3 Improve Behat scenario
2023-08-31 08:44:30 +02:00
Jacob Tobiasz
1ff37abda3
Improve Behat scenario
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
2023-08-31 07:46:49 +02:00
Zairig Imad
61c1fc0b4f
Update docs/book/orders/cart-promotions.rst
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
2023-08-30 10:27:34 +01:00
Zairig Imad
25e9b8e20f
Update default Rules of cart promotion 2023-08-30 10:22:42 +01:00
Jacob Tobiasz
60ea9c2ba9
bugfix #15252 [Admin][Taxon] Fix slug generation to work based on the parent field (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 | fixes #13749, replaces #13889                      |
| License         | MIT                                                          |

Commits
-------
  [Admin][Taxon] Fix slug generation to work based on the parent field
  [Behat][Admin][Taxon] Autogenerate slug based on selected parent
  [Admin][Taxon] Fallback from parent code to id when generating a slug
2023-08-28 16:12:48 +02:00
Jacob Tobiasz
91f642a286
bugfix #15255 [Admin][Product] Add language names to attribute values (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 | -                      |
| License         | MIT                                                          |

## Existing attributes

<details>
<summary>Before</summary>
<br>
<img width="963" alt="Screenshot 2023-08-25 at 14 14 18" src="https://github.com/Sylius/Sylius/assets/9448101/b89ef388-188f-42c8-ac80-ad76c3e84e91">
</details>

<details>
<summary>After</summary>
<br>
<img width="952" alt="Screenshot 2023-08-25 at 14 43 32" src="https://github.com/Sylius/Sylius/assets/9448101/a5276954-60b6-43a9-bb91-de1bf55bf676">
</details>

## Newly added attributes

<details>
<summary>Before</summary>
<br>
<img width="953" alt="Screenshot 2023-08-25 at 14 23 31" src="https://github.com/Sylius/Sylius/assets/9448101/fd25b667-56d9-4cf2-91c7-b20ac734d5bc">
</details>

<details>
<summary>After</summary>
<br>
<img width="955" alt="Screenshot 2023-08-25 at 14 43 47" src="https://github.com/Sylius/Sylius/assets/9448101/39c575fe-f82e-4afd-aaf8-98e3162e6321">
</details>

Commits
-------
  [Admin][Product] Add language names to attribute values
2023-08-28 13:53:07 +02:00
Jacob Tobiasz
31f5b4f648
Merge positioner.xml with services.xml 2023-08-28 07:01:30 +02:00
Jacob Tobiasz
c30131f91b
bugfix #14806 [Admin][ProductOptions] Changed form ProductOptionChoiceType to Produ… (ulinskas)
This PR was merged into the 1.12 branch.

Discussion
----------

…ctOptionAutocompleteType

| 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 #13742                      |
| 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
-->

Before:
![image](https://github.com/Sylius/Sylius/assets/53942444/07723697-2297-4662-b963-e95c7215603a)

After:
![image](https://github.com/Sylius/Sylius/assets/53942444/10e706d8-441a-4080-b3e6-af745cc402b7)



Commits
-------
  [Admin][ProductOptions] Changed form ProductOptionChoiceType to ProductOptionAutocompleteType
  Revert BC breaking changes
  minor improvements
  Show option name as a choice name instead of code
  Fix Main Taxon autocomplete scenarios
2023-08-28 06:57:33 +02:00
Jacob Tobiasz
76347c589b
bugfix #15250 [Admin][Country] Add violation for adding provinces with duplicated codes or names (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 | -                      |
| License         | MIT                                                          |

Commits
-------
  [Country] Add violation for adding provinces with duplicated codes
  [Behat][Admin][Country] Tests for saving duplicated provinces
  Update phpstan baseline
  [Country] Additional validation for duplicated provinces names
  [Behat][Admin][Country] Validation of saving duplicated province names
2023-08-28 06:55:36 +02:00
Jan Goralski
472cb7370d
[Admin][Product] Add language names to attribute values 2023-08-25 14:44:22 +02:00
TheMilek
acfb7e4411
Fix Main Taxon autocomplete scenarios 2023-08-25 13:36:27 +02:00
TheMilek
d3d02d42d1
Show option name as a choice name instead of code 2023-08-25 13:36:26 +02:00
TheMilek
49756634d0
minor improvements 2023-08-25 13:36:26 +02:00
TheMilek
9e9ee18866
Revert BC breaking changes 2023-08-25 13:36:00 +02:00
andriusulins
ba3abc9eac
[Admin][ProductOptions] Changed form ProductOptionChoiceType to ProductOptionAutocompleteType 2023-08-25 13:36:00 +02:00
Jacob Tobiasz
290029bff5
bugfix #15251 Fix error with being unable to add product review while being logged in using remember me (TheMilek)
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 https://github.com/Sylius/Sylius/issues/14898 and https://github.com/Sylius/Sylius/issues/9430                      |
| 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
-->

As being said [here](https://github.com/Sylius/Sylius/issues/14898) we were checking access against `IS_AUTHENTICATED_FULLY` while creating product review and it leads to a problem, that prevents us from creating review while using remember me functionality:

![image](https://github.com/Sylius/Sylius/assets/53942444/4e07bb72-361f-417f-be9f-e2306fc75306)

By changing it to `IS_AUTHENTICATED_REMEMBERED` resolves the bug

Commits
-------
  Fix error with being unable to add product review when the user is logged in by remember me option
2023-08-25 13:31:15 +02:00
TheMilek
8448d136df
Fix error with being unable to add product review when the user is logged in by remember me option 2023-08-25 12:27:41 +02:00
Jan Goralski
a24c696fdf
[Admin][Taxon] Fallback from parent code to id when generating a slug 2023-08-25 10:48:44 +02:00
Jan Goralski
86807fb177
[Behat][Admin][Country] Validation of saving duplicated province names 2023-08-25 08:40:12 +02:00
Jan Goralski
a8d28988c5
[Country] Additional validation for duplicated provinces names 2023-08-25 08:40:12 +02:00
Jan Goralski
2d5aa6864f
[Behat][Admin][Taxon] Autogenerate slug based on selected parent 2023-08-24 15:58:26 +02:00
Jan Goralski
99cd870789
[Admin][Taxon] Fix slug generation to work based on the parent field
Co-authored-by: Benjamin Vauchel <benjamin.v@onatera.com>
2023-08-24 15:57:16 +02:00
Jan Goralski
cddec53fdf
Update phpstan baseline 2023-08-24 11:10:07 +02:00
Jan Goralski
c46c713c5f
[Behat][Admin][Country] Tests for saving duplicated provinces 2023-08-24 10:44:49 +02:00
Jan Goralski
e174055ed9
[Country] Add violation for adding provinces with duplicated codes 2023-08-24 10:44:49 +02:00
Jacob Tobiasz
65bc7a32e4
minor #15245 Fix CI 2023-08-21 (jakubtobiasz)
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
-------
  Silence the error about deprecated getUsername method in HWI OAuth Bundle
2023-08-21 17:18:55 +02:00
Jacob Tobiasz
8f6958f0f5
Silence the error about deprecated getUsername method in HWI OAuth Bundle 2023-08-21 15:14:20 +02:00
Jacob Tobiasz
d6d19e6928
minor #13954 [Docker] Add custom docker composer file to gitignore (lchrusciel)
This PR was merged into the 1.12 branch.

Discussion
----------

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

<!--
 - Bug fixes must be submitted against the 1.10 or 1.11 branch(the lowest possible)
 - Features and deprecations must be submitted against the master 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
-------
  [Docker] Add custom docker composer file to gitignore
2023-08-19 07:05:33 +02:00
Łukasz Chruściel
ae82752e9d
[Docker] Add custom docker composer file to gitignore 2023-08-18 19:13:41 +02:00
Jacob Tobiasz
25414ef287
Provide post-CR fixes 2023-08-18 17:53:10 +02:00
Jacob Tobiasz
623b10ce7a
docs #15226 Update checkout.rst (zairigimad)
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 | f                      |
| 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
-------
  Update checkout.rst
2023-08-18 11:33:28 +02:00
Zairig Imad
29b344f17e
Update checkout.rst 2023-08-18 11:01:52 +02:00
Grzegorz Sadowski
2c6f04ab3e
bug #15228 [Docs] Update UPGRADE-1.12.md (UlrichHP)
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                                                          |

<!--
 - 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
-->

This PR fixes UPGRADE-1.12.md wrong sylius version

Commits
-------

6129ae4182 Update UPGRADE-1.12.md
2023-08-18 10:19:44 +02:00
Ulrich
6129ae4182
Update UPGRADE-1.12.md 2023-08-18 10:16:41 +02:00
Grzegorz Sadowski
61b89aed97
minor #15229 Update symfony/service-contracts in composer.json to update Sylius to 1.12.10 (UlrichHP)
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 |  PR #15162                      |
| 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
-->

I can't update a Sylius project I have from 1.12.9 to 1.12.10 because of `symfony/service-contracts`  which only accepts version: ^2.5 and i have 3.3.0.

See below the response I get when doing `composer update sylius/sylius:1.12.10`

```bash
Problem 1
    - Root composer.json requires sylius/sylius ^1.12 -> satisfiable by sylius/sylius[v1.12.10].
    - sylius/sylius v1.12.10 requires symfony/service-contracts ^2.5 -> found symfony/service-contracts[v2.5.0, v2.5.1, v2.5.2] but the package is fixed to v3.3.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
```


Commits
-------

fc3dae072c Update composer.json
49d538c51c Update OrderBundle composer.json
6cd7fda7b0 Update Component/Core composer.json
2023-08-18 10:13:16 +02:00
Grzegorz Sadowski
ed487b4285
minor #15234 Fix Sylius versions in UPGRADE file (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 | after https://github.com/Sylius/Sylius/pull/15218#pullrequestreview-1583436331 |
| 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
-------

0974db215f Fix Sylius versions in UPGRADE file
2023-08-18 10:11:28 +02:00
Grzegorz Sadowski
0974db215f
Fix Sylius versions in UPGRADE file 2023-08-18 06:53:18 +02:00
Grzegorz Sadowski
649a68b510
bug #15218 Fix attributes creation while the default locale is not available in our store (TheMilek, NoResponseMate)
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 [#X](https://github.com/Sylius/Sylius/issues/12112)                     |
| 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
-------

ec4d4d890f Remove usage of defaultLocaleCode from SelectAttributeChoicesCollectionType
fd1834479d Use localeCode in ProductAttribute form to prevent logic from breaking when not using default locale
a959f7c4fc [Behat] Add scenario for checking if attribute is correctly added with values
f297799825 Update upgrade file
a9546e0081 Fix BC Break in SelectAttributeChoicesCollectionType
2023-08-18 06:50:08 +02:00
Jacob Tobiasz
68c0dc5bd9
docs #15227 CartBlamerListener not found , replace with ShopCartBlamerListener (zairigimad)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 or 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | fixes #X, partially #Y, mentioned in #Z                      |
| 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
-------
  Update checkout.rst
  Update docs/book/orders/checkout.rst
2023-08-18 06:01:38 +02:00
Jacob Tobiasz
f5585cb244
docs #15232 [Documentation][Admin] Add notes about accessing guest orders (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 | fixes #11720 |
| License         | MIT                                                          |

Channel form:
<img width="661" alt="image" src="https://github.com/Sylius/Sylius/assets/6140884/0ac62417-44a7-4c38-b80c-9b2cb41141fe">

<!--
 - 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
-------
  [Documentation] Add note about accessing guest orders by shop user
  [Admin] Add note to channel form about disabling account verification
2023-08-17 22:39:35 +02:00
Jacob Tobiasz
8a18c4de81
Extract positioning logic 2023-08-17 22:38:12 +02:00
Jan Goralski
a9546e0081
Fix BC Break in SelectAttributeChoicesCollectionType 2023-08-17 15:17:54 +02:00
Grzegorz Sadowski
5514a87bff
[Admin] Add note to channel form about disabling account verification 2023-08-17 15:11:55 +02:00
Grzegorz Sadowski
516d1f562b
[Documentation] Add note about accessing guest orders by shop user 2023-08-17 15:11:27 +02:00
Grzegorz Sadowski
8821485c23
bug #15231 Prevent skipping choosing payment step once skipping payment step allowed, but no payment method is available (jakubtobiasz)
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 | fixes #11677
| License         | MIT



Commits
-------

bd61d53a88 Prevent skipping choosing payment step once skipping payment step allowed, but no payment method is available
2023-08-17 14:35:02 +02:00
Jacob Tobiasz
bd61d53a88
Prevent skipping choosing payment step once skipping payment step allowed, but no payment method is available 2023-08-17 13:52:02 +02:00
Zairig Imad
c891a76649
Update docs/book/orders/checkout.rst
Co-authored-by: Jacob Tobiasz <80641364+jakubtobiasz@users.noreply.github.com>
2023-08-17 12:39:55 +01:00
Grzegorz Sadowski
2ea60360c3
bug #15219 [Admin] Fix inconsistent routing (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 | -                      |
| License         | MIT                                                          |


Commits
-------

a28111c71c [Admin] Fix product attribute routing
8baa29765a [Admin] Fix payment method routing
2023-08-17 09:00:37 +02:00
Ulrich
6cd7fda7b0
Update Component/Core composer.json 2023-08-16 13:55:15 +02:00