From e53050095cc12a57f0b71f278cfae3b179c17d8a Mon Sep 17 00:00:00 2001 From: Spencer Gabhart Date: Thu, 21 Oct 2021 15:12:17 -0400 Subject: [PATCH 1/3] ASD-817 - Prevent escaping special characters in Pay Now button payloads --- Model/Adapter/AmazonPayAdapter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adapter/AmazonPayAdapter.php b/Model/Adapter/AmazonPayAdapter.php index 426d668f..e2a30713 100755 --- a/Model/Adapter/AmazonPayAdapter.php +++ b/Model/Adapter/AmazonPayAdapter.php @@ -599,7 +599,7 @@ public function generatePayNowButtonPayload(Quote $quote, $paymentIntent = Payme $payload['addressDetails'] = $addressData; } - return json_encode($payload, JSON_UNESCAPED_SLASHES); + return json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); } public function signButton($payload, $storeId = null) From adabccfaa6bc4d07d60ce79357b2c669c727845b Mon Sep 17 00:00:00 2001 From: Spencer Gabhart Date: Wed, 27 Oct 2021 12:12:16 -0400 Subject: [PATCH 2/3] ASD-782 - Clarify naming for (Magento) redirect URLs --- etc/adminhtml/system.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 5d1b6827..df86269d 100755 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -227,7 +227,7 @@ payment/amazon_payment_v2/checkout_review_return_url - + Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Magento redirect to this URL after processing the Amazon session initiation, where checkout happens. Do not use a leading slash.]]> payment/amazon_payment_v2/checkout_review_url @@ -237,7 +237,7 @@ payment/amazon_payment_v2/checkout_result_return_url - + Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Magento will redirect to this URL after completing the checkout session. Do not use a leading slash.]]> payment/amazon_payment_v2/checkout_result_url From 7d6a4c8ee2b34eff8655aea86a752b0d86134a4a Mon Sep 17 00:00:00 2001 From: Jay Becker Date: Mon, 1 Nov 2021 10:42:50 -0500 Subject: [PATCH 3/3] Version bump to 5.9.1 and update changelog --- CHANGELOG.md | 4 ++++ README.md | 2 +- composer.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7300fe5..b04be14b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 5.9.1 +* Fixed issue with umlauts in PayNow button flow +* Updated config labels for Magento Checkout redirect paths + ## 5.9.0 * Added custom Carrier Code mapping * Added config options to allow headless integrations to change return urls diff --git a/README.md b/README.md index 271bb5ce..11dd7f9c 100755 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ The following table provides an overview on which Git branch is compatible to wh Magento Version | Github Branch | Latest release ---|---|--- 2.2.6 - 2.2.11 (EOL) | [V2checkout-1.2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x) | 1.20.0 (EOL) -2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.9.0 +2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.9.1 ## Release Notes See [CHANGELOG.md](/CHANGELOG.md) diff --git a/composer.json b/composer.json index fca358a1..13f2f55f 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "amzn/amazon-pay-magento-2-module", "description": "Official Magento2 Plugin to integrate with Amazon Pay", "type": "magento2-module", - "version": "5.9.0", + "version": "5.9.1", "license": [ "Apache-2.0" ],