MCLOUD-5930: BUNDLE-2554: [Amazon Pay] Unable to switch credit card during checkout #42
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| diff --git a/vendor/amzn/amazon-pay-module/Model/OrderInformationManagement.php b/vendor/amzn/amazon-pay-module/Model/OrderInformationManagement.php | ||
| index 540b357..c18ef91 100644 | ||
| --- a/vendor/amzn/amazon-pay-module/Model/OrderInformationManagement.php | ||
| +++ b/vendor/amzn/amazon-pay-module/Model/OrderInformationManagement.php | ||
| @@ -144,24 +144,11 @@ public function saveOrderInformation($amazonOrderReferenceId, $allowedConstraint | ||
| ]; | ||
|
|
||
| $responseParser = $this->clientFactory->create($storeId)->setOrderReferenceDetails($data); | ||
| - try { | ||
| - $response = $this->amazonSetOrderDetailsResponseFactory->create( | ||
| - [ | ||
| - 'response' => $responseParser | ||
| - ] | ||
| - ); | ||
| + $response = $this->amazonSetOrderDetailsResponseFactory->create([ | ||
| + 'response' => $responseParser | ||
| + ]); | ||
|
|
||
| - $this->validateConstraints($response, $allowedConstraints); | ||
| - } catch (AmazonServiceUnavailableException $e) { | ||
| - if($e->getApiErrorCode() == 'OrderReferenceNotModifiable') { | ||
| - $this->logger->warning( | ||
| - "Could not modify Amazon order details for $amazonOrderReferenceId: " | ||
|
There was a problem hiding this comment. Don't embed variables in strings. Use single quotes and concatenate or use sprintf
Member
There was a problem hiding this comment. This is a fix for 3rd-party extension, can be ignored in favor of the original change |
||
| - . $e->getApiErrorMessage() | ||
| - ); | ||
| - } else { | ||
| - throw $e; | ||
| - } | ||
| - } | ||
| + $this->validateConstraints($response, $allowedConstraints); | ||
| } catch (LocalizedException $e) { | ||
| throw $e; | ||
| } catch (Exception $e) { | ||
| diff --git a/vendor/amzn/amazon-pay-module/Plugin/ConfirmOrderReference.php b/vendor/amzn/amazon-pay-module/Plugin/ConfirmOrderReference.php | ||
| index 6bad468..14b1264 100644 | ||
| --- a/vendor/amzn/amazon-pay-module/Plugin/ConfirmOrderReference.php | ||
| +++ b/vendor/amzn/amazon-pay-module/Plugin/ConfirmOrderReference.php | ||
| @@ -25,6 +25,7 @@ | ||
| use Amazon\Payment\Model\OrderInformationManagement; | ||
| use Magento\Quote\Api\Data\PaymentInterface; | ||
| use Magento\Quote\Api\Data\AddressInterface; | ||
| +use Magento\Framework\Webapi\Rest\Request; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| use Amazon\Payment\Gateway\Config\Config as GatewayConfig; | ||
| use Magento\Quote\Api\CartRepositoryInterface; | ||
| @@ -41,6 +42,11 @@ class ConfirmOrderReference | ||
| */ | ||
| private $checkoutSession; | ||
|
|
||
| + /** | ||
| + * @var Request | ||
| + */ | ||
| + private $request; | ||
| + | ||
| /** | ||
| * @var OrderInformationManagement | ||
| */ | ||
| @@ -54,19 +60,31 @@ class ConfirmOrderReference | ||
| /** | ||
| * ConfirmOrderReference constructor. | ||
| * @param Session $checkoutSession | ||
| + * @param Request $request | ||
| * @param OrderInformationManagement $orderInformationManagement | ||
| * @param CartRepositoryInterface $quoteRepository | ||
| */ | ||
| public function __construct( | ||
| Session $checkoutSession, | ||
| + Request $request, | ||
| OrderInformationManagement $orderInformationManagement, | ||
| CartRepositoryInterface $quoteRepository | ||
| ) { | ||
| $this->checkoutSession = $checkoutSession; | ||
| + $this->request = $request; | ||
| $this->orderInformationManagement = $orderInformationManagement; | ||
| $this->quoteRepository = $quoteRepository; | ||
| } | ||
|
|
||
| + /** | ||
| + * @return boolean | ||
| + */ | ||
| + protected function canConfirmOrderReference() | ||
|
Member
There was a problem hiding this comment. This is a fix for 3rd-party extension, can be ignored in favor of the original change |
||
| + { | ||
| + $data = $this->request->getRequestData(); | ||
| + return !empty($data['confirmOrder']); | ||
| + } | ||
| + | ||
| /** | ||
| * @param PaymentMethodManagementInterface $subject | ||
| * @param $result | ||
| @@ -94,10 +112,12 @@ public function afterSet( | ||
| $this->orderInformationManagement->saveOrderInformation($amazonOrderReferenceId); | ||
| } | ||
|
|
||
| - $this->orderInformationManagement->confirmOrderReference( | ||
| - $amazonOrderReferenceId, | ||
| - $quote->getStoreId() | ||
| - ); | ||
| + if ($this->canConfirmOrderReference()) { | ||
| + $this->orderInformationManagement->confirmOrderReference( | ||
| + $amazonOrderReferenceId, | ||
| + $quote->getStoreId() | ||
| + ); | ||
| + } | ||
| } | ||
| } | ||
|
|
||
| diff --git a/vendor/amzn/amazon-pay-module/view/frontend/web/js/action/place-order.js b/vendor/amzn/amazon-pay-module/view/frontend/web/js/action/place-order.js | ||
| index 63caadf..a254c3d 100644 | ||
| --- a/vendor/amzn/amazon-pay-module/view/frontend/web/js/action/place-order.js | ||
| +++ b/vendor/amzn/amazon-pay-module/view/frontend/web/js/action/place-order.js | ||
| @@ -40,6 +40,7 @@ define( | ||
| quoteId: quote.getQuoteId() | ||
| }); | ||
| payload = { | ||
| + confirmOrder: true, | ||
| cartId: quote.getQuoteId(), | ||
| email: quote.guestEmail, | ||
| paymentMethod: paymentData, | ||
| @@ -48,6 +49,7 @@ define( | ||
| } else { | ||
| serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {}); | ||
| payload = { | ||
| + confirmOrder: true, | ||
| cartId: quote.getQuoteId(), | ||
| paymentMethod: paymentData, | ||
| billingAddress: quote.billingAddress() | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Too much whitespace
There was a problem hiding this comment.
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