Commit graph

4653 commits

Author SHA1 Message Date
Grzegorz Sadowski
f0b477d33f
Merge branch '2.0' into payment-request
* 2.0: (21 commits)
  [CS][DX] Refactor
  [UserBundle] Add Jms/Serializer-bundle
  [UserBundle] FOS/Rest
  [CS][DX] Refactor
  [CS][DX] Refactor
  [Behat] Disable some customer scenarios
  [API] Split state provider configurations into admin and shop sections
  [Core] Add new payment repository method
  [Behat] Change the term status to state in payment and shipment scenarios
  [Behat] Refine codebase for shipment and payment contexts
  [Unit] Add new shipment and payment tests and refine existing ones
  [Behat] Adjust shipment and payment URLs
  [API][Shop] Secure shipment and payment endpoints
  [API][Shop] Move shipment and payment endpoints under the order resource
  [Unit] Add disableShopContext util function
  [Behat] Add requestGet method to API client
  [Unit] Change nAWw2jewpA token value to token
  [Unit] Add new response util functions
  [Unit] Refine order placer trait
  [Behat][API] Enable customer suite
  ...
2024-09-10 06:51:28 +02:00
Wojdylak
8949e68e04
[Api] Enable behat tests 2024-09-09 15:27:49 +02:00
Grzegorz Sadowski
313947a25b
[Shop][Behat] Payment step (#16871)
| Q               | A
|-----------------|-----
| Branch?         | bootstrap-shop
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - 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
-->
2024-09-09 09:46:06 +02:00
Grzegorz Sadowski
5f7b0f936d
[Shop][Checkout] Preselect country in addressing form (#16882)
| Q               | A
|-----------------|-----
| Branch?         | bootstrap-shop
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT
2024-09-09 08:46:54 +02:00
Grzegorz Sadowski
6636c2b934
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-09 07:38:25 +02:00
Michał Pysiak
7cca9c9ded
Add todo-api tag to scenarios 2024-09-09 06:10:56 +02:00
zairigimad
996fe93c58 make it possible to resend order confirmation after fulfilled state 2024-09-08 12:43:09 +01:00
Grzegorz Sadowski
b33f700a3d
[UPMERGE] 2.0 -> payment-request (#16877)
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 <this-pr-number>
git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```

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
push the changes to this PR.
2024-09-06 15:13:36 +02:00
Wojdylak
bc3a4608f1
[Shop][Checkout] Preselect country in addressing form 2024-09-06 14:58:26 +02:00
Rafikooo
eb0a19aacb
[Behat] Disable some customer scenarios 2024-09-06 14:57:26 +02:00
Rafikooo
733511f882
[Behat] Change the term status to state in payment and shipment scenarios 2024-09-06 14:52:10 +02:00
Rafikooo
c4a9cda6d3
[Behat] Enable customer scenarios 2024-09-06 14:23:55 +02:00
Wojdylak
57129c7a38 [Shop][Account] Add missing step 2024-09-06 12:23:48 +02:00
Wojdylak
626d4d5747 [Shop][Account] Add tags 2024-09-06 12:23:48 +02:00
Wojdylak
47e75d1f37 [Shop][Account] Enable behat tests 2024-09-06 12:23:48 +02:00
Kamil Grygierzec
1f322b1e8a
Resolve conflicts between 1.14 and 2.0 2024-09-06 11:40:57 +02:00
Wojdylak
3f164fcf09
Resolve conflicts between 2.0 and payment-request 2024-09-06 11:04:40 +02:00
Kamil Grygierzec
736c65dd8c
Cover the scenario for allowing access for only correctly logged in users 2024-09-06 10:22:37 +02:00
Michał Pysiak
2c4972219a
Disable scenarios that require checkout complete to be ready 2024-09-06 09:57:25 +02:00
Michał Pysiak
e6d470640c
Enable and fix scenarios 2024-09-06 08:51:50 +02:00
Kamil Grygierzec
cf969f08c8
Enable the remaining cart suites 2024-09-05 17:35:57 +02:00
Jan Goralski
080c0cac50
[Behat][Checkout] Enable shipping step tests 2024-09-05 16:11:35 +02:00
Rafał Jaskulski
5081335ddc
[Shop] Currency switcher (#16861)
| Q               | A
|-----------------|-----
| Branch?         | bootstrap-shop
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

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

Made currency switcher twig component, enabled currency scenarios.
Refactored CardComponent - removed duplicated PriceComponents
2024-09-05 10:31:15 +02:00
Grzegorz Sadowski
1f263a4e4a
Merge branch '2.0' into bootstrap-shop
* 2.0:
  [Api][Unit] Fix it_gets_all_product_variants_when_invalid_product_filter_provided test
  [Api] Replace sylius.api to sylius_api
  [Api] Cover sorting and filtration of resources
2024-09-05 10:11:48 +02:00
Grzegorz Sadowski
bb79cdad8b
[Api] Cover sorting and filtering of resources (#16856)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT
2024-09-05 10:11:07 +02:00
Grzegorz Sadowski
aa7b4c62fa
Merge branch '2.0' into bootstrap-shop
* 2.0:
  [Behat] Refine codebase for promotion and cart contexts
  Enable dashboard and homepage suites
  Minor Product config improvement
  Enable the rest of product tests and correct order of the attribute values in the response
  Correct contract tests and behat
  Bring back non exposed ProductOptionValue
  [Behat] Refine flow of shop promotion scenarios
2024-09-05 10:09:27 +02:00
Michał Pysiak
ee3aa699d8
Enable scenario 2024-09-05 09:42:16 +02:00
Grzegorz Sadowski
e8841ed9fb
[Behat] Refine Promotion Scenarios (#16840)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | continuation of
https://github.com/Sylius/Sylius/pull/16807
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - 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
-->
2024-09-05 09:36:31 +02:00
Wojdylak
bceb1c0928
[Api] Cover sorting and filtration of resources 2024-09-05 09:33:25 +02:00
Grzegorz Sadowski
a452741130
[API] Enable remaining Product tests (#16848)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - 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
-->
2024-09-05 09:28:29 +02:00
Michał Pysiak
cb1a5139d5
Enable missing scenarios
# Conflicts:
#	features/shop/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_cart_quantity.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_chosen_product.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_customer_group.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_items_from_specific_taxons.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_items_total.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_nth_order.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_total_of_items_from_specific_taxon.feature
2024-09-05 08:19:53 +02:00
Michał Pysiak
3653f58c75
Add component, enable scenarios
# Conflicts:
#	features/shop/currency/handling_different_currencies_on_multiple_channels.feature
#	features/shop/currency/switching_current_currency.feature
2024-09-05 07:44:27 +02:00
Grzegorz Sadowski
f9da71dbb3
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-05 07:07:43 +02:00
Kamil Grygierzec
20a5baa609
Enable dashboard and homepage suites 2024-09-04 15:29:34 +02:00
Grzegorz Sadowski
9db198d6fa
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-04 15:19:35 +02:00
Kamil Grygierzec
424d1c143b
Enable the rest of product tests and correct order of the attribute values in the response 2024-09-04 12:05:52 +02:00
Wojdylak
214a3eefb9
[Shop][Cart][Addressing] Fix behat tests 2024-09-04 09:36:52 +02:00
Wojdylak
016b1c4a09
[Shop][Cart][Addressing] Enable behat tests 2024-09-04 08:48:22 +02:00
Rafikooo
6400889ef8
[Behat] Refine flow of shop promotion scenarios 2024-09-04 08:44:33 +02:00
Michał Pysiak
1d369dbdb3 Changes after CR 2024-09-04 06:57:10 +02:00
Michał Pysiak
4d97966d69 Enable scenarios, fix behats
# Conflicts:
#	src/Sylius/Behat/Page/Shop/Cart/SummaryPage.php
2024-09-04 06:57:10 +02:00
Kamil Grygierzec
152addef27
Enable behat tests for address book 2024-09-03 15:41:33 +02:00
Rafał Jaskulski
4615474453
[Maintenance] Enable non-api tests again (#16814)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3
| 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.13 branch
 - 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
-->
2024-09-03 10:47:36 +02:00
Grzegorz Sadowski
f530b004be
[Shop][Behat] Fix checkout scenarios 2024-09-03 10:04:27 +02:00
Grzegorz Sadowski
111eb3b6e6
Merge branch '2.0' into api-platform-3
* 2.0:
  [CS][DX] Refactor
  [CS][DX] Refactor
  [CS][DX] Refactor
  [CI] Update Sylius branches in refactor workflow
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch random JS failed scenarios to Chromedriver
  [CS][DX] Refactor
2024-09-03 07:40:01 +02:00
Rafał Jaskulski
7f69b3452f
[UPMERGE] 2.0 -> bootstrap-shop (#16834)
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 <this-pr-number>
git merge upstream/bootstrap-shop -m "Resolve conflicts between 2.0 and bootstrap-shop"
```

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
push the changes to this PR.
2024-09-03 06:38:37 +02:00
Grzegorz Sadowski
6dc7b73c5a
Merge branch '1.14' into 2.0
* 1.14:
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch random JS failed scenarios to Chromedriver
2024-09-02 14:54:18 +02:00
Grzegorz Sadowski
797e10e58a
[Behat] Switch another random JS failed scenarios to Chromedriver 2024-09-02 13:27:54 +02:00
Grzegorz Sadowski
e0cd54b0df
[Behat] Switch another random JS failed scenarios to Chromedriver 2024-09-02 12:51:30 +02:00
Grzegorz Sadowski
8ebb064557
[Behat] Switch random JS failed scenarios to Chromedriver 2024-09-02 12:28:14 +02:00