Commit graph

311 commits

Author SHA1 Message Date
Grzegorz Sadowski
a320ee8ada
[UPMERGE] 2.0 -> payment-request (#17065)
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-10-01 11:34:21 +02:00
Wojdylak
4081ce7ec0
[PaymentBundle] Add winzou state machine for paymentRequest 2024-10-01 11:13:07 +02:00
Grzegorz Sadowski
ad3adef0c1
Remove fos_rest config file form test_cached_payum env 2024-10-01 10:34:18 +02:00
Grzegorz Sadowski
54238fa3d4
Merge branch 'payment-request' into upmerge/2.0_payment-request 2024-10-01 09:09:56 +02:00
Wojdylak
eb2cec1ad2
Add localization to live components 2024-09-30 13:41:24 +02:00
Grzegorz Sadowski
b60a844846
Fix test service definition for test_cached_payum env 2024-09-30 10:12:26 +02:00
Grzegorz Sadowski
112ad653a5
[PaymentRequest] Adjust class namespace in test_cached_payum config 2024-09-30 06:54:13 +02:00
Michał Pysiak
5c66672fec
[Shop] Add json login 2024-09-27 10:39:46 +02:00
Michał Pysiak
5360772aaf
Remove dependecies 2024-09-27 06:09:00 +02:00
Grzegorz Sadowski
64d6b9d526
Resolve conflicts between 2.0 and payment-request 2024-09-25 07:34:26 +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
Wojdylak
532be0456b
Resolve conflicts between 2.0 and payment-request 2024-09-24 09:18:52 +02:00
Michał Pysiak
93528d2062
Remove unused urls from security 2024-09-24 07:37:06 +02:00
Francis Hilaire
ac94a1912c
Lets Payum first check if it's a Payum gateway for UI 2024-09-20 13:22:58 +02:00
Francis Hilaire
dbdd226419
Prioritize PaymentRequest 2024-09-20 13:22:57 +02:00
Francis Hilaire
2dd6cf5035
Fix PHPUnit env test_cached_payum 2024-09-20 13:22:57 +02:00
Grzegorz Sadowski
0a6db753a8 [Composer] Remove willdurand/hateoas and willdurand/hateoas-bundle dependencies 2024-09-18 08:03:36 +02:00
Michał Pysiak
d3a62673fd Fix behat errors 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
108fbf7b5d [SF7] Update configs 2024-09-16 14:22:00 +02:00
Grzegorz Sadowski
7de412f515 [Composer] Remove willdurand/hateoas and willdurand/hateoas-bundle dependencies 2024-09-16 14:22:00 +02:00
Wojdylak
3f164fcf09
Resolve conflicts between 2.0 and payment-request 2024-09-06 11:04:40 +02:00
Grzegorz Sadowski
d1407d6153
Resolve conflicts between 2.0 and symfony-7 2024-09-04 13:19:19 +02:00
Loïc Frémont
c63a42b82d [SF7] Add Symfony 7 support for User bundle 2024-08-23 14:45:44 +02:00
Grzegorz Sadowski
e71a03215b
Remove importing calendar config in services_test_cached_payum 2024-08-07 08:55:33 +02:00
Jacob Tobiasz
842a791ccf
Change the 'sylius.payment_request.command_provider.payum.offline' priority when the test_cached_payum env is used 2024-08-06 13:53:42 +02:00
Jacob Tobiasz
81089b1f9c
Rename the test_cached_payumless environment to test_cached_payum 2024-08-06 13:53:41 +02:00
Jacob Tobiasz
1d2f327c74
Create an environment for payumless tests 2024-08-06 13:40:48 +02:00
Francis Hilaire
873b4f3c42
Lower down default uuid version to 6 for Sf 5.4 2024-08-06 13:38:52 +02:00
Francis Hilaire
475250ca15
Switch to Symfony uid 2024-08-06 13:38:49 +02:00
Grzegorz Sadowski
25a3e77281
Merge branch '2.0' into api-platform-3
* 2.0: (547 commits)
  [Admin][UX] Filter translatable autocomplete results based on current locale [Admin][DX] Extract translatable autocomplete processing to a separate form type
  [Behat] Add possibility to accepting null as value in response checker
  [Maintenance] Enable non-UI tests in CI
  Fixes after CR
  Changes after CR
  [Admin][Product] Enable and fix tests
  [Admin][Product] Add view in store button
  Remove final from the Zone's form component
  Review fixes
  [Admin][UI] Add error indicators for form tabs and accordions
  [Admin][Taxon] Rename FormImageElement to ImageFormElement
  [Admin][Taxon] Split media more granularly
  [Admin][Taxon] Remove unnecessary code
  [Taxon][Behat] Extract management of image to separate form element.
  [Behat] Extract waitForFormUpdate function to CrudFormElement
  [Behat] Submit live component before submitting the form
  [Admin][Taxon][Image] Enable behat tests
  [Admin][Taxon] Implements media management
  [Admin][Product][Inventory] Enable behat tests
  [Admin][Zone] Move FormComponent
  ...
2024-05-20 12:36:43 +02:00
Jan Goralski
7732964a01
[Admin][Order] Updated history view styling 2024-05-02 16:24:39 +02:00
Grzegorz Sadowski
a29f1ea135
Merge branch '2.0' into api-platform-3
* 2.0: (25 commits)
  Change application's version to v1.13.0-DEV
  Generate changelog for v1.13.0-RC.1
  Change application's version to v1.13.0-RC.1
  [Documentation] Update release dates for 1.13 and 2.0 versions
  [ECS] Fix nullable type declarations in the codebase
  [ECS] Fix nullable type declarations in Behat namespace
  [ECS] Add the NullableTypeDeclarationForDefaultNullValueFixer rule
  Add default label template in ShopBundle extending the UiBundle one
  Use extends instead of include in ShopBundle flashes template
  Manage confirmation modal for ShopBundle extending UiBundle
  Use Shop pagination macro in templates
  Use Shop messages macro in templates
  Use Shop flags macro in templates
  Use Shop headers macro in templates
  Use Shop buttons macro in templates
  [Documentation] Remove duplicated callback from state machine
  Update docs/book/architecture/state_machine.rst
  Add upmerging from 2.0 to api-platform-3
  Update php-entrypoint to give www-data permissions to public/media
  Update FUNDING.yml
  ...
2024-04-16 15:14:53 +02:00
Jacob Tobiasz
16c6701649
[UPMERGE] 2.0 -> bootstrap-admin-panel (#16108)
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-admin-panel -m "Resolve conflicts between 2.0 and bootstrap-admin-panel"
```

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-04-10 08:43:02 +02:00
Jacob Tobiasz
906187827d
[UPMERGE] 1.13 -> 2.0 (#16101)
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/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

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-04-09 10:20:23 +02:00
Wojdylak
f62a814d48
[Maintenance] Add image firewall 2024-04-08 12:44:29 +02:00
Grzegorz Sadowski
d13ebb94d8
Merge branch '2.0' into api-platform-3
* 2.0: (776 commits)
  Add missing validation for the customers first and last name
  [CS][DX] Refactor
  Bring back all Sylius' state machines to Winzou
  Add overriding the Resource's state machine with the one from the Sylius abstraction
  Add missing locales to contract test
  [Taxon][Behat] validate translations with unexisting locales
  [ShippingMethod][Behat] validate translations with unexisting locales
  [Promotion][Behat] validate translations with unexisting locales
  [Product][Behat] validate translations with unexisting locales
  [PaymentMethod][Behat] validate translations with unexisting locales
  Validate all translatable objects for unexisiting locales
  Validate customer's password reset
  Validate customer creation and edit
  Make the validation trait more generic
  [Api] Change namespace of TaxonImagesTest class
  [Api] Remove _response suffix
  [Behat] Minor improvments of viewing_taxon_image scenario
  [Api][ProductImage] Add https prefix check
  [Api][Admin] Allow using float for ratio in exchange rate
  SYL-3329 Fix behat test for SyliusPayPalPlugin
  ...
2024-03-29 14:49:47 +01:00
Jacob Tobiasz
bc775d80f3
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-03-14 09:40:38 +01:00
Rafikooo
d28e33369a
Resolve conflicts between 1.13 and 2.0 2024-03-13 10:22:00 +01:00
Rafikooo
9fdc244a35
[API] Change endpoint for administrator reset password 2024-03-11 17:00:08 +01:00
Rafikooo
05ff93ffb0
[API] Change endpoint for requesting customer authentication token 2024-03-11 17:00:08 +01:00
Rafikooo
b0e1c284e8
[API] Change endpoint for requesting admin authentication token 2024-03-11 17:00:08 +01:00
Jacob Tobiasz
6b3c87c221
Move the autocomplete endpoint behind the admin firewall 2024-02-25 14:33:05 +01:00
Jacob Tobiasz
13d24369cb
Add a basic add an attribute mechanism 2024-02-25 14:33:04 +01:00
Jacob Tobiasz
83bb8a1b7d
Resolve conflicts between 2.0 and bootstrap-admin-panel 2024-02-25 13:19:22 +01:00
Jacob Tobiasz
4906081bd9
Install the sylius/twig-hooks package 2024-02-08 16:49:53 +01:00
Jan Goralski
2bb4e0d26c
[Maintenance][Behat] Autoload calendar contexts into container 2024-02-02 15:55:39 +01:00
Jacob Tobiasz
544b0766d1
Resolve conflicts between 1.13 and 2.0 2024-02-01 08:22:59 +01:00
Jan Góralski
e688d18fec
minor #15738 Use the new State Machine abstraction (jakubtobiasz)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | kinda
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | based on the #15729
| License         | MIT



Commits
-------
  Use the new State Machine abstraction
  Fix invalid workflow event names
  Fix retrieving the checkout state in the validator
  Reverse the sign next to the Symfony Workflow events listeners priorities
  Remove the non-existing config key
  Fix the StateMachine-related tests
  Fix CI
  Remove a reference to Sylius Resource
  Fix handling transitions inside the WinzouStateMachine
  Add testing the state machine adapter in the CI
  Fix the deprecation trigger descriptions
  Remove redundant phpdocs about thrown exception
  Remove redundant sm.configs parameter passed to the winzou adapter
2024-01-31 21:05:51 +01:00
Jacob Tobiasz
ab217352ee
Add testing the state machine adapter in the CI 2024-01-26 14:48:56 +01:00
Kamil Grygierzec
a3dc54aa91
Add default locale parameter to core 2024-01-26 13:15:46 +01:00