Commit graph

35846 commits

Author SHA1 Message Date
Wojdylak
532be0456b
Resolve conflicts between 2.0 and payment-request 2024-09-24 09:18:52 +02:00
Michał Pysiak
ea13cbc851
[Composer] Add doctrine/doctrine-bundle to UserBundle (#17000)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | after
https://github.com/Sylius/SyliusResourceBundle/pull/942
| 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-24 07:32:43 +02:00
Grzegorz Sadowski
7c863fe5a9
[Composer] Add doctrine/doctrine-bundle to UserBundle 2024-09-24 06:55:50 +02:00
Grzegorz Sadowski
5c9e3a8242
[CS][DX] Refactor (#16999)
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
2024-09-24 06:37:02 +02:00
Grzegorz Sadowski
7dae8fc8b4
Merge branch '1.14' into 2.0
* 1.14:
  [CI] Improve notification Slack message
2024-09-24 06:34:35 +02:00
Grzegorz Sadowski
c176336a61
Merge branch '1.13' into 1.14
* 1.13:
  [CI] Improve notification Slack message
2024-09-24 06:34:30 +02:00
Grzegorz Sadowski
ac081332e8
minor #16997 [CI] Improve notification Slack message (GSadee)
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<!-- 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
-->


Commits
-------

632fa9a9ee [CI] Improve notification Slack message
2024-09-24 06:34:09 +02:00
Sylius Bot
f7fcabe449 [CS][DX] Refactor 2024-09-24 02:26:57 +00:00
Grzegorz Sadowski
632fa9a9ee
[CI] Improve notification Slack message 2024-09-23 15:43:30 +02:00
Grzegorz Sadowski
dd5c188a40
Payment request UI (#16790)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | yes
| BC breaks?      | yes
| Deprecations?   | yes
| Related tickets | none
| License         | MIT

This PR will allow `PaymentRequest` to be used through the UI (not the
API), the goal is to allow developper to create HTTP response they need
to handle any Payment Method. SyliusPayumBundle controller actions will
be preserved to avoid any changes for existing Payum gateways.

# Basic payment flow

```mermaid
---
title: Customer paying an order
---
flowchart TD
    A[sylius_shop_checkout_complete]
    B[sylius_shop_order_pay]
    subgraph Payment Provider
    C[External portal
    or
    custom page]
    end
    D[sylius_shop_order_after_pay]
    E[sylius_shop_order_thank_you]
    F[sylius_shop_order_show]
    A --> B
    B --> C
    C --> D
    D -- OK --> E
    D -- KO --> F
    F -- Choose another 
    payment method or retry --> B
```

# What is the current (Sylius 1.*) URLs flow

```mermaid
---
title: Sylius 1.* - Customer paying an order
---
flowchart TD
    A[sylius_shop_checkout_complete] --> B[sylius_shop_order_pay]
    subgraph Payum
    C[payum_capture_do]
    D{External URL
    or
    custom page}
    end
    E[sylius_shop_order_after_pay]
    subgraph Payum after capture
    F[Payum Status
    &
    ResolveNextRoute
    ]
    end
    G[sylius_shop_order_thank_you]
    H[sylius_shop_order_show]
    B -- No payment --> G
    B --> C
    C <--> D
    D --> E
    C --> E
    E --> F
    F -- KO --> H
    F -- OK --> G
    H -- Choose another 
    payment method or retry --> B
```

# What this PR is aiming to do

```mermaid
---
title: Sylius 2.* - Customer paying an order
---
flowchart TD
    A[sylius_shop_checkout_complete]
    B[sylius_shop_order_pay]
    subgraph No payment
    C[No payment processing]
    end
    subgraph Payum
    D[Keep existing Payum
    beforeCapture processing]
    end
    subgraph Payment Request
    E[Payment Request processing]
    F[Http Response processing]
    end
    G[sylius_shop_order_after_pay]
    subgraph Payum after pay
    H[Keep existing
    afterCapture processing]
    end
    subgraph Payment request after pay
    I[Payment request processing]
    J[Http response processing]
    end
    A --> B
    B --> C & D & E
    G --> H & I
    C --> K
    D --> G
    E --> F
    F --> G
    I --> J
    H -- OK --> K
    H -- KO --> L
    J -- OK --> K
    J -- KO --> L
    L -- Choose another 
    payment method or retry --> B
    K[sylius_shop_order_thank_you]
    L[sylius_shop_order_show]
```


**Order pay phase**
- [x] `sylius.controller.payum::prepareCaptureAction` dispatch action
content into several services.
- [x] Create a more generic
`sylius.controller.shop.order_pay::payAction` to replace the previous
SyliusPayumBundle controller action.
- [x] Introduce `PaymentRequest` orderPay HTTP Response.

**After pay phase**
- [x] `sylius.controller.payum::afterCaptureAction` dispatch action
content into several services.
- [x] Create a more generic
`sylius.controller.shop.order_pay::afterPayAction` to replace the
previous SyliusPayumBundle controller action.
- [x] Introduce `PaymentRequest` afterPay HTTP Response.

**Global**
- [ ] Creeate or update tests.
2024-09-23 14:15:14 +02:00
Grzegorz Sadowski
bca1ef8a4e
Live components - minor improvements (#16994)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT
2024-09-23 13:47:54 +02:00
Francis Hilaire
100dad472a
One line import
Co-authored-by: Karol <33687392+Wojdylak@users.noreply.github.com>
2024-09-23 13:04:47 +02:00
Grzegorz Sadowski
f4c122722a
[Admin][Shop] Remove SyliusUiBundle config import (#16993)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| 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
-->

Removed SyliusUiBundle config import both in Admin and Shop. It was
making mess in Sylius-Standard
2024-09-23 12:56:33 +02:00
Karol
345f61652f
[API] Use parameters instead of hardcoded classes in ApiResources' configs (#16992)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | https://github.com/api-platform/core/pull/6659
| 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-23 12:45:44 +02:00
Wojdylak
c987313894
Move traits to components 2024-09-23 12:42:45 +02:00
Wojdylak
916b3491af
Change event names to constants 2024-09-23 12:41:56 +02:00
Grzegorz Sadowski
a72bfae8a2
[API] Resolve parameters passed in fromClass and toClass options 2024-09-23 11:29:55 +02:00
Grzegorz Sadowski
30b37b2ecc
Update composer-require-checker whitelist 2024-09-23 11:29:50 +02:00
Grzegorz Sadowski
a1b11699b5
[API] Override XmlResourceExtractor to add possibility to use parameters for defining ApiResources' classes 2024-09-23 11:29:50 +02:00
Grzegorz Sadowski
6c1954f4ec
[API] Use parameters instead of hardcoded classes in ApiResources' configs 2024-09-23 11:29:48 +02:00
Karol
aecff1a055
[API] Introduce operations' names for all endpoints (#16967)
| 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 | bases on #16960 
| License         | MIT

I would like to introduce operations' names for all endpoints to
simplify customization in end applications.

<!--
 - 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-23 11:19:28 +02:00
Michał Pysiak
865363eba4
[Admin][Shop] Remove SyliusUiBundle config import 2024-09-23 11:13:10 +02:00
Grzegorz Sadowski
f32ca48e11
[API] Fix inconsistency in endpoints' names 2024-09-23 10:23:12 +02:00
Grzegorz Sadowski
d62fe27003
[API] Adjust configurations to new endpoints' names 2024-09-23 10:23:09 +02:00
Grzegorz Sadowski
fb87da5e5e
[API] Adjust PathPrefixBasedOperationResolver to new endpoints' names 2024-09-23 10:23:09 +02:00
Grzegorz Sadowski
e610c8da75
[API] Introduce operations' names for shop endpoints 2024-09-23 10:23:09 +02:00
Grzegorz Sadowski
f40eebed6f
[API] Introduce operations' names for admin endpoints 2024-09-23 10:23:09 +02:00
Grzegorz Sadowski
f65c214a72
[Shop] Allow using interfaces in components (#16971)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | -
| License         | MIT
2024-09-23 09:19:14 +02:00
Karol
dbdeb4ae88
[API] Fix serialization group for currency get collection shop endpoint (#16991)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | yes
| 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-23 08:19:49 +02:00
Michał Pysiak
ecc0a2448c
Fix SummaryComponent 2024-09-23 07:16:52 +02:00
Grzegorz Sadowski
ab8c27c97e
[API] Fix serialization group for currency get collection shop endpoint 2024-09-23 06:42:51 +02:00
Michał Pysiak
6ddf72c427
Fixes after CR 2024-09-23 05:59:53 +02:00
Michał Pysiak
5483096d68
[Shop] Cleanup components 2024-09-23 05:59:53 +02:00
Michał Pysiak
4e39d875e4
[Shop] Fix bugs 2024-09-23 05:59:53 +02:00
Michał Pysiak
e8c8b358be
[Shop] Fix LiveArgs 2024-09-23 05:59:53 +02:00
Michał Pysiak
b3631bc0b5
[Shop] Fix nullable dehydration 2024-09-23 05:59:53 +02:00
Michał Pysiak
53d76cb759
[Shop] Add interfaces to custom live components 2024-09-23 05:59:53 +02:00
Michał Pysiak
a5cf5f759d
[Shop] Change to interfaces on twig components 2024-09-23 05:59:53 +02:00
Michał Pysiak
4e2e67201d
[Shop] Update components variables 2024-09-23 05:59:52 +02:00
Jan Goralski
2a02b0e5d7
[Shop] Update product review form component 2024-09-23 05:59:52 +02:00
Jan Goralski
e5597259d4
[Shop] Update cart and checkout form components 2024-09-23 05:59:52 +02:00
Jan Goralski
58d4891a5d
[Shop] Update customer form components 2024-09-23 05:59:52 +02:00
Rafał Jaskulski
a2ec2406f7
[CI] Add PHP 8.3 to packages build + remove packages build with Swiftmailer (#16986)
| 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 | 
| 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-20 14:39:36 +02:00
Grzegorz Sadowski
904cf1dfa2
[Core] Remove unneeded bundles from CoreBundle test application 2024-09-20 13:58:15 +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
3f387ca808
Rename var 2024-09-20 13:22:58 +02:00
Francis Hilaire
52188d7963
Simplify offline to the strict minimum 2024-09-20 13:22:57 +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
Francis Hilaire
f9c4ad20a7
Fix too many required arguments 2024-09-20 13:22:57 +02:00