Commit graph

31466 commits

Author SHA1 Message Date
Jan Goralski
e71ee0de25
[API][Admin] Finish covering product filtering 2023-12-20 13:47:52 +01:00
Wojdylak
85c925fbe3
[ApiBundle][Address] Rename GetAddressLogEntryAction to GetAddressLogEntryCollectionAction 2023-12-20 12:08:30 +01:00
Jan Góralski
da3fc6b4dc
minor #15656 [AUTO] Updated translations from Crowdin (1.12) (SyliusBot)
This PR was merged into the 1.12 branch.

Discussion
----------



Commits
-------
  [Translations] Updated translations from Crowdin
2023-12-20 11:56:56 +01:00
Jan Góralski
c574d1cf29
minor #15662 Add running "Refactor" workflow daily (jakubtobiasz)
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 | 
| License         | MIT


Commits
-------
  Make automatic refactoring running every day
2023-12-20 11:43:31 +01:00
Rafikooo
d719c1bc81
[Behat] Use ChannelTransformer in DashboardContext 2023-12-20 11:02:47 +01:00
Rafikooo
7641ba0f53
[Behat] Improve statistics UI implementation 2023-12-20 11:02:47 +01:00
Rafikooo
9598e42336
[Scenarios] Improve statistics scenarios 2023-12-20 11:02:45 +01:00
Jacob Tobiasz
b10ff781ed
minor #15637 [Behat] Implementation Improvements of the ResponseCheckerInterface (Rafikooo)
This PR was merged into the 1.13 branch.

Discussion
----------

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



Commits
-------
  [Behat][API] Add new method to the ResponseCheckerInterface
  [Behat] Add ChannelContext improvements
  [Behat] Modify ResponseChecker methods signature
2023-12-20 10:45:01 +01:00
Wojdylak
166009906a
[ApiBundle][Address] Add address log entries operation 2023-12-20 10:43:50 +01:00
Jan Góralski
6162879ee7
refactor #15655 [Unit] OrderPlacerTrait Refactor (Rafikooo)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets |  https://github.com/Sylius/Sylius/pull/15598                     |
| License         | MIT                                                          |

This refactor will facilitate the testing of various date range statistics here.: https://github.com/Sylius/Sylius/pull/15598

Commits
-------
  [Unit] Refactor OrderPlacerTrait
  [Unit] Refactor tests that uses OrderPlacerTrait
  [Unit] Add setUpOrderPlacer method in OrderPlacerTrait
2023-12-20 10:39:26 +01:00
Sylius Bot
63b6cea6eb [CS][DX] Refactor 2023-12-20 10:34:45 +01:00
Sylius Bot
ef113ae63b [CS][DX] Refactor 2023-12-20 10:34:03 +01:00
Jacob Tobiasz
72248d29be
[UPMERGE] 1.13 -> 2.0 (#15661)
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 
git merge upstream/2.0 --no-commit
```

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
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```
2023-12-20 10:33:34 +01:00
Jacob Tobiasz
3a723c0a69
Make automatic refactoring running every day 2023-12-20 10:26:29 +01:00
Rafikooo
526958cbc5
[Unit] Add setUpOrderPlacer method in OrderPlacerTrait 2023-12-20 09:59:02 +01:00
Rafikooo
f94f4f6411
[Unit] Refactor tests that uses OrderPlacerTrait 2023-12-20 09:59:02 +01:00
Rafikooo
67caba6976
[Unit] Refactor OrderPlacerTrait 2023-12-20 09:59:02 +01:00
Jan Góralski
2919d8b471
minor #15640 [PromotionBundle] Deprecate PromotionCouponGeneratorInstructionInterface (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?   | yes
| Related tickets | N/A
| License         | MIT


Commits
-------
  [PromotionBundle] Deprecate PromotionCouponGeneratorInstructionInterface
  [PromotionBundle] Add validation group to PromotionCouponGeneratorInstructionType
  [PromotionBundle] Add sylius validation group to CouponPossibleGenerationAmount
  Update upgrade file
  [PromotionBundle] Add data mapper to PromotionCouponGeneratorInstructionType
2023-12-20 09:12:40 +01:00
Wojdylak
19aef03b74
[PromotionBundle] Add data mapper to PromotionCouponGeneratorInstructionType 2023-12-19 08:25:18 +01:00
Jan Góralski
5837831415
minor #15658 Improve error handling while sending malformed amount value in the tax rate api resource update operation (jakubtobiasz)
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 | 
| License         | MIT

![CleanShot 2023-12-18 at 10 54 51](https://github.com/Sylius/Sylius/assets/80641364/8878df1a-5028-4273-8edf-2810e06a8222)

Commits
-------
  Improve error handling while sending malformed amount value in the tax rate api resource update operation
2023-12-18 13:38:37 +01:00
Wojdylak
4347f203ca
Update upgrade file 2023-12-18 12:13:00 +01:00
Wojdylak
8147a8612f
[PromotionBundle] Add sylius validation group to CouponPossibleGenerationAmount 2023-12-18 12:12:59 +01:00
Wojdylak
dd6cc0461f
[PromotionBundle] Add validation group to PromotionCouponGeneratorInstructionType 2023-12-18 12:12:59 +01:00
Wojdylak
22c834895f
[PromotionBundle] Deprecate PromotionCouponGeneratorInstructionInterface 2023-12-18 12:12:59 +01:00
Jacob Tobiasz
323bd9ac59
Improve error handling while sending malformed amount value in the tax rate api resource update operation 2023-12-18 10:53:18 +01:00
Jan Góralski
378278aec4
minor #15650 Update the example response of the Customer's statistics endpoint (jakubtobiasz)
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

![CleanShot 2023-12-15 at 19 29 24](https://github.com/Sylius/Sylius/assets/80641364/22b5df77-9fba-485d-b308-b4ade9ddbcc4)

The example in the API documentation is now displayed correctly c:.

Commits
-------
  Update the example response of the Customer's statistics endpoint
2023-12-18 09:15:21 +01:00
Jan Góralski
e06f9165e9
minor #15630 Finish covering managing product-related resources (jakubtobiasz)
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


Commits
-------
  Add missing @no-api tags in editing_product_review.feature
  Add missing @api tags in recalculating_product_average_rating.feature
  Cover scenarios in sorting_product_variants_within_product_by_position.feature
  Cover scenarios in filtering_product_reviews.feature
  Provide post-CR fixes
  Remove duplicated step
  [Behat][API] Minor improvements in managing variants contexts
  [Behat][API] Refactor scenarios of sorting variants to have the same for UI and API contexts
  [Behat] Fix scenario of browsing accepted reviews for case-sensitive PostreSQL
2023-12-18 09:14:32 +01:00
Sylius Bot
7b355d975f [Translations] Updated translations from Crowdin 2023-12-18 04:03:47 +00:00
Sylius Bot
92ec93611e [Translations] Updated translations from Crowdin 2023-12-18 04:01:53 +00:00
Jacob Tobiasz
23b4abd530
minor #15646 [API][Admin] Allow using float for amount in tax rates (NoResponseMate)
This PR was merged into the 1.13 branch.

Discussion
----------

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

It's hacky as hell; caused by [this bug](https://github.com/api-platform/core/issues/1647), the only other way of fixing it is a migration but that sucks by itself. I'm guessing there are more convoluted ways as well but that's too much pain for the gain.

Commits
-------
  [API][Admin] Allow using float for amount in tax rates
2023-12-15 20:37:09 +01:00
Jacob Tobiasz
d117f01e5c
Update the example response of the Customer's statistics endpoint 2023-12-15 19:34:35 +01:00
Jan Goralski
6180a8cbdc
[API][Admin] Allow using float for amount in tax rates 2023-12-15 16:25:24 +01:00
Rafikooo
457357c711
[Behat] Modify ResponseChecker methods signature 2023-12-15 16:04:19 +01:00
Grzegorz Sadowski
fe77e9782d
Merge branch '1.13' into 2.0
* 1.13:
  [PromotionBundle] Add prefix to validation groups for promotion action/rule
  [PromotionBundle][PromotionRule] Add available type to validation message
  [PromotionBundle][PromotionAction] Add available type to validation message
  Update upgrade file
  [PromotionBundle] Split PromotionRuleValidator to PromotionRuleGroupValidator and PromotionRuleTypeValidator
  [PromotionBundle] Split PromotionActionValidator to PromotionActionGroupValidator and PromotionActionTypeValidator
  Add prefix sylius_ to validation groups
  Update upgrade file
  [PromotionBundle] Remove constraints from FormType to avoid double constraints
  [PromotionBundle] Move logic from PromotionRuleGroupValidator to PromotionRuleValidator
  [PromotionBundle] Move logic from PromotionActionGroupValidator to PromotionActionValidator
  [PromotionBundle] Add parameters validation groups for promotion action and promotion rule
2023-12-15 14:10:11 +01:00
Grzegorz Sadowski
f578921582
refactor #15628 [PromotionBundle] Update validation process of promotion actions/rules (Wojdylak)
This PR was merged into the 1.13 branch.

Discussion
----------

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


Commits
-------

e530c7d9ca [PromotionBundle] Add parameters validation groups for promotion action and promotion rule
235c7e0dd5 [PromotionBundle] Move logic from PromotionActionGroupValidator to PromotionActionValidator
53c31aa420 [PromotionBundle] Move logic from PromotionRuleGroupValidator to PromotionRuleValidator
36d2a5ac08 [PromotionBundle] Remove constraints from FormType to avoid double constraints
d56ce734c6 Update upgrade file
c021e3e3a1 Add prefix sylius_ to validation groups
99a94b92a3 [PromotionBundle] Split PromotionActionValidator to PromotionActionGroupValidator and PromotionActionTypeValidator
de77a13d2d [PromotionBundle] Split PromotionRuleValidator to PromotionRuleGroupValidator and PromotionRuleTypeValidator
eb4a50c92b Update upgrade file
dd50a6f3a6 [PromotionBundle][PromotionAction] Add available type to validation message
633cf30ab3 [PromotionBundle][PromotionRule] Add available type to validation message
1494fce8fe [PromotionBundle] Add prefix to validation groups for promotion action/rule
2023-12-15 13:52:51 +01:00
Grzegorz Sadowski
5709d84807
[Behat] Fix scenario of browsing accepted reviews for case-sensitive PostreSQL 2023-12-15 11:26:58 +01:00
Grzegorz Sadowski
9daf87fd62
Merge branch '1.13' into 2.0
* 1.13:
  [Admin] Change name of official support section in menu and adjust translations
  Add all translations & change label
  Add business support CTA to admin panel
  [ECS] Apply types order changes
  [ECS] Add union types ordering rule
  [ECS] Apply ecs fixes
  [ChannelsTest] use inArray to check locales
  [ApiBundle] Add contract tests for ProductTaxon resource
  [Behat] Add API test coverage for features/promotion/tracking_usage folder
  [ApiBundle][CatalogPromotion] Add order filters
  [ApiBundle][ProductTaxon] Move deleting productTaxon to productTaxon resource
  Use HeadersBuilder in the Customer Statistics API test
  Use query_bus instead of command_bus for query handlers
  Add handling the GetCustomerStatistics query
  Create the GetCustomerStatistics query and the GetCustomerStatisticsHandler
  Remove fr translation
  Add tests that form doesn't display Extra fields error after login in checkout
  Update src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
  Prevent eager loading hundreds of countries
  [Checkout] Prevent extra fields when login in on addressing page
2023-12-15 10:42:55 +01:00
Grzegorz Sadowski
a5163fe9dc
Merge branch '1.12' into 1.13
* 1.12:
  [Admin] Change name of official support section in menu and adjust translations
  Add all translations & change label
  Add business support CTA to admin panel
  Remove fr translation
  Add tests that form doesn't display Extra fields error after login in checkout
  Update src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
  [Checkout] Prevent extra fields when login in on addressing page
2023-12-15 10:26:43 +01:00
Grzegorz Sadowski
6f35576c05
[Behat][API] Refactor scenarios of sorting variants to have the same for UI and API contexts 2023-12-15 10:25:48 +01:00
Jacob Tobiasz
0dc74d8d46
minor #15642 [Admin] Add official support submenu in admin panel (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|
| Related tickets | replaces #15436 |
| License         | MIT                                                          |

<img width="248" alt="image" src="https://github.com/Sylius/Sylius/assets/6140884/2b58b7c1-7334-4e10-9bba-de393b525f05">

<!--
 - 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
-------
  Add business support CTA to admin panel
  Add all translations & change label
  [Admin] Change name of official support section in menu and adjust translations
2023-12-15 09:23:17 +01:00
Grzegorz Sadowski
f0fffc53ae
[Admin] Change name of official support section in menu and adjust translations 2023-12-15 08:53:55 +01:00
Nicolas Kroll
2248bcb945
Add all translations & change label 2023-12-15 07:19:30 +01:00
Nicolas Kroll
bc0a168889
Add business support CTA to admin panel 2023-12-15 07:19:22 +01:00
Grzegorz Sadowski
21cd6b63f2
[Behat][API] Minor improvements in managing variants contexts 2023-12-15 07:07:52 +01:00
Jacob Tobiasz
49861067bb
Remove duplicated step 2023-12-15 06:42:59 +01:00
Jacob Tobiasz
52da4090cb
Provide post-CR fixes 2023-12-15 06:42:59 +01:00
Jacob Tobiasz
d2b2b674d2
Cover scenarios in filtering_product_reviews.feature 2023-12-15 06:42:58 +01:00
Jacob Tobiasz
905ec5e240
Cover scenarios in sorting_product_variants_within_product_by_position.feature 2023-12-15 06:42:57 +01:00
Jacob Tobiasz
9cf2423b53
Add missing @api tags in recalculating_product_average_rating.feature 2023-12-15 06:42:23 +01:00
Jacob Tobiasz
0bdffa0674
Add missing @no-api tags in editing_product_review.feature 2023-12-15 06:42:23 +01:00