Skip to content

Conversation

@magterskine
Copy link
Contributor

@magterskine magterskine commented May 1, 2020

Fix for BUNDLE-2554 - Amzon-pay VBE module (Unable to switch credit card during checkout)

Description:

Fix for issue in Amazon-pay bundled extension in which error message is thrown when attempting to change payment card during amazon checkout flow

Fixed Issues (if relevant):
https://jira.corp.magento.com/browse/MCLOUD-5930
https://jira.corp.magento.com/browse/BUNDLE-2554

Manual testing scenarios
Ensure that customer can change from one saved payment card to another without error during amazon checkout flow

Negative test scenario

N/A

Contribution checklist
Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

releasenotes
Fixes an issue with the Amazon Pay payment widget that prevented customers from changing the payment method on the Review & Payments step during the checkout process.


$responseParser = $this->clientFactory->create($storeId)->setOrderReferenceDetails($data);
- try {
- $response = $this->amazonSetOrderDetailsResponseFactory->create(

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too much whitespace

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BarnyShergold those lines are deleted. In patches need to pay attention to those which have + sign at the beginning, so only those line will exist after patch applying

- } catch (AmazonServiceUnavailableException $e) {
- if($e->getApiErrorCode() == 'OrderReferenceNotModifiable') {
- $this->logger->warning(
- "Could not modify Amazon order details for $amazonOrderReferenceId: "

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't embed variables in strings. Use single quotes and concatenate or use sprintf

Copy link
Member

@shiftedreality shiftedreality May 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix for 3rd-party extension, can be ignored in favor of the original change

+ /**
+ * @return boolean
+ */
+ protected function canConfirmOrderReference()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use private

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix for 3rd-party extension, can be ignored in favor of the original change

@mveeramneni mveeramneni requested a review from NadiyaS May 4, 2020 15:48
@magterskine
Copy link
Contributor Author

Patch is for Amazon-pay bundled extension. This extension is also available via Amazons Github page which has future versions published (i.e. later than Magento bundles). We can not makes the changes suggested above as this will break compatibility/versioning.

@shiftedreality shiftedreality changed the base branch from develop to 1.0 May 4, 2020 19:23
patches.json Outdated
},
"amzn/amazon-pay-and-login-magento-2-module": {
"Set Payment info bug": {
"3.4.1": "BUNDLE-2554__set_payment_info_bug_fix__3.4.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And add extension to the patch file
BUNDLE-2554__set_payment_info_bug_fix__3.4.1.patch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.4.1 is the version that will be bundled with Magento 2.3.5 - we do not at this point bundle 3.4.2 - and given this bug, when we increment the version of Amazon-pay that we bundle in future release, it will be at least 3.4.3 or greater which contains this fix

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And add extension to the patch file
BUNDLE-2554__set_payment_info_bug_fix__3.4.1.patch.

fixed

Copy link
Contributor

@NadiyaS NadiyaS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@magterskine please check all versions where this patch should be applied

@mveeramneni mveeramneni changed the title BUNDLE-2554: [Amazon Pay] Unable to switch credit card during checkout MCLOUD-5930: BUNDLE-2554: [Amazon Pay] Unable to switch credit card during checkout May 6, 2020
@andriyShevtsov
Copy link
Collaborator

QA approved

@shiftedreality shiftedreality dismissed BarnyShergold’s stale review May 11, 2020 17:03

Provided explanation for each

@shiftedreality shiftedreality merged commit 7f39efd into 1.0 May 11, 2020
@shiftedreality shiftedreality deleted the BUNDLE-2554 branch May 11, 2020 17:03
andriyShevtsov pushed a commit that referenced this pull request Sep 8, 2025
andriyShevtsov pushed a commit that referenced this pull request Sep 8, 2025
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.

8 participants