Skip to content

Conversation

@SyliusBot
Copy link

This PR has been generated automatically.
For more details see 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.1 -m "Resolve conflicts between 2.0 and 2.1"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/PayPalPlugin repository.

Once the conflicts are resolved, please run git merge --continue and push the changes to this PR.

GSadee and others added 30 commits July 21, 2025 10:39
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | 

Currently, after completing checkout and being redirected to PayPal,
regardless of whether the payment is completed or canceled by the user,
Sylius always attempts to cancel the payment upon return. This leads to
state machine errors when the payment has already been completed, the
system still tries to cancel it, which is incorrect and may cause
unexpected behavior.

This PR updates the logic to ensure that the payment is only canceled
when it should be and when it is still possible.
| Q               | A
| --------------- | -----
| Branch?         | 1.7 (security fixes)
| Bug fix?        | no
| New feature?    | no
| Related tickets | fixes
#279
| Q               | A
| --------------- | -----
| Branch?         | 1.7 (improvements)
| Bug fix?        | no
| New feature?    | no
| Related tickets | fixes
#301
…384)

| Q               | A
| --------------- | -----
| Branch?         | 1.7 (bug fixes)
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes
#332

This PR ensures product names sent to PayPal do not exceed the
127-character limit defined by the PayPal Orders API. If the name is too
long, it will be truncated to 124 characters and appended with an
ellipsis (...). This prevents potential validation issues and ensures
clean display of item data in the PayPal interface.
| Q               | A
| --------------- | -----
| Branch?         | 1.7 (bug fixes)
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes
[#359](#359)

Added "sylius/resource-bundle": "^1.11" dependency to composer.json
| Q               | A
| --------------- | -----
| Branch?         | 1.7 (fixes)
| Bug fix?        | yes

Solves problems
- when the customer clicks on PayPal checkout, he is not taken to the
-Complete step with his PayPal account details, but to the Select
Address step;
- When changing the PayPal settings in payment methods, the hidden data
in the form are deleted.
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | kinda
| New feature?    | no
| Related tickets | -
…led (#383)

| Q               | A
| --------------- | -----
| Branch?         | 1.7 (bug fixes)
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #354 

This PR addresses an issue where the shopping cart is emptied when a
customer initiates but cancels a PayPal Checkout.
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | updated #239

The fallback in `CancelLastPayPalPaymentAction` has already been added
in the meantime.
…#392)

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #247, replaces #248
Allow disabling paypal methods prioritization
NoResponseMate and others added 26 commits October 15, 2025 10:07
| Q               | A
| --------------- | -----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| Related tickets | -
…394)

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | kinda?
| Related tickets | fixes #302
…ry (#398)

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | no
| New feature?    | no
| Related tickets | related #392, #383
…es (#405)

| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | kinda
| New feature?    | kinda
| Related tickets | fixes #353, #178
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #218
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #264
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | -
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no?
| Related tickets | fixes #367, replaces #298
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | kinda
| Related tickets | fixes #207

Introduced a new configuration node `supported_locales` which sets the
`sylius_paypal.supported_locales` parameter, further used in locale
processing.
The default value of this node is set based on [PayPal's
documentation](https://developer.paypal.com/reference/locale-codes/)
table.
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | no
| Related tickets | continuation #402
| Q               | A
| --------------- | -----
| Branch?         | 1.7
| Bug fix?        | yes
| New feature?    | kinda?
| Related tickets | -
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.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.7 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/PayPalPlugin`
repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
| Q               | A
| --------------- | -----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| Related tickets | -
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants