Commit graph

3743 commits

Author SHA1 Message Date
Grzegorz Sadowski
5ff02d6f07
[Behat][API] Implement scenarios for toggling taxons 2023-08-30 07:37:02 +02:00
Grzegorz Sadowski
b949ae1019
[Behat][API] Implement scenarios for editing taxons 2023-08-30 07:37:00 +02:00
Grzegorz Sadowski
7d756091b1
[Behat][API] Implement scenarios for browsing taxons 2023-08-30 07:26:47 +02:00
Grzegorz Sadowski
d949a73c91
[Behat][API] Implement scenarios for adding taxons 2023-08-30 07:26:47 +02:00
Jacob Tobiasz
d88625b45f
Replace "I try to save changes" to "I save my changes" 2023-08-29 10:45:37 +02:00
Jacob Tobiasz
7df78676c4
Upmerge 1.12 into 1.13 2023-08-29 09:07:42 +02: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
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
TheMilek
d3d02d42d1
Show option name as a choice name instead of code 2023-08-25 13:36:26 +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
2d5aa6864f
[Behat][Admin][Taxon] Autogenerate slug based on selected parent 2023-08-24 15:58:26 +02:00
Jan Goralski
c46c713c5f
[Behat][Admin][Country] Tests for saving duplicated provinces 2023-08-24 10:44:49 +02:00
Jacob Tobiasz
474f12a819
Provide post-CR fixes 2023-08-19 08:10:54 +02:00
Jakub Tobiasz
852f2db9f5
Provide post-CR fixes 2023-08-18 18:58:13 +02:00
Jakub Tobiasz
0284acad88
Add email verification methods in API's EmailContext 2023-08-18 18:58:13 +02:00
Fabiana Romagnoli
185e876a77
Improve registration workflow 2023-08-18 18:58:13 +02:00
Grzegorz Sadowski
61ffae5f9f
Merge branch '1.12' into 1.13
* 1.12:
  Fix BC Break in SelectAttributeChoicesCollectionType
  [Admin] Add note to channel form about disabling account verification
  [Documentation] Add note about accessing guest orders by shop user
  Update docs/book/orders/checkout.rst
  Update checkout.rst
  Update upgrade file
  [Behat] Add scenario for checking if attribute is correctly added with values
  Use localeCode in ProductAttribute form to prevent logic from breaking when not using default locale
  Remove usage of defaultLocaleCode from SelectAttributeChoicesCollectionType
2023-08-18 06:51:34 +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
Jan Goralski
a9546e0081
Fix BC Break in SelectAttributeChoicesCollectionType 2023-08-17 15:17:54 +02:00
Grzegorz Sadowski
509a6f7dd5
Merge branch '1.12' into 1.13
* 1.12:
  Prevent skipping choosing payment step once skipping payment step allowed, but no payment method is available
2023-08-17 14:35:35 +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
Jan Goralski
c3a47fbbb4
[Behat][Taxon] Add tests for parent aware slug generation 2023-08-11 15:06:25 +02:00
TheMilek
a959f7c4fc
[Behat] Add scenario for checking if attribute is correctly added with values 2023-08-10 16:49:35 +02:00
Grzegorz Sadowski
44dbe54180
Merge branch '1.12' into 1.13
* 1.12:
  Fix configuring amount for catalog promotions fixed discount actions
2023-08-10 13:45:31 +02:00
Grzegorz Sadowski
163953bf8e
bug #15214 Fix configuring amount for catalog promotions fixed discount actions (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?   | yes <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes [#X](https://github.com/Sylius/Sylius/issues/15193)                     |
| 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
-->
it is now possible to configure decimal amounts with comma without validation errors

Commits
-------

e85e30b553 Fix configuring amount for catalog promotions fixed discount actions
2023-08-10 13:37:57 +02:00
Jacob Tobiasz
8f2c62413d
[UPMERGE] 1.12 -> 1.13 (#15216) 2023-08-10 07:09:18 +02:00
TheMilek
e85e30b553
Fix configuring amount for catalog promotions fixed discount actions 2023-08-07 13:34:16 +02:00
Grzegorz Sadowski
8589e7e79b
[Behat] Fix minor mistake in names of scenarios for receiving discount according to promotions priorities 2023-08-04 10:16:08 +02:00
Grzegorz Sadowski
766021c363
Merge branch '1.12' into 1.13
* 1.12:
  Fix cart promotion percentage discount to be rounded to 2 decimal places
  Fix catalog promotion percentage discount to be rounded to 2 decimal places
  Declare symfony/service-contracts dependency where needed
  Remove leftovers after removing ResettingCartContextInterface
  Rename the pass and preventing tagging with the kernel.reset tag twice
  Remove custom ResettingCartContextInterface
  Abstracts out ShopBasedCartContext::reset to an interface
2023-08-03 13:07:16 +02:00
TheMilek
cecee76932
Fix cart promotion percentage discount to be rounded to 2 decimal places 2023-08-03 08:24:06 +02:00
TheMilek
a3ff2373e9
Fix catalog promotion percentage discount to be rounded to 2 decimal places 2023-08-02 11:49:49 +02:00
Jacob Tobiasz
6b650ade4d
Resolve conflicts between 1.12 and 1.13 2023-08-02 11:07:39 +02:00
Grzegorz Sadowski
cb85edf3cf
[Behat] Change step name for configuring tax calculation strategy on channel 2023-08-01 09:21:41 +02:00
Grzegorz Sadowski
89e5cceef5
[Behat] Minor improvements to scenarios for applying taxes based on units calculation strategy 2023-08-01 09:21:38 +02:00
Grzegorz Sadowski
a3fe405150
[Behat] Cover the order item units based tax calculation strategy with scenarios 2023-08-01 09:21:37 +02:00
Grzegorz Sadowski
788c628af9
Merge branch '1.12' into 1.13
* 1.12:
  Add behat scenarios
  Add subquery to findMyNamePart method
  [Behat][Admin] Cover validation errors while adding a new avatar
  Fix rendering admin creation form with errors
2023-07-28 15:27:57 +02:00
Grzegorz Sadowski
03031fd19a
bug #15148 Fix rendering admin creation form with errors (jakubtobiasz, 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 | replaces #13241
| License         | MIT

Previously, when an avatar was added while creating a new administrator, once any error occurred, Sylius was throwing `500` due to being unable to create a CSRF token for the delete button.

Commits
-------

b8576ddbda Fix rendering admin creation form with errors
1394309b87 [Behat][Admin] Cover validation errors while adding a new avatar
2023-07-28 15:18:31 +02:00
TheMilek
eb23076294
Add behat scenarios 2023-07-28 11:29:33 +02:00
Jan Goralski
1394309b87
[Behat][Admin] Cover validation errors while adding a new avatar 2023-07-28 11:27:22 +02:00
Grzegorz Sadowski
34e77e5d0f
Merge branch '1.12' into 1.13
* 1.12:
  Provide post-CR fixes
  Fix static analysis
  Adjust scenarios to use less technical language
  Prevent placing an order with not available shipping method
  Add behat scenario covering preventing a placing an order with a disabled shipping method
  Add behat scenario covering expires session while cart updating
  [API] Fix CommandDenormalizer ignoring custom property names
  Update OrderController.php with early return
  check before refreshing from db
2023-07-21 07:19:19 +02:00
Grzegorz Sadowski
889df121e6
bug #15170 Prevent placing an order with a disabled shipping method (jakubtobiasz)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | kinda
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | replaces #12870
| License         | MIT                                                          |

Currently, when we disable a shipping method, and someone is after the shipping method choice step and has the disabled shipping method selected, they'll be able to place the order. After merging this PR, the customer is going to see 
> The "%shippingMethodName%" shipping method is not available, please choose another one.
message.

Commits
-------

f95513cc39 Add behat scenario covering preventing a placing an order with a disabled shipping method
f4603f9eb7 Prevent placing an order with not available shipping method
d70afa1951 Fix static analysis
a267e2ea3e Provide post-CR fixes
2023-07-20 15:26:19 +02:00
Jacob Tobiasz
a267e2ea3e
Provide post-CR fixes 2023-07-20 12:40:56 +02:00
Jacob Tobiasz
d228e2f5cf
minor #15157 [Issue 15151] - Check manager before refreshing object (ulinskas)
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 #15151                       |
| License         | MIT                                                          |



Commits
-------
  check before refreshing from db
  Update OrderController.php with early return
  Add behat scenario covering expires session while cart updating
  Adjust scenarios to use less technical language
2023-07-20 08:07:50 +02:00
Jacob Tobiasz
f445142034
Adjust scenarios to use less technical language 2023-07-17 20:03:19 +02:00
Jacob Tobiasz
f4603f9eb7
Prevent placing an order with not available shipping method 2023-07-17 14:47:15 +02:00
Jacob Tobiasz
f95513cc39
Add behat scenario covering preventing a placing an order with a disabled shipping method 2023-07-17 13:18:55 +02:00
Jacob Tobiasz
07a0c0e0dd
Add behat scenario covering expires session while cart updating 2023-07-15 19:13:25 +02:00