Commit graph

1453 commits

Author SHA1 Message Date
Grzegorz Sadowski
54238fa3d4
Merge branch 'payment-request' into upmerge/2.0_payment-request 2024-10-01 09:09:56 +02:00
Wojdylak
5967ca1e2e
Remove unnecessary code 2024-09-30 08:42:38 +02:00
Wojdylak
e4cbd6b46a
[Admin][PaymentRequest] Add behat tests 2024-09-27 09:34:51 +02:00
Grzegorz Sadowski
42f2fcb123
Resolve conflicts between 2.0 and payment-request 2024-09-26 13:52:33 +02:00
Grzegorz Sadowski
ecd82e8273
Merge branch '1.14' into 2.0
* 1.14:
  [API] Add missing endpoint for ShopUser in shop context
2024-09-25 12:13:51 +02:00
Grzegorz Sadowski
7e8e682d09
Merge branch '1.13' into 1.14
* 1.13:
  [API] Add missing endpoint for ShopUser in shop context
2024-09-25 12:06:23 +02:00
Grzegorz Sadowski
4e19386c7e
[UPMERGE] 2.0 -> payment-request (#17016)
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-25 10:25:02 +02:00
Grzegorz Sadowski
f0dc4cb967
[API] Add missing endpoint for ShopUser in shop context 2024-09-25 10:20:32 +02:00
Grzegorz Sadowski
64d6b9d526
Resolve conflicts between 2.0 and payment-request 2024-09-25 07:34:26 +02:00
Kamil Grygierzec
3600f870d1
[API] Add position to serialization and fix contract tests 2024-09-24 22:38:53 +02:00
Rafikooo
5ba8d3159e
[Unit] Add test cases for promotion coupon with non-existing promotion 2024-09-24 12:10:56 +02:00
Rafikooo
7d8d85a4ba
[Unit] Add customizable message to assertResponseNotFound in JsonApiTestCase 2024-09-24 12:10:56 +02:00
Rafikooo
7c2d8a8e0c
[Unit] Replace direct client requests with helper methods in PromotionCouponsTest class 2024-09-24 12:10:56 +02:00
Rafikooo
b68a670d14
[API] Refactor PromotionCoupons tests to use new promotion coupon URIs 2024-09-24 12:10:56 +02:00
Rafikooo
13b2649251
[Unit] Adjust promotion coupons tests 2024-09-24 12:10:55 +02:00
Rafikooo
c83a2642a8
[Unit] Refine promotion tests 2024-09-24 12:10:54 +02:00
Grzegorz Sadowski
cca95b5a33
Merge Symfony 7 into 2.0 (#16351)
| Q               | A
|-----------------|-----
| Branch?         | 2.0 
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets |
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - 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-24 12:09:21 +02:00
Rafikooo
92636eaadb
[Unit] Remove obsolete SessionAwareAjaxTestCase test class 2024-09-24 10:09:13 +02:00
Wojdylak
532be0456b
Resolve conflicts between 2.0 and payment-request 2024-09-24 09:18:52 +02:00
Grzegorz Sadowski
df217d7182
Resolve conflicts between 2.0 and symfony-7 2024-09-24 08:48:32 +02:00
Francis Hilaire
f9c4ad20a7
Fix too many required arguments 2024-09-20 13:22:57 +02:00
Jan Goralski
d34ad9a93e
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-18 09:19:11 +02:00
Jan Goralski
76f1334eac [Maintenance] Fix ChannelCodeCollectionValidator regression 2024-09-18 08:57:26 +02:00
Jan Goralski
843ae7bbee [Maintenance] Remove other deprecations
[Maintenance] Remove obsolete catalog promotion validation abstraction
2024-09-18 08:57:26 +02:00
Michał Pysiak
091714d563 Remove unused ajax routes
# Conflicts:
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/customer_group.yml
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product.yml
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_attribute.yml
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_option.yml
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_variant.yml
#	src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml

# Conflicts:
#	tests/Controller/AdminProductAjaxTest.php
#	tests/Controller/AdminProductVariantAjaxTest.php
2024-09-18 08:57:06 +02:00
Grzegorz Sadowski
66fc398f0a Remove PHPUnits related with removed hateos dependency 2024-09-18 08:03:36 +02:00
Jan Goralski
3d4dd1c843
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-17 13:56:55 +02:00
Michał Pysiak
22a6311d73 Change fixtures - add createdAt different time for customers 2024-09-16 14:22:00 +02:00
Michał Pysiak
0b13a8f1f1 Revert "[API] Change the order of customers in contract tests response"
This reverts commit 81a1fae989c5126bc13be88b8bd5736a4dba23d2.
2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
32d7bd6bc2 Remove PHPUnits related with removed hateos dependency 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
69ec6b1c92 [API] Change the order of customers in contract tests response 2024-09-16 14:22:00 +02:00
Kamil Grygierzec
99fb1a9ca5 Enable contract tests 2024-09-16 12:58:08 +02:00
Grzegorz Sadowski
3dfa1e72b2
[PaymentMethod] Adjust contract tests 2024-09-16 12:12:01 +02:00
Rafikooo
8339c218bc [Unit] Refine shipping method tests 2024-09-16 07:29:06 +02:00
Rafikooo
711680b82a [API] Change configuration of shipping method translation resource 2024-09-16 07:29:06 +02:00
Rafikooo
8ae576e640 [Unit] Adjust product tests 2024-09-16 07:29:06 +02:00
Rafikooo
8e8a7c6722 [Unit][Admin] Refine catalog promotion tests 2024-09-16 07:29:06 +02:00
Rafikooo
28b8ac1d02 [Unit] Adjust catalog promotion tests 2024-09-16 07:29:06 +02:00
Grzegorz Sadowski
6ce6bdd200 Fix declaration of AppKernel::registerContainerConfiguration method 2024-09-13 07:03:23 +02:00
Grzegorz Sadowski
da773b13dc
Merge branch '2.0' into payment-request
* 2.0:
  ShopUserBasedExtension - rename function name
  [Behat] Enable shop checkout context in address book suite
  [Behat] Enable customer address book scenarios
  Refactor a bit the validation of Statistics, enable unit test
  [API] Cover missing suite for getting errors in admin's language
  [Api] Fix spec tests
  [Api] Enable behat tests
  [Api] Add change password operation
  [Api] Secure the customer get endpoint
2024-09-10 15:25:23 +02:00
Grzegorz Sadowski
9b2f6ecb80
Merge branch '2.0' into symfony-7
* 2.0:
  ShopUserBasedExtension - rename function name
  [Behat] Enable shop checkout context in address book suite
  [Behat] Enable customer address book scenarios
  Refactor a bit the validation of Statistics, enable unit test
  [API] Cover missing suite for getting errors in admin's language
  [Api] Fix spec tests
  [Api] Enable behat tests
  [Api] Add change password operation
  [Api] Secure the customer get endpoint
2024-09-10 15:25:06 +02:00
Grzegorz Sadowski
5bde5a76e8
Merge branch '2.0' into bootstrap-shop
* 2.0:
  ShopUserBasedExtension - rename function name
  [Behat] Enable shop checkout context in address book suite
  [Behat] Enable customer address book scenarios
  Refactor a bit the validation of Statistics, enable unit test
  [API] Cover missing suite for getting errors in admin's language
  [Api] Fix spec tests
  [Api] Enable behat tests
  [Api] Add change password operation
  [Api] Secure the customer get endpoint
2024-09-10 15:24:34 +02:00
Wojdylak
5bbf2e6980 [API] Implement payment method group generator 2024-09-10 14:43:20 +02:00
Kamil Grygierzec
983594e0f7
Refactor a bit the validation of Statistics, enable unit test 2024-09-10 11:58:40 +02:00
Grzegorz Sadowski
cf58892acf
Merge branch '2.0' into bootstrap-shop
* 2.0:
  [CS][DX] Refactor
  [UserBundle] Add Jms/Serializer-bundle
  [UserBundle] FOS/Rest
  [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
  [Behat] Enable customer scenarios
2024-09-10 06:58:33 +02:00
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
f4d3aadd7c
[Api] Add change password operation 2024-09-09 15:27:49 +02:00
Wojdylak
a30537ec7f
[Api] Secure the customer get endpoint 2024-09-09 15:27:48 +02:00
Wojdylak
708a7ef4de
Resolve conflicts between 2.0 and payment-request 2024-09-09 09:49:58 +02:00
Grzegorz Sadowski
77bcb452cb
Merge branch '2.0' into symfony-7
* 2.0:
  [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
  [Behat] Enable customer scenarios
2024-09-09 09:39:02 +02:00