Skip to content

[UPMERGE] 1.6 -> 1.7#342

Closed
SyliusBot wants to merge 22 commits into1.7from
upmerge/1.6_1.7
Closed

[UPMERGE] 1.6 -> 1.7#342
SyliusBot wants to merge 22 commits into1.7from
upmerge/1.6_1.7

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/1.7 -m "Resolve conflicts between 1.6 and 1.7"

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.

maikrosenthal and others added 22 commits June 11, 2024 10:08
This PR was merged into the 1.6 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6 (bug fixes, improvements)
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #215

This will fix the wrong attribute "invoice_number" and add the "shipping_discount" to PayPalPurchaseUnit

Commits
-------

f4d63b2 Use constructor property promotion
a97fada Fixed wrong attribute invoice_number
b7ab860 Also transmit the shipping discount
1178884 Implemented suggested changes
…dee)

This PR was merged into the 1.6 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6 (bug fixes, improvements)
| Bug fix?        | yes
| New feature?    | no

The UpdatePayPalOrderAction fails to update the PayPal order.

The call of ParameterBag::get('shipping_address') should return a scalar value but returns an array.



Commits
-------

6c00cf2 Removed unused constructor parameter
2396d67 Use constructor property promotion
5c6905e Fixed an issue where the parameterBag returns a non-scalar value
3e5f710 Added an upgrade note
63d31b9 Move note to the proper version in UPGRADE file
This PR was merged into the 1.6 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6 (bug fixes, improvements)
| Bug fix?        | yes
| New feature?    | no

A customer name can contain more than just a first name and last name. It could also contain a salutation, middle names or a title. Using only the first two words of the full_name is therefore not sufficient.

The customer is also added to the address created. This means that the customer can change their shipping address after completing the order and can therefore influence the calculation of shipping costs and tax.


Commits
-------

a75f2d2 Do not add the customer to the address
464d258 Save the full name of the shipping address
415eda5 Removed unused constructor parameter
…uring checkout (#340)

| Q               | A
| --------------- | -----
| Branch?         | 1.6
| Bug fix?        | yes
| New feature?    | no
| Related tickets | fixes #303
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants