-
Notifications
You must be signed in to change notification settings - Fork 63
[UPMERGE] 2.0 -> 2.1 #400
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SyliusBot
wants to merge
56
commits into
2.1
Choose a base branch
from
upmerge/2.0_2.1
base: 2.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[UPMERGE] 2.0 -> 2.1 #400
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 (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 | -
| 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.
Allow disabling paypal methods prioritization
| Q | A | --------------- | ----- | Branch? | 2.0 | Bug fix? | no | New feature? | no | Related tickets | -
| 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? | 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.
…m locale resolving
| 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR has been generated automatically.
For more details see upmerge_pr.yaml.
Remember! The upmerge should always be merged with using
Merge pull requestbutton.In case of conflicts, please resolve them manually with usign the following commands:
If you use other name for the upstream remote, please replace
upstreamwith the name of your remote pointing to theSylius/PayPalPluginrepository.Once the conflicts are resolved, please run
git merge --continueand push the changes to this PR.