Merge pull request #1091 from BearGroup/release/5.9.1

Release/5.9.1
amzn · Nov 2, 2021 · 9d591ac · 9d591ac
2 parents fc23bf7 + 7d6a4c8
commit 9d591ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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/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)

diff --git 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
@@ -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"
   ],

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -227,7 +227,7 @@
                             <config_path>payment/amazon_payment_v2/checkout_review_return_url</config_path>
                         </field>
                         <field id="checkout_review_url" translate="label comment" type="text" sortOrder="19" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Checkout URL Path</label>
+                            <label>Magento Checkout URL Path</label>
                             <comment><![CDATA[<strong>Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.</strong><br />Magento redirect to this URL after processing the Amazon session initiation, where checkout happens. Do not use a leading slash.]]></comment>
                             <config_path>payment/amazon_payment_v2/checkout_review_url</config_path>
                         </field>
@@ -237,7 +237,7 @@
                             <config_path>payment/amazon_payment_v2/checkout_result_return_url</config_path>
                         </field>
                         <field id="checkout_result_url" translate="label comment" type="text" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Checkout result URL Path</label>
+                            <label>Magento Checkout result URL Path</label>
                             <comment><![CDATA[<strong>Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.</strong><br />Magento will redirect to this URL after completing the checkout session. Do not use a leading slash.]]></comment>
                             <config_path>payment/amazon_payment_v2/checkout_result_url</config_path>
                         </field>