Commit graph

31440 commits

Author SHA1 Message Date
Jacob Tobiasz
17ca7e0756
Remove non-existing Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext entry 2023-12-22 14:52:20 +01:00
Jacob Tobiasz
de0eaf8442
Resolve conflicts between 1.13 and 2.0 2023-12-22 14:33:57 +01:00
Jacob Tobiasz
d0b82fd975
[UPMERGE] 1.13 -> 2.0 (#15666)
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-21 19:12:36 +01:00
Jacob Tobiasz
5e714820e8
Replace the DateTimeProvider with the Clock 2023-12-21 18:35:58 +01:00
Kamil Grygierzec
db8a38ff40
Add parameter for order state to filter out and fix the OrdrerExtension logic 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
01884e28a5
Rename fulfilled_order file to fulfilled 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
6b57260f9a
Move applyToCollection logic to private method and use in both cases 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
b90c7872ee
Use SectionProvider in OrderExtension 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
40676795b3
Remove no more valid scenarios 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
d6b36dafc9
Cover preventing to view customers cart from the orders resource 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
b090f472c6
Cover accessing order from payments and shipments 2023-12-21 10:15:28 +01:00
Kamil Grygierzec
8cf586d08a
Cover handling order shipment 2023-12-21 10:15:28 +01:00
Wojdylak
cfdfe2c610
[Behat] Update step names in scenarios after changing name of steps 2023-12-21 10:15:28 +01:00
Jan Goralski
882d7359d3
[API] Cover viewing details of a product 2023-12-21 10:15:28 +01:00
Jan Goralski
07a954e6ef
Cleanup
[API] Unify position sorting
2023-12-21 10:15:26 +01:00
Jan Goralski
e86dd2fdcc
[API][Admin] Cover managing product associations 2023-12-21 10:15:18 +01:00
Jan Goralski
237eb2ebc1
[API] Finish covering viewing product attributes 2023-12-21 10:15:18 +01:00
Jan Goralski
d42453e58d
[API][Admin] Refactor viewing product suite split 2023-12-21 10:15:18 +01:00
Jan Goralski
cd94d7a6b5
[API][Admin] Cover seeing applied promotions on variants 2023-12-21 10:15:18 +01:00
Jan Goralski
3b4163b0cd
[API][Admin] More product related scenarios marked no-api 2023-12-21 10:15:18 +01:00
Jan Goralski
139cd83026
[API][Admin] Finish covering product and product taxon sorting 2023-12-21 10:15:18 +01:00
Jan Goralski
03b11686df
[API][Admin] Finish covering product filtering 2023-12-21 10:15:16 +01:00
Kamil Grygierzec
1df06bf7e0
move validation groups parameters to shipping config 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
88feadb383
Add comments fixes 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
c8b9ae343f
Change shipping validation groups parameters 2023-12-21 10:15:06 +01:00
Kamil Grygierzec
cc5e95560d
Cover contract tests 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
387e59a5f7
Add parameter for shipping method rule and calculator validation groups 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
19c04d301f
[Behat] Cover shipping method management 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
cc77a334a1
Validate shipping method rules and calculators 2023-12-21 10:14:59 +01:00
Kamil Grygierzec
a903bc077d
[API] Add missing shipping method serialization and resources 2023-12-21 10:14:59 +01:00
Wojdylak
ceba4a8942
[ApiBundle][Address] Rename GetAddressLogEntryAction to GetAddressLogEntryCollectionAction 2023-12-21 10:14:59 +01:00
Wojdylak
0072784228
[ApiBundle][Address] Add address log entries operation 2023-12-21 10:14:59 +01:00
Rafikooo
72d559127f
[Behat] Use ChannelTransformer in DashboardContext 2023-12-21 10:14:59 +01:00
Rafikooo
76919bf0a0
[Behat] Improve statistics UI implementation 2023-12-21 10:14:59 +01:00
Rafikooo
6b98f18125
[Scenarios] Improve statistics scenarios 2023-12-21 10:14:59 +01:00
Jacob Tobiasz
46037d5521
Make automatic refactoring running every day 2023-12-21 10:14:59 +01:00
Rafikooo
c39ed1e704
[Behat] Modify ResponseChecker methods signature 2023-12-21 10:14:59 +01:00
Rafikooo
e70347cdd1
[Behat] Add ChannelContext improvements 2023-12-21 10:14:59 +01:00
Rafikooo
7af279a6a6
[Behat][API] Add new method to the ResponseCheckerInterface 2023-12-21 10:14:59 +01:00
Rafikooo
538a436838
[Unit] Add setUpOrderPlacer method in OrderPlacerTrait 2023-12-21 10:14:59 +01:00
Rafikooo
3cf2711350
[Unit] Refactor tests that uses OrderPlacerTrait 2023-12-21 10:14:59 +01:00
Rafikooo
760727b003
[Unit] Refactor OrderPlacerTrait 2023-12-21 10:14:59 +01:00
Sylius Bot
1ac8eb69df
[CS][DX] Refactor 2023-12-21 10:14:59 +01:00
Wojdylak
aed6f64611
[PromotionBundle] Add data mapper to PromotionCouponGeneratorInstructionType 2023-12-21 10:14:59 +01:00
Wojdylak
192f29ea57
[PromotionBundle] Add sylius validation group to CouponPossibleGenerationAmount 2023-12-21 10:14:29 +01:00
Wojdylak
ca50413356
[PromotionBundle] Add validation group to PromotionCouponGeneratorInstructionType 2023-12-21 10:14:29 +01:00
Wojdylak
64216857c0
[PromotionBundle] Deprecate PromotionCouponGeneratorInstructionInterface 2023-12-21 10:14:29 +01:00
Jacob Tobiasz
bb26e46f3c
minor #15657 [AUTO] Updated translations from Crowdin (1.13) (SyliusBot)
This PR was merged into the 1.13 branch.

Discussion
----------



Commits
-------
  [Translations] Updated translations from Crowdin
2023-12-21 10:12:53 +01:00
Sylius Bot
33c6c7d511 [CS][DX] Refactor 2023-12-21 10:04:44 +01:00
Jacob Tobiasz
ed578b3952
feature #15660 [API] Finish covering managing orders (TheMilek)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- 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                                                          |

<!--
 - 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
-------
  Cover handling order shipment
  Cover accessing order from payments and shipments
  Cover preventing to view customers cart from the orders resource
  Remove no more valid scenarios
  Use SectionProvider in OrderExtension
  Move applyToCollection logic to private method and use in both cases
  Rename fulfilled_order file to fulfilled
  Add parameter for order state to filter out and fix the OrdrerExtension logic
2023-12-20 19:05:45 +01:00