Datasets:

JetBrains-Research

/

commit-chronicle

like 6

Follow

JetBrains Research 47

[ { "change_type": "MODIFY", "old_path": "src/Core/Model/Config/SimplePath.php", "new_path": "src/Core/Model/Config/SimplePath.php", "diff": "@@ -308,23 +308,12 @@ class SimplePath\nOPENSSL_PKCS1_OAEP_PADDING\n);\n- // Decrypt final payload (AES 128-bit CBC)\n- if (function_exists('mcrypt_decrypt')) {\n- $finalPayload = @mcrypt_decrypt(\n- MCRYPT_RIJNDAEL_128,\n- $decryptedKey,\n- base64_decode($payload->encryptedPayload),\n- MCRYPT_MODE_CBC,\n- base64_decode($payload->iv)\n- );\n- } else {\n- // This library uses openssl_decrypt, which may have issues\n+ // Decrypt final payload (AES 256-bit CBC)\n$aes = new AES();\n$aes->setKey($decryptedKey);\n$aes->setIV(base64_decode($payload->iv, true));\n- $aes->setKeyLength(128);\n- $finalPayload = $aes->decrypt($payload->encryptedPayload);\n- }\n+ $aes->setKeyLength(256);\n+ $finalPayload = $aes->decrypt(base64_decode($payload->encryptedPayload));\n// Remove binary characters\n$finalPayload = preg_replace('/[\\x00-\\x1F\\x80-\\xFF]/', '', $finalPayload);\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.1\",\n+ \"version\": \"3.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.0.1'\n+version = u'3.0.2'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.0.1'\n+release = u'3.0.2'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -25,7 +25,7 @@ In case you are not able or willing to use the web installation, you can install\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.1` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.0.1\",\n+ \"version\": \"3.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.1\",\n- \"amzn/login-with-amazon-module\": \"3.0.1\",\n- \"amzn/amazon-pay-module\": \"3.0.1\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.2\",\n+ \"amzn/login-with-amazon-module\": \"3.0.2\",\n+ \"amzn/amazon-pay-module\": \"3.0.2\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.1\",\n+ \"version\": \"3.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.0.1\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.0.2\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.1\",\n+ \"version\": \"3.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.2\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.0.1\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.0.2\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.1\",\n+ \"version\": \"3.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.1\",\n- \"amzn/login-with-amazon-module\": \"^3.0.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.2\",\n+ \"amzn/login-with-amazon-module\": \"^3.0.2\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.0.1\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.0.2\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.2\",\n+ \"version\": \"3.0.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.0.2'\n+version = u'3.0.3'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.0.2'\n+release = u'3.0.3'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.1`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.3`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.0.2\",\n+ \"version\": \"3.0.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.2\",\n- \"amzn/login-with-amazon-module\": \"3.0.2\",\n- \"amzn/amazon-pay-module\": \"3.0.2\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.3\",\n+ \"amzn/login-with-amazon-module\": \"3.0.3\",\n+ \"amzn/amazon-pay-module\": \"3.0.3\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.2\",\n+ \"version\": \"3.0.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.0.2\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.0.3\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.2\",\n+ \"version\": \"3.0.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.3\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.0.2\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.0.3\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.2\",\n+ \"version\": \"3.0.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.2\",\n- \"amzn/login-with-amazon-module\": \"^3.0.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.3\",\n+ \"amzn/login-with-amazon-module\": \"^3.0.3\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.0.2\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.0.3\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-widget-address.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-widget-address.js", "diff": "@@ -105,7 +105,7 @@ define(\n* Error callback\n*/\nonError: function (error) {\n- console.log(error);\n+ console.log('OffAmazonPayments.Widgets.AddressBook', error.getErrorCode(), error.getErrorMessage());\n}\n}).bind(self.options.addressWidgetDOMId);\n},\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "new_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "diff": "@@ -112,6 +112,7 @@ define(\n* Error callback\n*/\nonError: function (error) {\n+ console.log('OffAmazonPayments.Widgets.Wallet', error.getErrorCode(), error.getErrorMessage());\nerrorProcessor.process(error);\n}\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.3\",\n+ \"version\": \"3.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.0.3'\n+version = u'3.1.0'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.0.3'\n+release = u'3.1.0'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.3`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.0`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.0` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.0.3\",\n+ \"version\": \"3.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.3\",\n- \"amzn/login-with-amazon-module\": \"3.0.3\",\n- \"amzn/amazon-pay-module\": \"3.0.3\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.0\",\n+ \"amzn/login-with-amazon-module\": \"3.1.0\",\n+ \"amzn/amazon-pay-module\": \"3.1.0\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.3\",\n+ \"version\": \"3.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.0.3\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.0\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.3\",\n+ \"version\": \"3.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.0\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.0.3\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.0\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.0.3\",\n+ \"version\": \"3.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.3\",\n- \"amzn/login-with-amazon-module\": \"^3.0.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.0\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.0\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.0.3\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.0\",\n+ \"version\": \"3.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.0'\n+version = u'3.1.1'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.0'\n+release = u'3.1.1'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.0`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.1`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.0` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.1` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.0\",\n+ \"version\": \"3.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.0\",\n- \"amzn/login-with-amazon-module\": \"3.1.0\",\n- \"amzn/amazon-pay-module\": \"3.1.0\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.1\",\n+ \"amzn/login-with-amazon-module\": \"3.1.1\",\n+ \"amzn/amazon-pay-module\": \"3.1.1\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.0\",\n+ \"version\": \"3.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.0\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.1\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.0\",\n+ \"version\": \"3.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.1\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.0\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.1\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.0\",\n+ \"version\": \"3.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.0\",\n- \"amzn/login-with-amazon-module\": \"^3.1.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.1\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.1\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.0\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.1\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.1\",\n+ \"version\": \"3.1.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.1'\n+version = u'3.1.2'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.1'\n+release = u'3.1.2'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.1`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.2`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.1` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.1\",\n+ \"version\": \"3.1.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.1\",\n- \"amzn/login-with-amazon-module\": \"3.1.1\",\n- \"amzn/amazon-pay-module\": \"3.1.1\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.2\",\n+ \"amzn/login-with-amazon-module\": \"3.1.2\",\n+ \"amzn/amazon-pay-module\": \"3.1.2\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.1\",\n+ \"version\": \"3.1.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.1\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.2\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.1\",\n+ \"version\": \"3.1.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.2\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.1\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.2\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.1\",\n+ \"version\": \"3.1.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.1\",\n- \"amzn/login-with-amazon-module\": \"^3.1.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.2\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.2\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.1\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.2\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressDecoratorJp.php", "new_path": "src/Core/Domain/AmazonAddressDecoratorJp.php", "diff": "namespace Amazon\\Core\\Domain;\nuse Amazon\\Core\\Api\\Data\\AmazonAddressInterface;\n+use Magento\\Framework\\App\\Config\\ScopeConfigInterface;\nclass AmazonAddressDecoratorJp implements AmazonAddressInterface\n{\n@@ -23,13 +24,18 @@ class AmazonAddressDecoratorJp implements AmazonAddressInterface\n* @var AmazonAddressInterface\n*/\nprivate $amazonAddress;\n+ private $_scopeConfig;\n/**\n* @param AmazonAddressInterface $amazonAddress\n+ * @param ScopeConfigInterface $config\n*/\n- public function __construct(AmazonAddressInterface $amazonAddress)\n- {\n+ public function __construct(\n+ AmazonAddressInterface $amazonAddress,\n+ ScopeConfigInterface $config\n+ ) {\n$this->amazonAddress = $amazonAddress;\n+ $this->_scopeConfig = $config;\n}\n/**\n@@ -37,18 +43,30 @@ class AmazonAddressDecoratorJp implements AmazonAddressInterface\n*/\npublic function getLines()\n{\n- $line1 = (string) $this->amazonAddress->getLine(1);\n- $line2 = (string) $this->amazonAddress->getLine(2);\n- $line3 = (string) $this->amazonAddress->getLine(3);\n- $city = (string) $this->amazonAddress->getCity();\n+ $addressLinesAllowed = (int)$this->_scopeConfig->getValue('customer/address/street_lines', \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE);\n+ $city = $this->amazonAddress->getCity();\n+\n+\n+ /*\n+ * AmazonAddressDecoratorJp->getCity() returns address line 1 when city is empty.\n+ * Omit line 1 from the street address in this case.\n+ */\n+ $offset = empty($city) ? 1 : 0;\n+ /*\n+ * The number of lines in a street address is configurable via 'customer/address/street_lines'.\n+ * To avoid discarding information, we'll concatenate additional lines so that they fit within the configured\n+ * address length.\n+ */\n$lines = [];\n- if (empty($city)) {\n- $lines[] = trim($line1 . ' ' . $line2);\n+ for($i = 1; $i <= 4; $i++) {\n+ $line = (string) $this->amazonAddress->getLine($i+$offset);\n+ if($i <= $addressLinesAllowed) {\n+ $lines[] = $line;\n} else {\n- $lines[] = $line2;\n+ $lines[count($lines)-1] = trim($lines[count($lines)-1] . ' ' . $line);\n+ }\n}\n- $lines[] = $line3;\nreturn $lines;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressFactory.php", "new_path": "src/Core/Domain/AmazonAddressFactory.php", "diff": "@@ -81,7 +81,6 @@ class AmazonAddressFactory\n);\n$data = [\n- AmazonAddressInterface::CITY => isset($address['City']) ? $this->escaper->escapeHtml($address['City']) : '',\nAmazonAddressInterface::POSTAL_CODE => isset($address['PostalCode']) ? $this->escaper->escapeHtml($address['PostalCode']) : '',\nAmazonAddressInterface::COUNTRY_CODE => $this->escaper->escapeHtml($address['CountryCode']),\nAmazonAddressInterface::TELEPHONE => isset($address['Phone']) ? $this->escaper->escapeHtml($address['Phone']) : '',\n@@ -91,6 +90,10 @@ class AmazonAddressFactory\nAmazonAddressInterface::LINES => $this->getLines($address)\n];\n+ if(isset($address['City'])) {\n+ $data[AmazonAddressInterface::CITY] = $this->escaper->escapeHtml($address['City']);\n+ }\n+\n$amazonAddress = $this->objectManager->create(AmazonAddress::class, ['data' => $data]);\n$countryCode = strtoupper($address['CountryCode']);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "new_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "diff": "@@ -99,9 +99,6 @@ class PaymentConfigSaveAfter implements ObserverInterface\n*/\npublic function execute(Observer $observer)\n{\n- // Make sure address captures 3 lines to be compatible with AP\n- $this->configWriter->save('customer/address/street_lines', 3);\n-\nif (!$this->request->getParam('amazon_test_creds')) {\nreturn;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/config.xml", "new_path": "src/Core/etc/config.xml", "diff": "<jp>https://static-fe.payments-amazon.com/OffAmazonPayments/jp/sandbox/lpa/js/Widgets.js?nomin</jp>\n</sandbox>\n</widget>\n+ <customer>\n+ <address>\n+ <street_lines>3</street_lines>\n+ </address>\n+ </customer>\n</default>\n</config>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressDecoratorJp.php", "new_path": "src/Core/Domain/AmazonAddressDecoratorJp.php", "diff": "namespace Amazon\\Core\\Domain;\nuse Amazon\\Core\\Api\\Data\\AmazonAddressInterface;\n-use Magento\\Framework\\App\\Config\\ScopeConfigInterface;\nclass AmazonAddressDecoratorJp implements AmazonAddressInterface\n{\n@@ -24,18 +23,14 @@ class AmazonAddressDecoratorJp implements AmazonAddressInterface\n* @var AmazonAddressInterface\n*/\nprivate $amazonAddress;\n- private $_scopeConfig;\n/**\n* @param AmazonAddressInterface $amazonAddress\n- * @param ScopeConfigInterface $config\n*/\npublic function __construct(\n- AmazonAddressInterface $amazonAddress,\n- ScopeConfigInterface $config\n+ AmazonAddressInterface $amazonAddress\n) {\n$this->amazonAddress = $amazonAddress;\n- $this->_scopeConfig = $config;\n}\n/**\n@@ -43,32 +38,13 @@ class AmazonAddressDecoratorJp implements AmazonAddressInterface\n*/\npublic function getLines()\n{\n- $addressLinesAllowed = (int)$this->_scopeConfig->getValue('customer/address/street_lines', \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE);\n$city = $this->amazonAddress->getCity();\n-\n/*\n* AmazonAddressDecoratorJp->getCity() returns address line 1 when city is empty.\n* Omit line 1 from the street address in this case.\n*/\n- $offset = empty($city) ? 1 : 0;\n-\n- /*\n- * The number of lines in a street address is configurable via 'customer/address/street_lines'.\n- * To avoid discarding information, we'll concatenate additional lines so that they fit within the configured\n- * address length.\n- */\n- $lines = [];\n- for($i = 1; $i <= 4; $i++) {\n- $line = (string) $this->amazonAddress->getLine($i+$offset);\n- if($i <= $addressLinesAllowed) {\n- $lines[] = $line;\n- } else {\n- $lines[count($lines)-1] = trim($lines[count($lines)-1] . ' ' . $line);\n- }\n- }\n-\n- return $lines;\n+ return array_slice($this->amazonAddress->getLines(), empty($city) ? 1 : 0);\n}\n/**\n@@ -140,6 +116,10 @@ class AmazonAddressDecoratorJp implements AmazonAddressInterface\n*/\npublic function getLine($lineNumber)\n{\n- $this->amazonAddress->getLine($lineNumber);\n+ $lines = $this->getLines();\n+ if (isset($lines[$lineNumber-1])) {\n+ return $lines[$lineNumber-1];\n+ }\n+ return null;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Helper/Address.php", "new_path": "src/Payment/Helper/Address.php", "diff": "@@ -21,6 +21,7 @@ use Magento\\Customer\\Api\\Data\\AddressInterface;\nuse Magento\\Customer\\Api\\Data\\AddressInterfaceFactory;\nuse Magento\\Customer\\Api\\Data\\RegionInterfaceFactory;\nuse Magento\\Directory\\Model\\RegionFactory;\n+use Magento\\Framework\\App\\Config\\ScopeConfigInterface;\nclass Address\n{\n@@ -39,14 +40,21 @@ class Address\n*/\nprivate $regionDataFactory;\n+ /**\n+ * @var ScopeConfigInterface\n+ */\n+ private $_scopeConfig;\n+\npublic function __construct(\nAddressInterfaceFactory $addressFactory,\nRegionFactory $regionFactory,\n- RegionInterfaceFactory $regionDataFactory\n+ RegionInterfaceFactory $regionDataFactory,\n+ ScopeConfigInterface $config\n) {\n$this->addressFactory = $addressFactory;\n$this->regionFactory = $regionFactory;\n$this->regionDataFactory = $regionDataFactory;\n+ $this->_scopeConfig = $config;\n}\n/**\n@@ -58,15 +66,33 @@ class Address\n*/\npublic function convertToMagentoEntity(AmazonAddressInterface $amazonAddress)\n{\n+ $addressLinesAllowed = (int)$this->_scopeConfig->getValue('customer/address/street_lines', \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE);\n+\n$address = $this->addressFactory->create();\n$address->setFirstname($amazonAddress->getFirstName());\n$address->setLastname($amazonAddress->getLastName());\n$address->setCity($amazonAddress->getCity());\n- $address->setStreet(array_values($amazonAddress->getLines()));\n$address->setPostcode($amazonAddress->getPostCode());\n$address->setTelephone($amazonAddress->getTelephone());\n$address->setCountryId($this->getCountryId($amazonAddress));\n+\n+ /*\n+ * The number of lines in a street address is configurable via 'customer/address/street_lines'.\n+ * To avoid discarding information, we'll concatenate additional lines so that they fit within the configured\n+ * address length.\n+ */\n+ $lines = [];\n+ for($i = 1; $i <= 4; $i++) {\n+ $line = (string) $amazonAddress->getLine($i);\n+ if($i <= $addressLinesAllowed) {\n+ $lines[] = $line;\n+ } else {\n+ $lines[count($lines)-1] = trim($lines[count($lines)-1] . ' ' . $line);\n+ }\n+ }\n+ $address->setStreet(array_values($lines));\n+\n$company = !empty($amazonAddress->getCompany()) ? $amazonAddress->getCompany() : '';\n$address->setCompany($company);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Helper/Address.php", "new_path": "src/Payment/Helper/Address.php", "diff": "@@ -43,7 +43,7 @@ class Address\n/**\n* @var ScopeConfigInterface\n*/\n- private $_scopeConfig;\n+ private $scopeConfig;\npublic function __construct(\nAddressInterfaceFactory $addressFactory,\n@@ -54,7 +54,7 @@ class Address\n$this->addressFactory = $addressFactory;\n$this->regionFactory = $regionFactory;\n$this->regionDataFactory = $regionDataFactory;\n- $this->_scopeConfig = $config;\n+ $this->scopeConfig = $config;\n}\n/**\n@@ -66,7 +66,10 @@ class Address\n*/\npublic function convertToMagentoEntity(AmazonAddressInterface $amazonAddress)\n{\n- $addressLinesAllowed = (int)$this->_scopeConfig->getValue('customer/address/street_lines', \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE);\n+ $addressLinesAllowed = (int)$this->scopeConfig->getValue(\n+ 'customer/address/street_lines',\n+ \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE\n+ );\n$address = $this->addressFactory->create();\n$address->setFirstname($amazonAddress->getFirstName());\n@@ -76,7 +79,6 @@ class Address\n$address->setTelephone($amazonAddress->getTelephone());\n$address->setCountryId($this->getCountryId($amazonAddress));\n-\n/*\n* The number of lines in a street address is configurable via 'customer/address/street_lines'.\n* To avoid discarding information, we'll concatenate additional lines so that they fit within the configured\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "new_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "diff": "@@ -60,11 +60,6 @@ class PaymentConfigSaveAfter implements ObserverInterface\n*/\nprivate $request;\n- /**\n- * @var WriterInterface\n- */\n- private $configWriter;\n-\n/**\n* PaymentConfigSaveAfter constructor.\n*\n@@ -74,7 +69,6 @@ class PaymentConfigSaveAfter implements ObserverInterface\n* @param Data $amazonCoreHelper\n* @param ReinitableConfigInterface $config\n* @param RequestInterface $request\n- * @param WriterInterface $configWriter\n*/\npublic function __construct(\nApiCredentialsValidatorFactory $apiCredentialsValidatorFactory,\n@@ -82,8 +76,7 @@ class PaymentConfigSaveAfter implements ObserverInterface\nJson $jsonCredentials,\nData $amazonCoreHelper,\nReinitableConfigInterface $config,\n- RequestInterface $request,\n- WriterInterface $configWriter\n+ RequestInterface $request\n) {\n$this->apiCredentialsValidatorFactory = $apiCredentialsValidatorFactory;\n$this->messageManager = $messageManager;\n@@ -91,7 +84,6 @@ class PaymentConfigSaveAfter implements ObserverInterface\n$this->jsonCredentials = $jsonCredentials;\n$this->appConfig = $config;\n$this->request = $request;\n- $this->configWriter = $configWriter;\n}\n/**\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/prerequisites.rst", "new_path": "docs/prerequisites.rst", "diff": "@@ -4,7 +4,7 @@ Prerequisites\nSystem requirements\n-------------------\n-+The **Amazon Pay and Login with Amazon** Magento 2 extension requires you to have a valid **Amazon Pay** merchant account (refer to the :ref:`prerequisites-amazon-account-setup` if you don't have one yet) and a webserver running a Magento 2 store instance with following conditions met:\n+The **Amazon Pay and Login with Amazon** Magento 2 extension requires you to have a valid **Amazon Pay** merchant account (refer to the :ref:`prerequisites-amazon-account-setup` if you don't have one yet) and a webserver running a Magento 2 store instance with following conditions met:\n* Magento CE (2.1.0 or higher)\n* cURL for PHP\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/di.xml", "new_path": "src/Core/etc/di.xml", "diff": "<type name=\"Magento\\Checkout\\CustomerData\\Cart\">\n<plugin name=\"amazon_core_cart_section\" type=\"Amazon\\Core\\Plugin\\CartSection\" />\n</type>\n+ <type name=\"Magento\\Config\\Model\\Config\\TypePool\">\n+ <arguments>\n+ <argument name=\"sensitive\" xsi:type=\"array\">\n+ <item name=\"payment/amazon_payments/simplepath/privatekey\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/client_secret\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/secret_key\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/credentials_json\" xsi:type=\"string\">1</item>\n+ </argument>\n+ <argument name=\"environment\" xsi:type=\"array\">\n+ <item name=\"payment/amazon_payments/simplepath/publickey\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payments/simplepath/privatekey\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/merchant_id\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/client_id\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/client_secret\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/access_key\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/secret_key\" xsi:type=\"string\">1</item>\n+ <item name=\"payment/amazon_payment/sandbox\" xsi:type=\"string\">1</item>\n+ </argument>\n+ </arguments>\n+ </type>\n</config>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Helper/Data.php", "new_path": "src/Core/Helper/Data.php", "diff": "@@ -24,6 +24,7 @@ use Magento\\Store\\Model\\StoreManagerInterface;\nuse Magento\\Framework\\Module\\ModuleListInterface;\nuse Magento\\Framework\\Module\\StatusFactory;\nuse Amazon\\Core\\Model\\AmazonConfig;\n+use Magento\\Framework\\App\\Cache\\TypeListInterface;\n/**\n* @SuppressWarnings(PHPMD.ExcessivePublicCount)\n@@ -73,6 +74,7 @@ class Data extends AbstractHelper\n* @param ClientIp $clientIpHelper\n* @param StatusFactory $moduleStatusFactory\n* @param AmazonConfig $config\n+ * @param TypeListInterface $cacheTypeList\n*/\npublic function __construct(\nModuleListInterface $moduleList,\n@@ -81,7 +83,8 @@ class Data extends AbstractHelper\nStoreManagerInterface $storeManager,\nClientIp $clientIpHelper,\nStatusFactory $moduleStatusFactory,\n- AmazonConfig $config\n+ AmazonConfig $config,\n+ TypeListInterface $cacheTypeList\n) {\nparent::__construct($context);\n$this->moduleList = $moduleList;\n@@ -90,6 +93,7 @@ class Data extends AbstractHelper\n$this->clientIpHelper = $clientIpHelper;\n$this->moduleStatusFactory = $moduleStatusFactory;\n$this->config = $config;\n+ $this->cacheTypeList = $cacheTypeList;\n}\n/*\n@@ -779,6 +783,7 @@ class Data extends AbstractHelper\n// Make sure all of them are disabled if any one of them is disabled.\nif ($isDisabled > 0 && $isDisabled != 3) {\n$this->moduleStatusFactory->create()->setIsEnabled(false, ['Amazon_Payment', 'Amazon_Login', 'Amazon_Core']);\n+ $this->cacheTypeList->cleanType('config');\n}\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.2\",\n+ \"version\": \"3.1.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.2'\n+version = u'3.1.3'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.2'\n+release = u'3.1.3'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.2`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.3`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.2\",\n+ \"version\": \"3.1.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.2\",\n- \"amzn/login-with-amazon-module\": \"3.1.2\",\n- \"amzn/amazon-pay-module\": \"3.1.2\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.3\",\n+ \"amzn/login-with-amazon-module\": \"3.1.3\",\n+ \"amzn/amazon-pay-module\": \"3.1.3\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.2\",\n+ \"version\": \"3.1.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.2\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.3\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.2\",\n+ \"version\": \"3.1.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.3\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.2\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.3\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.2\",\n+ \"version\": \"3.1.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.2\",\n- \"amzn/login-with-amazon-module\": \"^3.1.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.3\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.3\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.2\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.3\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/Method/AmazonLoginMethod.php", "new_path": "src/Payment/Model/Method/AmazonLoginMethod.php", "diff": "@@ -50,4 +50,19 @@ class AmazonLoginMethod extends \\Magento\\Payment\\Model\\Method\\AbstractMethod\n* @var bool\n*/\nprotected $_isOffline = true;\n+\n+ /**\n+ * Is active\n+ *\n+ * @param int|null $storeId\n+ * @return bool\n+ */\n+ public function isActive($storeId = null)\n+ {\n+ return (bool)(int)$this->_scopeConfig->getValue(\n+ 'payment/amazon_pay/active',\n+ \\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE,\n+ $storeId\n+ ) && (bool)(int)$this->getConfigData('active', $storeId);\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.3\",\n+ \"version\": \"3.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.3'\n+version = u'3.1.4'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.3'\n+release = u'3.1.4'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.3`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.4`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.4` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.3\",\n+ \"version\": \"3.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.3\",\n- \"amzn/login-with-amazon-module\": \"3.1.3\",\n- \"amzn/amazon-pay-module\": \"3.1.3\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.4\",\n+ \"amzn/login-with-amazon-module\": \"3.1.4\",\n+ \"amzn/amazon-pay-module\": \"3.1.4\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.3\",\n+ \"version\": \"3.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.3\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.4\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.3\",\n+ \"version\": \"3.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.4\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.3\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.4\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.3\",\n+ \"version\": \"3.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.3\",\n- \"amzn/login-with-amazon-module\": \"^3.1.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.4\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.4\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.3\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.4\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressDecoratorDe.php", "new_path": "src/Core/Domain/AmazonAddressDecoratorDe.php", "diff": "@@ -178,6 +178,6 @@ class AmazonAddressDecoratorDe implements AmazonAddressInterface\n*/\npublic function getLine($lineNumber)\n{\n- $this->amazonAddress->getLine($lineNumber);\n+ return $this->amazonAddress->getLine($lineNumber);\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.4\",\n+ \"version\": \"3.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.4'\n+version = u'3.1.5'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.4'\n+release = u'3.1.5'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.4`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.5`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.4` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.5` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.4\",\n+ \"version\": \"3.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.4\",\n- \"amzn/login-with-amazon-module\": \"3.1.4\",\n- \"amzn/amazon-pay-module\": \"3.1.4\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.5\",\n+ \"amzn/login-with-amazon-module\": \"3.1.5\",\n+ \"amzn/amazon-pay-module\": \"3.1.5\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.4\",\n+ \"version\": \"3.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.4\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.5\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.4\",\n+ \"version\": \"3.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.5\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.4\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.5\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.4\",\n+ \"version\": \"3.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.4\",\n- \"amzn/login-with-amazon-module\": \"^3.1.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.5\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.5\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.4\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.5\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Exception/AmazonServiceUnavailableException.php", "new_path": "src/Core/Exception/AmazonServiceUnavailableException.php", "diff": "*/\nnamespace Amazon\\Core\\Exception;\n-use Magento\\Framework\\Exception\\RemoteServiceUnavailableException;\n+use Magento\\Framework\\Exception\\LocalizedException;\n-class AmazonServiceUnavailableException extends RemoteServiceUnavailableException\n+class AmazonServiceUnavailableException extends LocalizedException\n{\nconst ERROR_MESSAGE = 'Amazon could not process your request.';\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/Block/CheckoutErrorMessage.php", "diff": "+<?php\n+namespace Amazon\\Payment\\Block;\n+use Magento\\Framework\\View\\Element\\Template;\n+use \\Magento\\Checkout\\Model\\Session as CheckoutSession;\n+use \\Magento\\Framework\\View\\Element\\Template\\Context;\n+\n+class CheckoutErrorMessage extends Template\n+{\n+ public function __construct(\n+ Context $context,\n+ CheckoutSession $checkoutSession\n+ ) {\n+ parent::__construct($context);\n+ $this->checkoutSession = $checkoutSession;\n+ }\n+ protected function _prepareLayout()\n+ {\n+ }\n+\n+ public function getError() {\n+ return $this->checkoutSession->getQuote()->getError();\n+ }\n+\n+ public function getCheckoutUrl() {\n+ return $this->getUrl('checkout');\n+ }\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "diff": "+<?php\n+/**\n+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\").\n+ * You may not use this file except in compliance with the License.\n+ * A copy of the License is located at\n+ *\n+ * http://aws.amazon.com/apache2.0\n+ *\n+ * or in the \"license\" file accompanying this file. This file is distributed\n+ * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n+ * express or implied. See the License for the specific language governing\n+ * permissions and limitations under the License.\n+ */\n+namespace Amazon\\Payment\\Controller\\Payment;\n+\n+use Amazon\\Core\\Model\\AmazonConfig;\n+use Amazon\\Core\\Exception\\AmazonWebapiException;\n+use Magento\\Framework\\App\\Action\\Action;\n+use Magento\\Framework\\App\\Action\\Context;\n+use Magento\\Quote\\Api\\CartManagementInterface;\n+use Magento\\Quote\\Api\\GuestCartManagementInterface;\n+use Magento\\Checkout\\Model\\Session as CheckoutSession;\n+use Magento\\Customer\\Model\\Session;\n+use Magento\\Framework\\View\\Result\\PageFactory;\n+\n+/**\n+ * Class CompleteCheckout\n+ *\n+ * @package Amazon\\Payment\\Controller\\Payment\n+ */\n+class CompleteCheckout extends Action\n+{\n+\n+ /**\n+ * @var AmazonConfig\n+ */\n+ private $amazonConfig;\n+\n+ /**\n+ * @var CheckoutSession\n+ */\n+ private $checkoutSession;\n+\n+ /**\n+ * @var CartManagementInterface\n+ */\n+ private $cartManagement;\n+\n+ /**\n+ * @var PageFactory\n+ */\n+ private $pageFactory;\n+\n+ /**\n+ * CompleteCheckout constructor.\n+ *\n+ * @param Context $context\n+ * @param AmazonConfig $amazonConfig\n+ * @param CartManagementInterface $cartManagement\n+ * @param GuestCartManagementInterface $guestCartManagement\n+ * @param CheckoutSession $checkoutSession\n+ * @param Session $session\n+ * @param PageFactory $pageFactory\n+ */\n+ public function __construct(\n+ Context $context,\n+ AmazonConfig $amazonConfig,\n+ CartManagementInterface $cartManagement,\n+ GuestCartManagementInterface $guestCartManagement,\n+ CheckoutSession $checkoutSession,\n+ Session $session,\n+ PageFactory $pageFactory\n+ ) {\n+ parent::__construct($context);\n+ $this->amazonConfig = $amazonConfig;\n+ $this->cartManagement = $cartManagement;\n+ $this->checkoutSession = $checkoutSession;\n+ $this->session = $session;\n+ $this->pageFactory = $pageFactory;\n+ }\n+\n+ /*\n+ * @inheritdoc\n+ */\n+ public function execute()\n+ {\n+ $authenticationStatus = $this->getRequest()->getParam('AuthenticationStatus');\n+ switch ($authenticationStatus) {\n+ case 'Success':\n+ try {\n+ if (!$this->session->isLoggedIn()) {\n+ $this->checkoutSession->getQuote()->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);\n+ }\n+ $this->cartManagement->placeOrder($this->checkoutSession->getQuoteId());\n+ return $this->_redirect('checkout/onepage/success');\n+ } catch (AmazonWebapiException $e) {\n+ $this->checkoutSession->getQuote()->setError($e->getMessage());\n+ }\n+ break;\n+ case 'Failure':\n+ $this->checkoutSession->getQuote()->setError(\n+ 'Amazon Pay was unable to authenticate the payment instrument. '\n+ . 'Please try again, or use a different payment method.'\n+ );\n+ break;\n+ case 'Abandoned':\n+ default:\n+ $this->checkoutSession->getQuote()->setError(\n+ 'The SCA challenge was not completed successfully. '\n+ . 'Please try again, or use a different payment method.'\n+ );\n+ }\n+ return $this->pageFactory->create();\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Command/AmazonAuthCommand.php", "new_path": "src/Payment/Gateway/Command/AmazonAuthCommand.php", "diff": "@@ -183,10 +183,6 @@ class AmazonAuthCommand implements CommandInterface\n}\n}\n- if ($isDecline) {\n- $messages[] = __(\"You will be redirected to the cart shortly.\");\n- }\n-\nif ($isTimeout) {\nreturn true;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "new_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "diff": "@@ -25,6 +25,7 @@ use Amazon\\Payment\\Gateway\\Helper\\SubjectReader;\nuse Amazon\\Core\\Helper\\Data;\nuse Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterfaceFactory;\nuse Amazon\\Payment\\Api\\Data\\PendingCaptureInterfaceFactory;\n+use Magento\\Framework\\UrlInterface;\n/**\n* Class AmazonPaymentAdapter\n@@ -80,6 +81,11 @@ class AmazonPaymentAdapter\n*/\nprivate $pendingAuthorizationFactory;\n+ /**\n+ * @var UrlInterface\n+ */\n+ private $urlBuilder;\n+\n/**\n* AmazonPaymentAdapter constructor.\n* @param ClientFactoryInterface $clientFactory\n@@ -91,6 +97,7 @@ class AmazonPaymentAdapter\n* @param SubjectReader $subjectReader\n* @param Data $coreHelper\n* @param Logger $logger\n+ * @param UrlInterface $urlBuilder\n*/\npublic function __construct(\nClientFactoryInterface $clientFactory,\n@@ -101,7 +108,8 @@ class AmazonPaymentAdapter\nPendingAuthorizationInterfaceFactory $pendingAuthorizationFactory,\nSubjectReader $subjectReader,\nData $coreHelper,\n- Logger $logger\n+ Logger $logger,\n+ UrlInterface $urlBuilder\n) {\n$this->clientFactory = $clientFactory;\n$this->amazonSetOrderDetailsResponseFactory = $amazonSetOrderDetailsResponseFactory;\n@@ -112,6 +120,7 @@ class AmazonPaymentAdapter\n$this->coreHelper = $coreHelper;\n$this->pendingCaptureFactory = $pendingCaptureFactory;\n$this->pendingAuthorizationFactory = $pendingAuthorizationFactory;\n+ $this->urlBuilder = $urlBuilder;\n}\n/**\n@@ -152,13 +161,15 @@ class AmazonPaymentAdapter\n* @param $amazonOrderReferenceId\n* @return array\n*/\n- private function confirmOrderReference($storeId, $amazonOrderReferenceId)\n+ public function confirmOrderReference($storeId, $amazonOrderReferenceId)\n{\n$response = [];\n$response = $this->clientFactory->create($storeId)->confirmOrderReference(\n[\n- 'amazon_order_reference_id' => $amazonOrderReferenceId\n+ 'amazon_order_reference_id' => $amazonOrderReferenceId,\n+ 'success_url' => $this->urlBuilder->getUrl('amazonpayments/payment/completecheckout'),\n+ 'failure_url' => $this->urlBuilder->getUrl('amazonpayments/payment/completecheckout')\n]\n);\n@@ -229,15 +240,6 @@ class AmazonPaymentAdapter\n$response['constraints'] = [];\n$response['amazon_order_reference_id'] = $data['amazon_order_reference_id'];\n- if (!$attempts) {\n- $detailResponse = $this->setOrderReferenceDetails($storeId, $data);\n-\n- if (isset($detailResponse['constraints']) && !empty($detailResponse['constraints'])) {\n- $response['constraints'] = $detailResponse['constraints'];\n- return $response;\n- }\n- }\n-\n$confirmResponse = $this->confirmOrderReference($storeId, $data['amazon_order_reference_id']);\nif ($confirmResponse->response['Status'] == 200) {\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/OrderInformationManagement.php", "new_path": "src/Payment/Model/OrderInformationManagement.php", "diff": "@@ -32,6 +32,7 @@ use Magento\\Quote\\Model\\Quote;\nuse Magento\\Store\\Model\\ScopeInterface;\nuse AmazonPay\\ResponseInterface;\nuse Psr\\Log\\LoggerInterface;\n+use Magento\\Framework\\UrlInterface;\n/**\n* @SuppressWarnings(PHPMD.CouplingBetweenObjects)\n@@ -97,7 +98,8 @@ class OrderInformationManagement implements OrderInformationManagementInterface\nAmazonSetOrderDetailsResponseFactory $amazonSetOrderDetailsResponseFactory,\nQuoteLinkInterfaceFactory $quoteLinkFactory,\nLoggerInterface $logger,\n- ProductMetadata $productMetadata\n+ ProductMetadata $productMetadata,\n+ UrlInterface $urlBuilder\n) {\n$this->session = $session;\n$this->clientFactory = $clientFactory;\n@@ -107,6 +109,7 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n$this->quoteLinkFactory = $quoteLinkFactory;\n$this->logger = $logger;\n$this->productMetadata = $productMetadata;\n+ $this->urlBuilder = $urlBuilder;\n}\n/**\n@@ -188,7 +191,9 @@ class OrderInformationManagement implements OrderInformationManagementInterface\ntry {\n$response = $this->clientFactory->create($storeId)->confirmOrderReference(\n[\n- 'amazon_order_reference_id' => $amazonOrderReferenceId\n+ 'amazon_order_reference_id' => $amazonOrderReferenceId,\n+ 'success_url' => $this->urlBuilder->getUrl('amazonpayments/payment/completecheckout'),\n+ 'failure_url' => $this->urlBuilder->getUrl('amazonpayments/payment/completecheckout')\n]\n);\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/Plugin/ConfirmOrderReference.php", "diff": "+<?php\n+\n+namespace Amazon\\Payment\\Plugin;\n+\n+use Magento\\Checkout\\Model\\Session;\n+use Magento\\Checkout\\Api\\PaymentInformationManagementInterface;\n+use Magento\\Quote\\Api\\PaymentMethodManagementInterface;\n+use Amazon\\Payment\\Model\\Adapter\\AmazonPaymentAdapter;\n+use Amazon\\Payment\\Model\\OrderInformationManagement;\n+use Magento\\Quote\\Api\\Data\\PaymentInterface;\n+use Magento\\Quote\\Api\\Data\\AddressInterface;\n+use Magento\\Framework\\Exception\\LocalizedException;\n+use Amazon\\Payment\\Gateway\\Config\\Config as GatewayConfig;\n+\n+\n+/**\n+ * Class ConfirmOrderReference\n+ *\n+ * Confirm the OrderReference when payment details are saved\n+ */\n+class ConfirmOrderReference\n+{\n+ /**\n+ * @var Session\n+ */\n+ private $checkoutSession;\n+\n+ /**\n+ * @var AmazonPaymentAdapter\n+ */\n+ private $adapter;\n+\n+ /**\n+ * @var OrderInformationManagement\n+ */\n+ private $orderInformationManagement;\n+\n+ /**\n+ * ConfirmOrderReference constructor.\n+ * @param Session $checkoutSession\n+ * @param AmazonPaymentAdapter $adapter\n+ * @param OrderInformationManagement $orderInformationManagement\n+ */\n+ public function __construct(\n+ Session $checkoutSession,\n+ AmazonPaymentAdapter $adapter,\n+ OrderInformationManagement $orderInformationManagement\n+ ) {\n+ $this->checkoutSession = $checkoutSession;\n+ $this->adapter = $adapter;\n+ $this->orderInformationManagement = $orderInformationManagement;\n+ }\n+\n+ /**\n+ * @param PaymentMethodManagementInterface $subject\n+ * @param $result\n+ * @param $cartId\n+ * @param PaymentInterface $paymentMethod\n+ * @param AddressInterface|null $billingAddress\n+ * @return mixed\n+ * @throws \\Magento\\Framework\\Exception\\LocalizedException\n+ */\n+ public function afterSet(\n+ PaymentMethodManagementInterface $subject,\n+ $result,\n+ $cartId,\n+ PaymentInterface $paymentMethod\n+ ) {\n+ if($paymentMethod->getMethod() == GatewayConfig::CODE) {\n+ $quote = $this->checkoutSession->getQuote();\n+ $amazonOrderReferenceId = $quote\n+ ->getExtensionAttributes()\n+ ->getAmazonOrderReferenceId()\n+ ->getAmazonOrderReferenceId();\n+\n+ $this->orderInformationManagement->saveOrderInformation($amazonOrderReferenceId);\n+ $this->orderInformationManagement->confirmOrderReference(\n+ $amazonOrderReferenceId,\n+ $quote->getStoreId()\n+ );\n+ }\n+\n+ return $result;\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<type name=\"Amazon\\Payment\\Model\\Method\\AmazonLoginMethod\">\n<plugin name=\"disable_amazon_payment_method\" type=\"Amazon\\Payment\\Plugin\\DisableAmazonPaymentMethod\" sortOrder=\"10\" disabled=\"false\"/>\n</type>\n+ <type name=\"Magento\\Quote\\Model\\PaymentMethodManagement\">\n+ <plugin name=\"confirm_order_reference_on_payment_details_save\" type=\"Amazon\\Payment\\Plugin\\ConfirmOrderReference\" sortOrder=\"10\" disabled=\"false\"/>\n+ </type>\n<type name=\"Amazon\\Payment\\Cron\\ProcessAmazonRefunds\">\n<arguments>\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/view/frontend/layout/amazon_payments_payment_completecheckout.xml", "diff": "+<?xml version=\"1.0\"?>\n+<page xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" layout=\"1column\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:View/Layout/etc/page_configuration.xsd\">\n+ <referenceBlock name=\"content\">\n+ <block\n+ template=\"checkout-error.phtml\"\n+ class=\"Amazon\\Payment\\Block\\CheckoutErrorMessage\"\n+ name=\"amazonpayments_payment_completecheckout_error\"\n+ cacheable=\"false\"\n+ />\n+ </referenceBlock>\n+</page>\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/view/frontend/templates/checkout-error.phtml", "diff": "+<h1><?=__('An error has occurred.')?></h1>\n+<p>\n+ <?=__($block->getError())?><br/>\n+ <a href=\"<?=$block->getCheckoutUrl()?>\"><?=__('Click here to return to checkout.')?></a>\n+</p>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/action/place-order.js", "new_path": "src/Payment/view/frontend/web/js/action/place-order.js", "diff": "@@ -22,9 +22,10 @@ define(\n'Magento_Checkout/js/model/error-processor',\n'Magento_Customer/js/model/customer',\n'Magento_Checkout/js/model/full-screen-loader',\n- 'Amazon_Payment/js/model/storage'\n+ 'Amazon_Payment/js/model/storage',\n+ 'Amazon_Payment/js/model/amazonPaymentConfig'\n],\n- function (quote, urlBuilder, storage, url, errorProcessor, customer, fullScreenLoader, amazonStorage) {\n+ function (quote, urlBuilder, storage, url, errorProcessor, customer, fullScreenLoader, amazonStorage, amazonPaymentConfig) {\n'use strict';\nreturn function (paymentData, redirectOnSuccess) {\n@@ -34,7 +35,7 @@ define(\n/** Checkout for guest and registered customer. */\nif (!customer.isLoggedIn()) {\n- serviceUrl = urlBuilder.createUrl('/guest-carts/:quoteId/payment-information', {\n+ serviceUrl = urlBuilder.createUrl('/guest-carts/:quoteId/set-payment-information', {\nquoteId: quote.getQuoteId()\n});\npayload = {\n@@ -44,7 +45,7 @@ define(\nbillingAddress: quote.billingAddress()\n};\n} else {\n- serviceUrl = urlBuilder.createUrl('/carts/mine/payment-information', {});\n+ serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});\npayload = {\ncartId: quote.getQuoteId(),\npaymentMethod: paymentData,\n@@ -53,14 +54,39 @@ define(\n}\nfullScreenLoader.startLoader();\n-\n+ if(['de', 'uk'].indexOf(amazonPaymentConfig.getValue('region')) !== -1) {\n+ console.log('SCA enabled for region: ' + amazonPaymentConfig.getValue('region'));\n+ return OffAmazonPayments.initConfirmationFlow(amazonPaymentConfig.getValue('merchantId'), amazonStorage.getOrderReference(), function(confirmationFlow) {\n+ return storage.post(\n+ serviceUrl,\n+ JSON.stringify(payload)\n+ ).done(\n+ function () {\n+ confirmationFlow.success();\n+ }\n+ ).fail(\n+ function (response) {\n+ confirmationFlow.error();\n+ errorProcessor.process(response);\n+ amazonStorage.amazonDeclineCode(response.responseJSON.code);\n+ fullScreenLoader.stopLoader(true);\n+ if (response.responseJSON.code === 4273) {\n+ setTimeout(function () {\n+ window.location.replace(url.build('checkout/cart/'));\n+ }, 5000);\n+ }\n+ }\n+ );\n+ });\n+ } else {\n+ console.log('SCA disabled for region: ' + amazonPaymentConfig.getValue('region'));\nreturn storage.post(\nserviceUrl,\nJSON.stringify(payload)\n).done(\nfunction () {\nif(redirectOnSuccess) {\n- window.location.replace(url.build('checkout/onepage/success/'));\n+ window.location.replace(url.build('amazonpayments/payment/completecheckout/?AuthenticationStatus=Success'));\n}\n}\n).fail(\n@@ -73,10 +99,10 @@ define(\nclearInterval(intervalId);\nwindow.location.replace(url.build('checkout/cart/'));\n}, 5000);\n-\n}\n}\n);\n+ }\n};\n}\n);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/Method/AmazonLoginMethod.php", "new_path": "src/Payment/Model/Method/AmazonLoginMethod.php", "diff": "@@ -60,7 +60,7 @@ class AmazonLoginMethod extends \\Magento\\Payment\\Model\\Method\\AbstractMethod\npublic function isActive($storeId = null)\n{\nreturn (bool)(int)$this->_scopeConfig->getValue(\n- 'payment/amazon_pay/active',\n+ AmazonCoreHelper::AMAZON_ACTIVE,\n\\Magento\\Store\\Model\\ScopeInterface::SCOPE_STORE,\n$storeId\n) && (bool)(int)$this->getConfigData('active', $storeId);\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.5\",\n+ \"version\": \"3.1.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.5'\n+version = u'3.1.6'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.5'\n+release = u'3.1.6'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.5`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.6`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.5` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.6` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.5\",\n+ \"version\": \"3.1.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.5\",\n- \"amzn/login-with-amazon-module\": \"3.1.5\",\n- \"amzn/amazon-pay-module\": \"3.1.5\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.6\",\n+ \"amzn/login-with-amazon-module\": \"3.1.6\",\n+ \"amzn/amazon-pay-module\": \"3.1.6\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.5\",\n+ \"version\": \"3.1.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.5\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.6\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.5\",\n+ \"version\": \"3.1.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.6\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.5\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.6\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.5\",\n+ \"version\": \"3.1.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.5\",\n- \"amzn/login-with-amazon-module\": \"^3.1.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.6\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.6\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.5\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.6\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.6\",\n+ \"version\": \"3.1.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.6'\n+version = u'3.1.7'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.6'\n+release = u'3.1.7'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.6`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.7`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.6` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.7` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.6\",\n+ \"version\": \"3.1.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.6\",\n- \"amzn/login-with-amazon-module\": \"3.1.6\",\n- \"amzn/amazon-pay-module\": \"3.1.6\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.7\",\n+ \"amzn/login-with-amazon-module\": \"3.1.7\",\n+ \"amzn/amazon-pay-module\": \"3.1.7\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.6\",\n+ \"version\": \"3.1.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.6\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.1.7\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.6\",\n+ \"version\": \"3.1.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n\"magento/module-eav\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.6\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.1.7\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.6\",\n+ \"version\": \"3.1.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.6\",\n- \"amzn/login-with-amazon-module\": \"^3.1.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n+ \"amzn/login-with-amazon-module\": \"^3.1.7\",\n\"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.6\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.1.7\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "new_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "diff": "@@ -26,6 +26,7 @@ use Amazon\\Core\\Helper\\Data;\nuse Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterfaceFactory;\nuse Amazon\\Payment\\Api\\Data\\PendingCaptureInterfaceFactory;\nuse Magento\\Framework\\UrlInterface;\n+use Magento\\Framework\\App\\ObjectManager;\n/**\n* Class AmazonPaymentAdapter\n@@ -109,7 +110,7 @@ class AmazonPaymentAdapter\nSubjectReader $subjectReader,\nData $coreHelper,\nLogger $logger,\n- UrlInterface $urlBuilder\n+ UrlInterface $urlBuilder = null\n) {\n$this->clientFactory = $clientFactory;\n$this->amazonSetOrderDetailsResponseFactory = $amazonSetOrderDetailsResponseFactory;\n@@ -120,7 +121,7 @@ class AmazonPaymentAdapter\n$this->coreHelper = $coreHelper;\n$this->pendingCaptureFactory = $pendingCaptureFactory;\n$this->pendingAuthorizationFactory = $pendingAuthorizationFactory;\n- $this->urlBuilder = $urlBuilder;\n+ $this->urlBuilder = $urlBuilder ?: ObjectManager::getInstance()->get(UrlInterface::class);\n}\n/**\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Block/CheckoutErrorMessage.php", "new_path": "src/Payment/Block/CheckoutErrorMessage.php", "diff": "@@ -18,7 +18,11 @@ class CheckoutErrorMessage extends Template\n}\npublic function getError() {\n- return $this->checkoutSession->getQuote()->getError();\n+ $errorString = '';\n+ foreach($this->checkoutSession->getQuote()->getErrors() as $error) {\n+ $errorString .= $error->getText() . \"\\n\";\n+ }\n+ return $errorString;\n}\npublic function getCheckoutUrl() {\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "new_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "diff": "@@ -96,18 +96,18 @@ class CompleteCheckout extends Action\n$this->cartManagement->placeOrder($this->checkoutSession->getQuoteId());\nreturn $this->_redirect('checkout/onepage/success');\n} catch (AmazonWebapiException $e) {\n- $this->checkoutSession->getQuote()->setError($e->getMessage());\n+ $this->checkoutSession->getQuote()->addMessage($e->getMessage());\n}\nbreak;\ncase 'Failure':\n- $this->checkoutSession->getQuote()->setError(\n+ $this->checkoutSession->getQuote()->addMessage(\n'Amazon Pay was unable to authenticate the payment instrument. '\n. 'Please try again, or use a different payment method.'\n);\nbreak;\ncase 'Abandoned':\ndefault:\n- $this->checkoutSession->getQuote()->setError(\n+ $this->checkoutSession->getQuote()->addMessage(\n'The SCA challenge was not completed successfully. '\n. 'Please try again, or use a different payment method.'\n);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "new_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "diff": "@@ -100,17 +100,17 @@ class CompleteCheckout extends Action\n}\nbreak;\ncase 'Failure':\n- $this->checkoutSession->getQuote()->addMessage(\n+ $this->checkoutSession->getQuote()->addMessage(__(\n'Amazon Pay was unable to authenticate the payment instrument. '\n. 'Please try again, or use a different payment method.'\n- );\n+ ));\nbreak;\ncase 'Abandoned':\ndefault:\n- $this->checkoutSession->getQuote()->addMessage(\n+ $this->checkoutSession->getQuote()->addMessage(__(\n'The SCA challenge was not completed successfully. '\n. 'Please try again, or use a different payment method.'\n- );\n+ ));\n}\nreturn $this->pageFactory->create();\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "},\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"magento/framework\": \"*\",\n- \"magento/module-sales\": \"*\",\n- \"magento/module-checkout\": \"*\",\n- \"magento/module-payment\": \"*\",\n- \"magento/module-eav\": \"*\",\n+ \"magento/framework\": \"^102\",\n+ \"magento/module-sales\": \"^102\",\n+ \"magento/module-checkout\": \"^100.3\",\n+ \"magento/module-payment\": \"^100.3\",\n+ \"magento/module-eav\": \"^102\",\n\"magento/module-developer\": \"*\",\n- \"magento/module-config\": \"*\",\n- \"magento/module-backend\": \"*\",\n- \"magento/module-quote\": \"*\",\n- \"magento/module-customer\": \"*\",\n- \"magento/module-store\": \"*\",\n+ \"magento/module-config\": \"^101.1\",\n+ \"magento/module-backend\": \"^101\",\n+ \"magento/module-quote\": \"^101.1\",\n+ \"magento/module-customer\": \"^102\",\n+ \"magento/module-store\": \"^101\",\n\"amzn/amazon-pay-sdk-php\": \"^3.2.0\"\n},\n\"repositories\": [\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"magento/framework\": \"*\",\n- \"magento/module-sales\": \"*\",\n- \"magento/module-config\": \"*\",\n- \"magento/module-store\": \"*\",\n+ \"magento/framework\": \"^102\",\n+ \"magento/module-sales\": \"^102\",\n+ \"magento/module-config\": \"101.1\",\n+ \"magento/module-store\": \"^101\",\n\"magento/module-developer\": \"*\",\n- \"magento/module-quote\": \"*\",\n- \"magento/module-catalog\": \"*\",\n- \"magento/module-customer\": \"*\",\n- \"magento/module-checkout\": \"*\",\n+ \"magento/module-quote\": \"^101.1\",\n+ \"magento/module-catalog\": \"^103\",\n+ \"magento/module-customer\": \"^102\",\n+ \"magento/module-checkout\": \"^100.3\",\n\"magento/module-backend\": \"*\",\n- \"magento/module-payment\": \"*\",\n+ \"magento/module-payment\": \"^100.3\",\n\"magento/module-paypal\": \"*\",\n+ \"magento/module-eav\": \"^102\",\n\"amzn/amazon-pay-sdk-php\": \"^3.2.0\"\n},\n\"autoload\": {\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n- \"magento/module-customer\": \"*\",\n- \"magento/module-store\": \"*\",\n- \"magento/module-eav\": \"*\",\n- \"magento/module-checkout\": \"*\",\n+ \"magento/framework\": \"^102\",\n+ \"magento/module-customer\": \"^102\",\n+ \"magento/module-store\": \"^101\",\n+ \"magento/module-eav\": \"^102\",\n+ \"magento/module-checkout\": \"^100.3\",\n\"magento/module-checkout-agreements\": \"*\"\n},\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n\"amzn/login-with-amazon-module\": \"^3.1.7\",\n- \"magento/module-customer\": \"*\",\n- \"magento/module-eav\": \"*\",\n- \"magento/module-sales\": \"*\",\n- \"magento/module-quote\": \"*\",\n- \"magento/module-payment\": \"*\",\n- \"magento/module-backend\": \"*\",\n- \"magento/module-store\": \"*\",\n- \"magento/module-checkout\": \"*\",\n- \"magento/module-catalog\": \"*\",\n+ \"magento/framework\": \"^102\",\n+ \"magento/module-customer\": \"^102\",\n+ \"magento/module-eav\": \"^102\",\n+ \"magento/module-sales\": \"^102\",\n+ \"magento/module-quote\": \"^101.1\",\n+ \"magento/module-payment\": \"^100.3\",\n+ \"magento/module-backend\": \"^101\",\n+ \"magento/module-store\": \"^101\",\n+ \"magento/module-checkout\": \"^100.3\",\n+ \"magento/module-catalog\": \"^103\",\n\"magento/module-paypal\": \"*\",\n- \"magento/module-directory\": \"*\"\n+ \"magento/module-directory\": \"^100.3\"\n},\n\"suggest\": {\n\"magento/module-customer\": \"*\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.7\",\n+ \"version\": \"3.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.1.7'\n+version = u'3.2.0'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.1.7'\n+release = u'3.2.0'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.7`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.0`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.1.7` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.0` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.1.7\",\n+ \"version\": \"3.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.1.7\",\n- \"amzn/login-with-amazon-module\": \"3.1.7\",\n- \"amzn/amazon-pay-module\": \"3.1.7\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.0\",\n+ \"amzn/login-with-amazon-module\": \"3.2.0\",\n+ \"amzn/amazon-pay-module\": \"3.2.0\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.7\",\n+ \"version\": \"3.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.1.7\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.0\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.7\",\n+ \"version\": \"3.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.0\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.1.7\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.0\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.1.7\",\n+ \"version\": \"3.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.1.7\",\n- \"amzn/login-with-amazon-module\": \"^3.1.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.0\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.0\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.1.7\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/layout/amazon_payments_payment_completecheckout.xml", "new_path": "src/Payment/view/frontend/layout/amazon_payments_payment_completecheckout.xml", "diff": "<?xml version=\"1.0\"?>\n+<!--\n+/**\n+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\").\n+ * You may not use this file except in compliance with the License.\n+ * A copy of the License is located at\n+ *\n+ * http://aws.amazon.com/apache2.0\n+ *\n+ * or in the \"license\" file accompanying this file. This file is distributed\n+ * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n+ * express or implied. See the License for the specific language governing\n+ * permissions and limitations under the License.\n+ */\n+-->\n<page xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" layout=\"1column\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:View/Layout/etc/page_configuration.xsd\">\n<referenceBlock name=\"content\">\n<block\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/checkout-error.phtml", "new_path": "src/Payment/view/frontend/templates/checkout-error.phtml", "diff": "+<?php\n+/**\n+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\").\n+ * You may not use this file except in compliance with the License.\n+ * A copy of the License is located at\n+ *\n+ * http://aws.amazon.com/apache2.0\n+ *\n+ * or in the \"license\" file accompanying this file. This file is distributed\n+ * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n+ * express or implied. See the License for the specific language governing\n+ * permissions and limitations under the License.\n+ */\n+?>\n<h1><?=__('An error has occurred.')?></h1>\n<p>\n<?=__($block->getError())?><br/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutDeclineTest.xml", "new_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutDeclineTest.xml", "diff": "<!--Transaction declined error message-->\n<waitForText userInput=\"Transaction has been declined\" selector=\"{{AdminMessagesSection.errorMessage}}\" stepKey=\"waitForText\"/>\n</test>\n+ <test name=\"AmazonCheckoutSCAAbandoned\" extends=\"AmazonCheckoutAddProduct\">\n+ <annotations>\n+ <features value=\"Amazon Pay\"/>\n+ <stories value=\"(SCA) Amazon SCA Abandoned\"/>\n+ <title value=\"(SCA) Amazon SCA Abandoned\"/>\n+ <description value=\"Perform checkout from cart page and ensure SCA Abandoned page.\"/>\n+ <severity value=\"CRITICAL\"/>\n+ <group value=\"amazon_sca\"/>\n+ </annotations>\n+ <!--Go to Cart-->\n+ <actionGroup ref=\"StorefrontOpenCartFromMinicartActionGroup\" stepKey=\"cartOpenCart\" />\n+\n+ <waitForAjaxLoad stepKey=\"waitForAjaxLoad\"/>\n+\n+ <!--Login (popup)-->\n+ <click selector=\"{{AmazonCheckoutSection.cartPayButton}}\" stepKey=\"clickAmazonCartButton\"/>\n+ <actionGroup ref=\"AmazonLoginPopupActionGroup\" stepKey=\"AmazonLoginPopupActionGroup\" />\n+\n+ <!--Begin checkout-->\n+ <actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n+ <!--Place order with SCA Abandoned CC-->\n+ <actionGroup ref=\"AmazonCheckoutCcActionGroup\" stepKey=\"AmazonCheckoutCcActionGroupBad\">\n+ <argument name=\"cc\" value=\"4440\" />\n+ </actionGroup>\n+ <!--Transaction declined error message-->\n+ <waitForText userInput=\"The SCA challenge was not completed successfully.\" selector=\"#checkoutError\" stepKey=\"waitForText\"/>\n+ </test>\n+ <test name=\"AmazonCheckoutSCAFailure\" extends=\"AmazonCheckoutAddProduct\">\n+ <annotations>\n+ <features value=\"Amazon Pay\"/>\n+ <stories value=\"(SCA) Amazon SCA Failed\"/>\n+ <title value=\"(SCA) Amazon SCA Failed\"/>\n+ <description value=\"Perform checkout from cart page and ensure SCA Failure page.\"/>\n+ <severity value=\"CRITICAL\"/>\n+ <group value=\"amazon_sca\"/>\n+ </annotations>\n+ <!--Go to Cart-->\n+ <actionGroup ref=\"StorefrontOpenCartFromMinicartActionGroup\" stepKey=\"cartOpenCart\" />\n+\n+ <waitForAjaxLoad stepKey=\"waitForAjaxLoad\"/>\n+\n+ <!--Login (popup)-->\n+ <click selector=\"{{AmazonCheckoutSection.cartPayButton}}\" stepKey=\"clickAmazonCartButton\"/>\n+ <actionGroup ref=\"AmazonLoginPopupActionGroup\" stepKey=\"AmazonLoginPopupActionGroup\" />\n+\n+ <!--Begin checkout-->\n+ <actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n+ <!--Place order with SCA Failure CC-->\n+ <actionGroup ref=\"AmazonCheckoutCcActionGroup\" stepKey=\"AmazonCheckoutCcActionGroupBad\">\n+ <argument name=\"cc\" value=\"8320\" />\n+ </actionGroup>\n+ <!--Transaction declined error message-->\n+ <waitForText userInput=\"Amazon Pay was unable to authenticate the payment instrument.\" selector=\"#checkoutError\" stepKey=\"waitForText\"/>\n+ </test>\n</tests>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutSuccessTest.xml", "new_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutSuccessTest.xml", "diff": "<click selector=\"{{AmazonCheckoutSection.loginButton}}\" stepKey=\"clickAmazonCartButton\"/>\n<actionGroup ref=\"AmazonLoginPopupActionGroup\" stepKey=\"AmazonLoginPopupActionGroup\" />\n+ <!--Place order-->\n+ <actionGroup ref=\"AmazonCheckoutSubmitActionGroup\" stepKey=\"AmazonCheckoutSubmitActionGroup\" />\n+ </test>\n+ <test name=\"AmazonCheckoutSCASuccess\" extends=\"AmazonCheckoutAddProduct\">\n+ <annotations>\n+ <features value=\"Amazon Pay\"/>\n+ <stories value=\"(SCA) Success page elements are presented for placed order with Amazon Pay\"/>\n+ <title value=\"(SCA) Amazon Pay Checkout from Cart\"/>\n+ <description value=\"Perform checkout from cart page and ensure Success page.\"/>\n+ <severity value=\"CRITICAL\"/>\n+ <group value=\"amazon_sca\"/>\n+ </annotations>\n+\n+ <!--Go to Cart-->\n+ <actionGroup ref=\"StorefrontOpenCartFromMinicartActionGroup\" stepKey=\"cartOpenCart\" />\n+\n+ <waitForAjaxLoad stepKey=\"waitForAjaxLoad\"/>\n+\n+ <!--Login (popup)-->\n+ <click selector=\"{{AmazonCheckoutSection.cartPayButton}}\" stepKey=\"clickAmazonCartButton\"/>\n+ <actionGroup ref=\"AmazonLoginPopupActionGroup\" stepKey=\"AmazonLoginPopupActionGroup\" />\n+\n<!--Place order-->\n<actionGroup ref=\"AmazonCheckoutSubmitActionGroup\" stepKey=\"AmazonCheckoutSubmitActionGroup\" />\n</test>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/checkout-error.phtml", "new_path": "src/Payment/view/frontend/templates/checkout-error.phtml", "diff": "?>\n<h1><?=__('An error has occurred.')?></h1>\n<p>\n- <?=__($block->getError())?><br/>\n+ <span id=\"checkoutError\"><?=__($block->getError())?></span><br/>\n<a href=\"<?=$block->getCheckoutUrl()?>\"><?=__('Click here to return to checkout.')?></a>\n</p>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.1\",\n+ \"version\": \"3.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.1'\n+version = u'3.2.2'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.1'\n+release = u'3.2.2'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.1`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.2`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.1` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.1\",\n+ \"version\": \"3.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.1\",\n- \"amzn/login-with-amazon-module\": \"3.2.1\",\n- \"amzn/amazon-pay-module\": \"3.2.1\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.2\",\n+ \"amzn/login-with-amazon-module\": \"3.2.2\",\n+ \"amzn/amazon-pay-module\": \"3.2.2\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.1\",\n+ \"version\": \"3.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.1\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.2\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.1\",\n+ \"version\": \"3.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.2\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.1\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.2\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.1\",\n+ \"version\": \"3.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.1\",\n- \"amzn/login-with-amazon-module\": \"^3.2.1\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.2\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.2\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.1\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.2\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/overview.rst", "new_path": "docs/overview.rst", "diff": "Overview\n========\n+This extension provides an official integration of your Magento 2 store with **Amazon Pay and Login with Amazon** services. The extension is a checkout and payment solution that does not share any item level information (product information, prices, basket content, etc) with Amazon. The extension integrates Amazon Pay seamlessly into the Magento 2 shop backend (configuration, order management, billing, etc.).\n-This extension provides an official integration of your Magento 2 store with **Amazon Pay and Login with Amazon** services. They help your customers shop quickly, safely and securely. Your customers can pay on your website without re-entering their payment and address details. All Amazon Pay transactions are protected by Amazon's A-to-z Guarantee.\n+About Amazon Pay\n+----------------\n-The extension is a pure payment solution. No item level is communicated to Amazon Pay and it allows you to manage your orders directly from Magento 2.\n+Amazon Pay offers a familiar and convenient buying experience that can help your customers spend more time shopping and less time checking out. Amazon Pay is used by large and small companies. From years of shopping safely with Amazon, customers trust their personal information will remain secure and know many transactions are covered by the Amazon A-to-z Guarantee. Businesses have the reassurance of our advanced fraud protection and payment protection policy.\nExtension features\n------------------\n* `Amazon Pay` button in the shopping cart, on product pages and in the 1st step of checkout\n* `Login with Amazon` button on the customer login and registration page\n-* Customization of **Amazon Pay** widgets from within Magento admin\n+* `Amazon Pay` in the list of available payment methods during the final step of checkout\n+* Configuration of `Amazon Pay` extension from within Magento admin\n* Support for payment authorizations, captures and refunds (also partial refunds)\n* Support for synchronous and asynchronous authorization\n-* Supports Amazon Pay Instant Payment Notifications\n+* Supports `Amazon Pay` Instant Payment Notifications\n* Live & sandbox modes available\n* Options for simulating payment states in sandbox mode\nGetting the extension\n---------------------\n-The extension can be installed using the following methods:\n+The extension is available via composer, Magento Marketplace or, with Magento 2.2.4 and higher, already pre-installed as bundled extension.\n-* Preferred Method - From the Magento Marketplace using the Web Setup Wizard\n-* Manually using composer from the command line\n-\n-Refer to the :doc:`installation` section to get more details concerning installation procedure.\n+Please refer to the :doc:`installation` section to get more details concerning installation procedure.\n" } ]

[ { "change_type": "ADD", "old_path": "docs/images/configuration_amazon_pay.png", "new_path": "docs/images/configuration_amazon_pay.png", "diff": "Binary files /dev/null and b/docs/images/configuration_amazon_pay.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/configuration_amazon_pay_new-or-existing.png", "new_path": "docs/images/configuration_amazon_pay_new-or-existing.png", "diff": "Binary files /dev/null and b/docs/images/configuration_amazon_pay_new-or-existing.png differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/configuration.rst", "new_path": "docs/configuration.rst", "diff": "@@ -75,7 +75,7 @@ Authorization Mode\nIndependent of the mode you decide for, make sure to only orders which are successfully authorized by Amazon Pay (order state: `Processing`).\n-.. note:: If you expect high order values, the **Automatic** authorization mode might be the best chioce for your business.\n+.. note:: If you expect high order values, the **Automatic** authorization mode might be the best choice for your business.\nUpdate Mechanism\n................\n" }, { "change_type": "MODIFY", "old_path": "docs/images/amazon-pay-button.png", "new_path": "docs/images/amazon-pay-button.png", "diff": "Binary files a/docs/images/amazon-pay-button.png and b/docs/images/amazon-pay-button.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/seller-central/configuration_screenshot_1.png", "new_path": "docs/images/seller-central/configuration_screenshot_1.png", "diff": "Binary files /dev/null and b/docs/images/seller-central/configuration_screenshot_1.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/seller-central/testing_screenshot_1.png", "new_path": "docs/images/seller-central/testing_screenshot_1.png", "diff": "Binary files /dev/null and b/docs/images/seller-central/testing_screenshot_1.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/seller-central/testing_screenshot_2.png", "new_path": "docs/images/seller-central/testing_screenshot_2.png", "diff": "Binary files /dev/null and b/docs/images/seller-central/testing_screenshot_2.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/seller-central/testing_screenshot_3.png", "new_path": "docs/images/seller-central/testing_screenshot_3.png", "diff": "Binary files /dev/null and b/docs/images/seller-central/testing_screenshot_3.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/seller-central/testing_screenshot_4.png", "new_path": "docs/images/seller-central/testing_screenshot_4.png", "diff": "Binary files /dev/null and b/docs/images/seller-central/testing_screenshot_4.png differ\n" }, { "change_type": "MODIFY", "old_path": "docs/index.rst", "new_path": "docs/index.rst", "diff": "@@ -9,7 +9,6 @@ Amazon Pay and Login with Amazon extension for Magento 2\n:maxdepth: 3\noverview\n- prerequisites\ninstallation\nconfiguration\nlogin\n" }, { "change_type": "MODIFY", "old_path": "docs/login.rst", "new_path": "docs/login.rst", "diff": "@@ -6,7 +6,10 @@ Customers who have logged in via Login with Amazon previously, will be recognize\nRequirements\n------------\n-To offer the **Login with Amazon** service, you have to have a valid **Amazon Pay** merchant account (refer to the :ref:`prerequisites-amazon-account-setup` if you don't have one yet), registered application for **Login with Amazon** service (refer to the :ref:`prerequisites-registering-application-for-login-with-amazon` if you don't have one yet) and Magento 2 store with a valid SSL certificate installed and properly configured in your shop.\n+To offer the **Login with Amazon** service, you have to have a valid **Amazon Pay** merchant account (`sign up here`_ if you don't have one yet), and registered an \"Login with Amazon\" application (see `LWA Client ID guide`_ for the setup).\n+\n+.. _`sign up here`: https://pay.amazon.com/signup\n+.. _`LWA Client ID guide`: https://images-na.ssl-images-amazon.com/images/G/02/amazonservices/payments/website/AmazonPay_ClientID_UK._TTD_.pdf\n`Login with Amazon` button\n--------------------------\n" }, { "change_type": "MODIFY", "old_path": "docs/overview.rst", "new_path": "docs/overview.rst", "diff": "@@ -30,10 +30,12 @@ Prerequisites\n* cURL for PHP\n* DOM / XML for PHP\n* valid SSL certificate\n-* A verified Amazon Pay merchant account - [sign up here](https://pay.amazon.com/signup)!\n+* A verified Amazon Pay merchant account - `sign up here`_!\n+\n+.. _`sign up here`: https://pay.amazon.com/signup\nInstallation and Configuration\n----------------------\n+------------------------------\nThe extension is available via composer, Magento Marketplace or, with Magento 2.2.4 and higher, already pre-installed as bundled extension.\n@@ -44,9 +46,19 @@ Branch information\nThe following table provides an overview on which Git branch is compatible to which Magento 2 version.\n-| Magento Version | Github Branch |\n-| ------------- | ------------- |\n-| 2.1.0 - 2.2.3 | [1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/1.x) |\n-| 2.2.4 - 2.2.5 | [2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.x) |\n-| 2.2.6 - 2.2.x | [2.1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.1.x) |\n-| 2.3.0 and above | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) |\n\\ No newline at end of file\n++---------------------+-------------------+\n+| **Magento Version** | **Github Branch** |\n++---------------------+-------------------+\n+| 2.1.0 - 2.2.3 | `1.x`_ |\n++---------------------+-------------------+\n+| 2.2.4 - 2.2.5 | `2.x`_ |\n++---------------------+-------------------+\n+| 2.2.6 - 2.2.x | `2.1.x`_ |\n++---------------------+-------------------+\n+| 2.3.0 and above | `master`_ |\n++---------------------+-------------------+\n+\n+.. _`1.x`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/1.x\n+.. _`2.x`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.x\n+.. _`2.1.x`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.1.x\n+.. _`master`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/flow.rst", "new_path": "docs/flow.rst", "diff": "@@ -36,19 +36,19 @@ The actual order flow other than this remains the same, as it is for the standar\nPayment authorization\n---------------------\n-An authorization is automatically requested on order placement there are 3 authorization flows, Synchronous, Asynchronous and a combination of both as defined in :doc:`configuration`.\n+An authorization is automatically requested on order placement. There are two different authorization flows, Immediate and Automatic, as defined in :doc:`configuration`.\n-Synchronous\n-''''''''''''\n+Immediate\n+'''''''''\nThe customer will get instant feedback there are 3 possible outcomes\n1. `Authorization OK` - Order is placed with a state of `Processing`, Customer is redirected to the standard Magento 2 confirmation screen\n2. `Soft Decline` - Order is not placed and customer is asked to select an alternative payment instrument from the Amazon Pay widget\n3. `Hard Decline` - Order is not placed, the Amazon Pay specific checkout will be left (widgets are replaced by standard forms) and the customer is asked to select an alternative payment method for this order\n-Asynchronous\n-''''''''''''\n-Orders placed when in Asychronous mode should always complete as if authorization was OK however they will be in a `Pending` state with a `Payment Review` status.\n+Automatic\n+'''''''''\n+In this mode, the extension will try to authorize the order immediate (as described above). If this fails due to a timeout, it will fallback to an asynchronous authorization (returns `Pending` state with a `Payment Review` status).\nThe customer will always be redirected to the standard Magento 2 confirmation screen as authorization state will be processed by Amazon Pay after the order is placed.\n@@ -58,11 +58,6 @@ A status update on the state of the authorization will be delivered by IPN or Cr\n2. `Soft Decline` - Authorization is closed, customer is emailed with a link to select an alternative payment instrument on the Amazon Pay website. When the customer changes the payment instrument, a new authorization is raised\n3. `Hard Decline` - Authorization is closed, customer is emailed with instructions to contact the merchant\n-Synchronous if possible\n-'''''''''''''''''''''''\n-The customer will get instant feedback for all final states of the authorization like with the synchronous authorization while the customer benefits from the lower decline rate of the asynchronous authorization. In cases where a synchronous authorization would result in a decline but could be handled with the asynchronous workflow, the module automatically requests an asynchronous authorization and optimistically shows the customer the order confirmation page.\n-\n-\nPayment capture\n---------------\nOrders placed with `Charge on Order` mode enabled will automatically be captured. For orders placed using `Charge on Shipment` you will need to raise an invoice. To do this, the following steps are required:\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/index.rst", "new_path": "docs/index.rst", "diff": "@@ -17,3 +17,4 @@ Amazon Pay and Login with Amazon extension for Magento 2\ntesting\ntroubleshooting\nfaq\n+ m1_m2_migration\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutDeclineTest.xml", "new_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutDeclineTest.xml", "diff": "<description value=\"Test CC decline message and then success page elements for placed order with Amazon Pay\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_decline\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Begin checkout-->\n<actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n<description value=\"Test CC decline message and then success page elements for placed order with Amazon Pay\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_decline\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Begin checkout-->\n<actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n<description value=\"Test CC decline message, logout, and redirect to cart with Amazon Pay\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_decline\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Begin checkout-->\n<actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n<description value=\"Test CC timeout message with Amazon Pay\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_decline\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Begin checkout-->\n<actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n<description value=\"Test CC timeout message with Amazon Pay\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_decline\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Begin checkout-->\n<actionGroup ref=\"AmazonCheckoutBeginActionGroup\" stepKey=\"AmazonCheckoutBeginActionGroup\" />\n<description value=\"Perform checkout from cart page and ensure SCA Abandoned page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_sca\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Cart-->\n<actionGroup ref=\"StorefrontOpenCartFromMinicartActionGroup\" stepKey=\"cartOpenCart\" />\n<description value=\"Perform checkout from cart page and ensure SCA Failure page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_sca\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Cart-->\n<actionGroup ref=\"StorefrontOpenCartFromMinicartActionGroup\" stepKey=\"cartOpenCart\" />\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutSuccessTest.xml", "new_path": "src/Payment/Test/Mftf/Test/AmazonCheckoutSuccessTest.xml", "diff": "<description value=\"Creates and loads simple product and adds it to cart using Amazon Pay button on product detail page.\"/>\n<severity value=\"BLOCKER\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<before>\n<description value=\"Adds product to cart.\"/>\n<severity value=\"BLOCKER\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<before>\n<description value=\"Perform checkout from product details page and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Place order-->\n<description value=\"Perform checkout from cart page and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Cart-->\n<description value=\"Perform checkout from minicart and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Open minicart-->\n<description value=\"Perform checkout from checkout page and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Checkout-->\n<description value=\"Perform checkout after logging in from customer account page and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_checkout\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Customer page-->\n<description value=\"Perform checkout from cart page and ensure Success page.\"/>\n<severity value=\"CRITICAL\"/>\n<group value=\"amazon_sca\"/>\n+ <skip>\n+ <issueId>AmazonPayCredentialSupport</issueId>\n+ </skip>\n</annotations>\n<!--Go to Cart-->\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.2\",\n+ \"version\": \"3.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.2'\n+version = u'3.2.3'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.2'\n+release = u'3.2.3'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.2`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.3`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.2` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.2\",\n+ \"version\": \"3.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.2\",\n- \"amzn/login-with-amazon-module\": \"3.2.2\",\n- \"amzn/amazon-pay-module\": \"3.2.2\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.3\",\n+ \"amzn/login-with-amazon-module\": \"3.2.3\",\n+ \"amzn/amazon-pay-module\": \"3.2.3\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.2\",\n+ \"version\": \"3.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.2\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.3\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.2\",\n+ \"version\": \"3.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.3\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.2\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.3\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.2\",\n+ \"version\": \"3.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.2\",\n- \"amzn/login-with-amazon-module\": \"^3.2.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.3\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.3\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.2\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.3\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/view/adminhtml/templates/system/config/simplepath_admin.phtml", "new_path": "src/Core/view/adminhtml/templates/system/config/simplepath_admin.phtml", "diff": "-->\n<br/>\n<div data-mage-init='{\n- \"Amazon_Core/js/simplepath\": <?php echo /* @noEscape */ $block->getJsonConfig() ?> }'\n+ \"Amazon_Core/js/simplepath\": <?php echo $block->escapeHtml($block->getJsonConfig()) ?> }'\nid=\"amazon_simplepath\">\n<?php if (!$block->getCurrency()) : // SimplePath not supported ?>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.3\",\n+ \"version\": \"3.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.3'\n+version = u'3.2.4'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.3'\n+release = u'3.2.4'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.3`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.4`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.3` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.4` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.3\",\n+ \"version\": \"3.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.3\",\n- \"amzn/login-with-amazon-module\": \"3.2.3\",\n- \"amzn/amazon-pay-module\": \"3.2.3\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.4\",\n+ \"amzn/login-with-amazon-module\": \"3.2.4\",\n+ \"amzn/amazon-pay-module\": \"3.2.4\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.3\",\n+ \"version\": \"3.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.3\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.4\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.3\",\n+ \"version\": \"3.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.4\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.3\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.4\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.3\",\n+ \"version\": \"3.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.3\",\n- \"amzn/login-with-amazon-module\": \"^3.2.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.4\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.4\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.3\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.4\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "new_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "diff": "@@ -41,8 +41,7 @@ define(\n) {\n'use strict';\n- var context,\n- countryData = customerData.get('directory-data');\n+ var countryData = customerData.get('directory-data');\nreturn Component.extend({\ndefaults: {\n@@ -63,7 +62,6 @@ define(\n* Inits\n*/\ninitialize: function () {\n- context = this;\nthis._super();\n},\n@@ -71,10 +69,10 @@ define(\n* Init payment widget\n*/\ninitPaymentWidget: function () {\n- var $amazonPayment = $(context.apInputDOMId);\n+ var $amazonPayment = $(this.apInputDOMId);\n- context.initDefaultValues();\n- context.renderPaymentWidget();\n+ this.initDefaultValues();\n+ this.renderPaymentWidget();\n$amazonPayment.trigger('click'); //activate Amazon Pay method on render\n$amazonPayment.trigger('rendered');\n},\n@@ -84,11 +82,11 @@ define(\n*/\ninitDefaultValues: function () {\nregistry.get('amazonPayment', function (amazonPayment) {\n- context.widgetScope = amazonPayment.loginScope;\n- context.sellerId = amazonPayment.merchantId;\n- context.presentmentCurrency = amazonPayment.presentmentCurrency;\n- context.useMultiCurrency = amazonPayment.useMultiCurrency;\n- });\n+ this.widgetScope = amazonPayment.loginScope;\n+ this.sellerId = amazonPayment.merchantId;\n+ this.presentmentCurrency = amazonPayment.presentmentCurrency;\n+ this.useMultiCurrency = amazonPayment.useMultiCurrency;\n+ }.bind(this));\n},\n/**\n@@ -96,8 +94,8 @@ define(\n*/\nrenderPaymentWidget: function () {\nvar widget = new OffAmazonPayments.Widgets.Wallet({ // eslint-disable-line no-undef\n- sellerId: context.sellerId,\n- scope: context.widgetScope,\n+ sellerId: this.sellerId,\n+ scope: this.widgetScope,\namazonOrderReferenceId: amazonStorage.getOrderReference(),\n/**\n@@ -105,8 +103,8 @@ define(\n*/\nonPaymentSelect: function () { // orderReference\namazonStorage.isPlaceOrderDisabled(true);\n- context.setBillingAddressFromAmazon();\n- },\n+ this.setBillingAddressFromAmazon();\n+ }.bind(this),\ndesign: {\ndesignMode: 'responsive'\n},\n@@ -118,14 +116,14 @@ define(\nerrorProcessor.process(error);\n}\n});\n- if (context.useMultiCurrency) {\n- widget.setPresentmentCurrency(context.presentmentCurrency);\n- $(context.presentmentDOMId).hide();\n+ if (this.useMultiCurrency) {\n+ widget.setPresentmentCurrency(this.presentmentCurrency);\n+ $(this.presentmentDOMId).hide();\n}\nelse {\n- $(context.presentmentDOMId).show();\n+ $(this.presentmentDOMId).show();\n}\n- widget.bind(context.paymentWidgetDOMId);\n+ widget.bind(this.paymentWidgetDOMId);\n},\n/**\n@@ -183,10 +181,10 @@ define(\namazonStorage.isPlaceOrderDisabled(false);\nif (window.checkoutConfig.amazonLogin.amazon_customer_email) {\n- var customerField = $(context.customerEmail).val();\n+ var customerField = $(this.customerEmail).val();\nif (!customerField) {\n- $(context.customerEmail).val(window.checkoutConfig.amazonLogin.amazon_customer_email);\n+ $(this.customerEmail).val(window.checkoutConfig.amazonLogin.amazon_customer_email);\n}\n}\n}\n@@ -228,8 +226,8 @@ define(\nplaceOrder = placeOrderAction(this.getData(), this.redirectAfterPlaceOrder);\n$.when(placeOrder).fail(function () {\n- context.isPlaceOrderActionAllowed(true);\n- }).done(this.afterPlaceOrder.bind(this));\n+ this.isPlaceOrderActionAllowed(true);\n+ }.bind(this)).done(this.afterPlaceOrder.bind(this));\nreturn true;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressFactory.php", "new_path": "src/Core/Domain/AmazonAddressFactory.php", "diff": "@@ -23,10 +23,6 @@ use Magento\\Framework\\Escaper;\nclass AmazonAddressFactory\n{\n- /**\n- * @var Escaper\n- */\n- private $escaper;\n/**\n* @var ObjectManagerInterface\n@@ -48,7 +44,6 @@ class AmazonAddressFactory\n*\n* @param ObjectManagerInterface $objectManager\n* @param AmazonNameFactory $amazonNameFactory\n- * @param Escaper $escaper\n* @param array $addressDecoratorPool Per-country custom decorators of incoming address data.\n* The key as an \"ISO 3166-1 alpha-2\" country code and\n* the value as an FQCN of a child of AmazonAddress.\n@@ -56,12 +51,10 @@ class AmazonAddressFactory\npublic function __construct(\nObjectManagerInterface $objectManager,\nAmazonNameFactory $amazonNameFactory,\n- Escaper $escaper,\narray $addressDecoratorPool = []\n) {\n$this->objectManager = $objectManager;\n$this->amazonNameFactory = $amazonNameFactory;\n- $this->escaper = $escaper;\n$this->addressDecoratorPool = $addressDecoratorPool;\n}\n@@ -76,22 +69,22 @@ class AmazonAddressFactory\n$address = $responseData['address'];\n$amazonName = $this->amazonNameFactory->create(\n[\n- 'name' => $this->escaper->escapeHtml($address['Name']),\n- 'country' => $this->escaper->escapeHtml($address['CountryCode'])]\n+ 'name' => $address['Name'],\n+ 'country' => $address['CountryCode']]\n);\n$data = [\n- AmazonAddressInterface::POSTAL_CODE => isset($address['PostalCode']) ? $this->escaper->escapeHtml($address['PostalCode']) : '',\n- AmazonAddressInterface::COUNTRY_CODE => $this->escaper->escapeHtml($address['CountryCode']),\n- AmazonAddressInterface::TELEPHONE => isset($address['Phone']) ? $this->escaper->escapeHtml($address['Phone']) : '',\n- AmazonAddressInterface::STATE_OR_REGION => isset($address['StateOrRegion']) ? $this->escaper->escapeHtml($address['StateOrRegion']) : '',\n- AmazonAddressInterface::FIRST_NAME => $this->escaper->escapeHtml($amazonName->getFirstName()),\n- AmazonAddressInterface::LAST_NAME => $this->escaper->escapeHtml($amazonName->getLastName()),\n+ AmazonAddressInterface::POSTAL_CODE => isset($address['PostalCode']) ? $address['PostalCode'] : '',\n+ AmazonAddressInterface::COUNTRY_CODE => $address['CountryCode'],\n+ AmazonAddressInterface::TELEPHONE => isset($address['Phone']) ? $address['Phone'] : '',\n+ AmazonAddressInterface::STATE_OR_REGION => isset($address['StateOrRegion']) ? $address['StateOrRegion'] : '',\n+ AmazonAddressInterface::FIRST_NAME => $amazonName->getFirstName(),\n+ AmazonAddressInterface::LAST_NAME => $amazonName->getLastName(),\nAmazonAddressInterface::LINES => $this->getLines($address)\n];\nif (isset($address['City'])) {\n- $data[AmazonAddressInterface::CITY] = $this->escaper->escapeHtml($address['City']);\n+ $data[AmazonAddressInterface::CITY] = $address['City'];\n}\n$amazonAddress = $this->objectManager->create(AmazonAddress::class, ['data' => $data]);\n@@ -131,7 +124,7 @@ class AmazonAddressFactory\n$lines = [];\nfor ($i = 1; $i <= 3; $i++) {\nif (isset($responseData['AddressLine' . $i]) && $responseData['AddressLine' . $i]) {\n- $lines[$i] = $this->escaper->escapeHtml($responseData['AddressLine' . $i]);\n+ $lines[$i] = $responseData['AddressLine' . $i];\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Plugin/ShippingInformationManagement.php", "new_path": "src/Payment/Plugin/ShippingInformationManagement.php", "diff": "@@ -92,6 +92,16 @@ class ShippingInformationManagement\n);\n}\n+ /*\n+ * Magento\\Quote\\Model\\Quote::setShippingAddress merges into the existing shipping address,\n+ * rather than replacing it. Because not all addresses have a region_id, make sure that\n+ * the region_id is explicitly emptied, to prevent the old one being used.\n+ */\n+ $shippingAddress = $shippingInformation->getShippingAddress();\n+ if(!$shippingAddress->hasData('region_id')) {\n+ $shippingAddress->setRegionId(\"\");\n+ }\n+\nreturn $return;\n}\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Plugin/ShippingInformationManagement.php", "new_path": "src/Payment/Plugin/ShippingInformationManagement.php", "diff": "@@ -80,7 +80,9 @@ class ShippingInformationManagement\nreturn $return;\n}\n- $amazonOrderReferenceId = $quote->getExtensionAttributes()->getAmazonOrderReferenceId();\n+ $amazonOrderReferenceId = $quote->getExtensionAttributes()\n+ ->getAmazonOrderReferenceId()\n+ ->getAmazonOrderReferenceId();\nif ($amazonOrderReferenceId) {\n$this->orderInformationManagement->saveOrderInformation(\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.4\",\n+ \"version\": \"3.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.4'\n+version = u'3.2.6'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.4'\n+release = u'3.2.6'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.4`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.6`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.4` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.6` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.4\",\n+ \"version\": \"3.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.4\",\n- \"amzn/login-with-amazon-module\": \"3.2.4\",\n- \"amzn/amazon-pay-module\": \"3.2.4\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.6\",\n+ \"amzn/login-with-amazon-module\": \"3.2.6\",\n+ \"amzn/amazon-pay-module\": \"3.2.6\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.4\",\n+ \"version\": \"3.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.4\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.6\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.4\",\n+ \"version\": \"3.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.6\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.4\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.6\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.4\",\n+ \"version\": \"3.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.4\",\n- \"amzn/login-with-amazon-module\": \"^3.2.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.6\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.6\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.4\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.6\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.6\",\n+ \"version\": \"3.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.6'\n+version = u'3.2.7'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.6'\n+release = u'3.2.7'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.6`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.7`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.6` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.7` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.6\",\n+ \"version\": \"3.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.6\",\n- \"amzn/login-with-amazon-module\": \"3.2.6\",\n- \"amzn/amazon-pay-module\": \"3.2.6\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.7\",\n+ \"amzn/login-with-amazon-module\": \"3.2.7\",\n+ \"amzn/amazon-pay-module\": \"3.2.7\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.6\",\n+ \"version\": \"3.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.6\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.7\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.6\",\n+ \"version\": \"3.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.7\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.6\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.7\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.6\",\n+ \"version\": \"3.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.6\",\n- \"amzn/login-with-amazon-module\": \"^3.2.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.7\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.7\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.6\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.7\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"magento/framework\": \"^102\",\n- \"magento/module-sales\": \"^102\",\n- \"magento/module-config\": \"101.1\",\n- \"magento/module-store\": \"^101\",\n+ \"magento/framework\": \"*\",\n+ \"magento/module-sales\": \"*\",\n+ \"magento/module-config\": \"*\",\n+ \"magento/module-store\": \"*\",\n\"magento/module-developer\": \"*\",\n- \"magento/module-quote\": \"^101.1\",\n- \"magento/module-catalog\": \"^103\",\n- \"magento/module-customer\": \"^102\",\n- \"magento/module-checkout\": \"^100.3\",\n+ \"magento/module-quote\": \"*\",\n+ \"magento/module-catalog\": \"*\",\n+ \"magento/module-customer\": \"*\",\n+ \"magento/module-checkout\": \"*\",\n\"magento/module-backend\": \"*\",\n- \"magento/module-payment\": \"^100.3\",\n+ \"magento/module-payment\": \"*\",\n\"magento/module-paypal\": \"*\",\n- \"magento/module-eav\": \"^102\",\n+ \"magento/module-eav\": \"*\",\n\"amzn/amazon-pay-sdk-php\": \"^3.2.0\"\n},\n\"autoload\": {\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.7\",\n+ \"version\": \"3.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.7'\n+version = u'3.2.8'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.7'\n+release = u'3.2.8'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "@@ -20,12 +20,12 @@ In case you are not able or willing to use the web installation, you can install\n* Sign in to your server via SSH\n* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.7`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.8`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.7` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.8` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\nIn production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.7\",\n+ \"version\": \"3.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.7\",\n- \"amzn/login-with-amazon-module\": \"3.2.7\",\n- \"amzn/amazon-pay-module\": \"3.2.7\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.8\",\n+ \"amzn/login-with-amazon-module\": \"3.2.8\",\n+ \"amzn/amazon-pay-module\": \"3.2.8\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.7\",\n+ \"version\": \"3.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.7\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.8\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.7\",\n+ \"version\": \"3.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.8\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.7\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.8\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.7\",\n+ \"version\": \"3.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.7\",\n- \"amzn/login-with-amazon-module\": \"^3.2.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.8\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.8\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.7\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.8\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/templates/oAuthRedirect.phtml", "new_path": "src/Login/view/frontend/templates/oAuthRedirect.phtml", "diff": "*/\n?>\n<?php /** @var $block \\Amazon\\Login\\Block\\OAuthRedirect */ ?>\n-<div><?= $block->escapeHtml(__('You will be redirected shortly...')); ?></div>\n+<div>\n+ <?= $block->escapeHtml(__('You will be redirected shortly...')); ?><br/>\n+ <?= $block->escapeHtml(__(\n+ 'If you are not redirected automatically, try refreshing the page,'\n+ . ' or return to your cart and use another payment method.'\n+ )); ?>\n+</div>\n<script>\nrequire([\n'jquery',\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "new_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "diff": "@@ -44,7 +44,7 @@ define([\n// we don't have the customer's consent or invalid request\nthis.redirectOnRequestWithError();\nthis.setAuthStateCookies();\n- amazonCore.amazonDefined.subscribe(function () {\n+ let onAmazonDefined = function () {\n//only set this on the redirect page\namazon.Login.setUseCookie(true); //eslint-disable-line no-undef\namazonCore.verifyAmazonLoggedIn().then(function (loggedIn) {\n@@ -62,7 +62,12 @@ define([\n}]\n});\n});\n- }, this);\n+ };\n+ if (amazonCore.amazonDefined()) {\n+ onAmazonDefined();\n+ } else {\n+ amazonCore.amazonDefined.subscribe(onAmazonDefined, this);\n+ }\n},\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/shipping-address/inline-form.js", "new_path": "src/Payment/view/frontend/web/js/view/shipping-address/inline-form.js", "diff": "@@ -16,29 +16,25 @@ define([\n*/\ninitObservable: function () {\nthis._super();\n- amazonStorage.isAmazonAccountLoggedIn.subscribe(function (value) {\n- var elem = document.getElementById(this.formSelector);\n-\n- if (elem && value === false) {\n- document.getElementById(this.formSelector).style.display = 'block';\n- }\n- }, this);\n-\n+ amazonStorage.isAmazonAccountLoggedIn.subscribe(this.hideInlineForm, this);\nreturn this;\n},\n/**\n- * Show/hide inline form\n+ * Show/hide inline form depending on Amazon login status\n*/\nmanipulateInlineForm: function () {\n- var elem;\n+ this.hideInlineForm(amazonStorage.isAmazonAccountLoggedIn());\n+ },\n- if (amazonStorage.isAmazonAccountLoggedIn()) {\n- elem = document.getElementById(this.formSelector);\n+ /**\n+ * Show/hide inline form\n+ */\n+ hideInlineForm: function(hide) {\n+ let elem = document.getElementById(this.formSelector);\nif (elem) {\n- document.getElementById(this.formSelector).style.display = 'none';\n- }\n+ document.getElementById(this.formSelector).style.display = hide ? 'none' : 'block';\n}\n}\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "new_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "diff": "@@ -44,7 +44,7 @@ define([\n// we don't have the customer's consent or invalid request\nthis.redirectOnRequestWithError();\nthis.setAuthStateCookies();\n- let onAmazonDefined = function () {\n+ var onAmazonDefined = function () {\n//only set this on the redirect page\namazon.Login.setUseCookie(true); //eslint-disable-line no-undef\namazonCore.verifyAmazonLoggedIn().then(function (loggedIn) {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/shipping-address/inline-form.js", "new_path": "src/Payment/view/frontend/web/js/view/shipping-address/inline-form.js", "diff": "@@ -31,7 +31,7 @@ define([\n* Show/hide inline form\n*/\nhideInlineForm: function(hide) {\n- let elem = document.getElementById(this.formSelector);\n+ var elem = document.getElementById(this.formSelector);\nif (elem) {\ndocument.getElementById(this.formSelector).style.display = hide ? 'none' : 'block';\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/faq.rst", "new_path": "docs/faq.rst", "diff": "@@ -26,4 +26,14 @@ Amazon Pay Widgets are not surfaced\n-----------------------------------\nPlease check if you are using a theme, which is not based on Magento's Luma or Blank theme first and follow the advice above.\n-If this is not the case and you need help, please file an issue with us.\n+If the widgets are still not surfaced correctly, please double check if the required div containers are available in the DOM tree of the website. For this, please go to the checkout and search for the container \"amazon-widget-container\" as shown below.\n+\n+.. image:: /images/amazon-widget-container.png\n+\n+As you can see, the container exists in this case and also contains the div container for the address book widget (\"addressBookWidgetDiv\").\n+\n+If these containers exist, but the widget is not visible, it is most likely because the required CSS style has not been included correctly. Like shown in the screenshot below, the height of the inspected container is 0 here, so there was no height associated with this container or any of its children. If you manually assign a height using the browser debug console, the widget will be shown correctly as shown below. If this is the case, please carefully check why the required CSS styles haven't been included. For more information on CSS styles and LESS files, please refer to Cascading style sheets (CSS) documentation of Magento 2.\n+\n+.. image:: /images/amazon-widget-container-2.png\n+\n+.. _`Cascading style sheets (CSS) documentation`: https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/css-topics/css-overview.html\n" }, { "change_type": "ADD", "old_path": "docs/images/amazon-widget-container-2.png", "new_path": "docs/images/amazon-widget-container-2.png", "diff": "Binary files /dev/null and b/docs/images/amazon-widget-container-2.png differ\n" }, { "change_type": "ADD", "old_path": "docs/images/amazon-widget-container.png", "new_path": "docs/images/amazon-widget-container.png", "diff": "Binary files /dev/null and b/docs/images/amazon-widget-container.png differ\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -39,13 +39,13 @@ Please follow the instructions in the [User Guide](https://amzn.github.io/amazon\n## Branch information\n-The following table provides an overview on which Git branch is compatible to which Magento 2 version.\n-\n-| Magento Version | Github Branch |\n-| ------------- | ------------- |\n-| 2.1.0 - 2.2.3 | [1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/1.x) |\n-| 2.2.4 - 2.2.5 | [2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.x) |\n-| 2.2.6 - 2.2.x | [2.1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.1.x) |\n-| 2.3.0 and above | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) |\n+The following table provides an overview on which Git branch is compatible to which Magento 2 version. The last column \"Latest release\" refers to the latest version of our extension that is compatible to the Magento 2 version in the first column.\n+\n+| Magento Version | Github Branch | Latest release |\n+| ------------- | ------------- | ------------- |\n+| 2.1.0 - 2.2.3 | [1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/1.x) | 1.2.8 |\n+| 2.2.4 - 2.2.5 | [2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.x) | 2.0.16 |\n+| 2.2.6 - 2.2.x | [2.1.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.1.x) | 2.2.14 |\n+| 2.3.0 and above | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 3.2.9 |\n" }, { "change_type": "MODIFY", "old_path": "docs/installation.rst", "new_path": "docs/installation.rst", "diff": "Installation\n============\n+The extension is available via composer, Magento Marketplace or, with Magento 2.2.4 and higher, already pre-installed as bundled extension.\n+\n+.. note:: If you are using Magento 2.2.4 or higher, the extension is probably already pre-installed and you can head straight to :doc:`configuration`.\n+\nPre-installation steps\n----------------------\n* Create a backup of your shop before proceeding to install.\n-Web Setup Wizard / Magento Marketplace Install Method (Preferred)\n+Web Setup Wizard / Magento Marketplace Install Method\n-----------------------------------------------------------------\n-The installation via the Web Setup Wizard is the preferred method of installation.\n+The installation via the Web Setup Wizard is the recomennded method of installation for our extension when using Magento 2.1 - 2.2.3. For shops using Magento 2.2.4 or higher, the composer method outlined below is recommended.\nPlease follow the `Magento Marketplace User Guide`_ to learn how this works.\nOur extension can be found here: https://marketplace.magento.com/amzn-amazon-pay-and-login-magento-2-module.html\n@@ -16,21 +20,22 @@ Our extension can be found here: https://marketplace.magento.com/amzn-amazon-pay\nManual Composer Install Method\n------------------------------\n-In case you are not able or willing to use the web installation, you can install the extension using composer.\n+When using Magento 2.2.4, the extension is probably already pre-installed. If not, please follow this procedure to install the extension.\n+\n+.. note:: The composer require command below will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please replace the version behind the colon with the preferred version.\n-* Sign in to your server via SSH\n-* `cd` into you Magento installation directory\n-* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.9`\n+* Sign in to your server via SSH.\n+* `cd` into you Magento installation directory.\n+* Install the extension via composer. The right command is dependent on your Magento 2 version:\n+ * Magento 2.1 - 2.2.3: `composer require amzn/amazon-payments-magento-2-plugin:1.2.*`\n+ * Magento 2.2.4 - 2.2.5: `composer require amzn/amazon-payments-magento-2-plugin:2.0.*`\n+ * Magento 2.2.6 - 2.2.x: `composer require amzn/amazon-payments-magento-2-plugin:2.2.*`\n+ * Magento 2.3.0 and above: `composer require amzn/amazon-payments-magento-2-plugin:3.*`\n* Enable the extension: `php bin/magento module:enable Amazon_Core Amazon_Login Amazon_Payment`\n* Upgrade the Magento installation: `php bin/magento setup:upgrade`\n* Follow any advice the upgrade routine provides\n-\n-.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^3.2.9` will always install the most current, non-breaking, Amazon Pay extension for you, when you run an update. To fix it to a specifix version, please remove the `^`\n-\n-In production mode, you will also have to compile the code and the dependency injection (DI) configuration and deploy static content\n-\n-* Compile code and DI: `php bin/magento setup:di:compile`\n-* Deploy static view files: `php bin/magento setup:static-content:deploy xx_XX yy_YY` where xx_XX, yy_YY, ... are the locales you are aiming to support\n+* Compile code and dependency injection: `php bin/magento setup:di:compile`\n+* Deploy static view files (production mode only): `php bin/magento setup:static-content:deploy xx_XX yy_YY` where xx_XX, yy_YY, ... are the locales you are aiming to support\n* Check permissions on directories and files and set them correctly if needed\n.. note::\n" }, { "change_type": "MODIFY", "old_path": "docs/overview.rst", "new_path": "docs/overview.rst", "diff": "@@ -44,19 +44,19 @@ Please refer to the :doc:`installation` section to get more details concerning i\nBranch information\n------------------\n-The following table provides an overview on which Git branch is compatible to which Magento 2 version.\n+The following table provides an overview on which Git branch is compatible to which Magento 2 version. The last column \"Latest release\" refers to the latest version of our extension that is compatible to the Magento 2 version in the first column.\n-+---------------------+-------------------+\n-| **Magento Version** | **Github Branch** |\n-+---------------------+-------------------+\n-| 2.1.0 - 2.2.3 | `1.x`_ |\n-+---------------------+-------------------+\n-| 2.2.4 - 2.2.5 | `2.x`_ |\n-+---------------------+-------------------+\n-| 2.2.6 - 2.2.x | `2.1.x`_ |\n-+---------------------+-------------------+\n-| 2.3.0 and above | `master`_ |\n-+---------------------+-------------------+\n++---------------------+-------------------+--------------------+\n+| **Magento Version** | **Github Branch** | **Latest release** |\n++---------------------+-------------------+--------------------+\n+| 2.1.0 - 2.2.3 | `1.x`_ | 1.2.8 |\n++---------------------+-------------------+--------------------+\n+| 2.2.4 - 2.2.5 | `2.x`_ | 2.0.16 |\n++---------------------+-------------------+--------------------+\n+| 2.2.6 - 2.2.x | `2.1.x`_ | 2.2.14 |\n++---------------------+-------------------+--------------------+\n+| 2.3.0 and above | `master`_ | 3.2.9 |\n++---------------------+-------------------+--------------------+\n.. _`1.x`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/1.x\n.. _`2.x`: https://github.com/amzn/amazon-payments-magento-2-plugin/tree/2.x\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Controller/Adminhtml/Simplepath/Poll.php", "new_path": "src/Core/Controller/Adminhtml/Simplepath/Poll.php", "diff": "@@ -17,6 +17,8 @@ namespace Amazon\\Core\\Controller\\Adminhtml\\Simplepath;\nuse Magento\\Backend\\App\\Action\\Context;\nuse Magento\\Backend\\Controller\\Adminhtml\\System;\n+use Magento\\Framework\\App\\ObjectManager;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nclass Poll extends System\n{\n@@ -36,16 +38,23 @@ class Poll extends System\n*/\nprivate $jsonResultFactory;\n+ /**\n+ * @var \\Amazon\\Core\\Logger\\ExceptionLogger\n+ */\n+ private $exceptionLogger;\n+\npublic function __construct(\nContext $context,\n\\Amazon\\Core\\Model\\Config\\SimplePath $simplePath,\n\\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig,\n- \\Magento\\Framework\\Controller\\Result\\JsonFactory $jsonResultFactory\n+ \\Magento\\Framework\\Controller\\Result\\JsonFactory $jsonResultFactory,\n+ \\Amazon\\Core\\Logger\\ExceptionLogger $exceptionLogger = null\n) {\nparent::__construct($context);\n$this->simplePath = $simplePath;\n$this->scopeConfig = $scopeConfig;\n$this->jsonResultFactory = $jsonResultFactory;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n}\n/**\n@@ -53,6 +62,7 @@ class Poll extends System\n*/\npublic function execute()\n{\n+ try {\n// Keypair is destroyed when credentials are saved\n$shouldRefresh = !($this->scopeConfig->getValue(\n\\Amazon\\Core\\Model\\Config\\SimplePath::CONFIG_XML_PATH_PUBLIC_KEY,\n@@ -67,5 +77,9 @@ class Poll extends System\n$result = $this->jsonResultFactory->create();\n$result->setData((int)$shouldRefresh);\nreturn $result;\n+ } catch(\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Controller/Simplepath/Listener.php", "new_path": "src/Core/Controller/Simplepath/Listener.php", "diff": "namespace Amazon\\Core\\Controller\\Simplepath;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nuse Magento\\Framework\\App\\CsrfAwareActionInterface;\nuse Magento\\Framework\\App\\Request\\InvalidRequestException;\nuse Magento\\Framework\\App\\RequestInterface;\n+use Magento\\Framework\\App\\ObjectManager;\n/**\n* Class Listener\n@@ -33,22 +35,28 @@ class Listener extends \\Magento\\Framework\\App\\Action\\Action implements CsrfAware\n// @var \\Amazon\\Core\\Model\\Config\\SimplePath\nprivate $simplepath;\n+ // @var \\Amazon\\Core\\Logger\\ExceptionLogger\n+ private $exceptionLogger;\n+\n/**\n* Listener constructor.\n* @param \\Magento\\Framework\\App\\Action\\Context $context\n* @param \\Magento\\Framework\\Controller\\Result\\JsonFactory $jsonResultFactory\n* @param \\Amazon\\Core\\Model\\Config\\SimplePath $simplepath\n* @param \\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig\n+ * @param \\Amazon\\Core\\Logger\\ExceptionLogger $exceptionLogger\n*/\npublic function __construct(\n\\Magento\\Framework\\App\\Action\\Context $context,\n\\Magento\\Framework\\Controller\\Result\\JsonFactory $jsonResultFactory,\n\\Amazon\\Core\\Model\\Config\\SimplePath $simplepath,\n- \\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig\n+ \\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig,\n+ ExceptionLogger $exceptionLogger = null\n) {\n$this->simplepath = $simplepath;\n$this->jsonResultFactory = $jsonResultFactory;\n$this->scopeConfig = $scopeConfig;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\nparent::__construct($context);\n}\n@@ -57,6 +65,7 @@ class Listener extends \\Magento\\Framework\\App\\Action\\Action implements CsrfAware\n*/\npublic function execute()\n{\n+ try {\n$host = parse_url($this->getRequest()->getHeader('Origin'))['host'];\nif (in_array($host, $this->simplepath->getListenerOrigins())) {\n$this->getResponse()->setHeader('Access-Control-Allow-Origin', 'https://' . $host);\n@@ -65,7 +74,7 @@ class Listener extends \\Magento\\Framework\\App\\Action\\Action implements CsrfAware\n$this->getResponse()->setHeader('Access-Control-Allow-Headers', 'Content-Type, X-CSRF-Token');\n$this->getResponse()->setHeader('Vary', 'Origin');\n- $payload = $this->_request->getParam('payload');\n+ $payload = $this->_request->getContent();\n$result = $this->jsonResultFactory->create();\n@@ -94,6 +103,10 @@ class Listener extends \\Magento\\Framework\\App\\Action\\Action implements CsrfAware\n$result->setData($return);\nreturn $result;\n+ } catch(\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "new_path": "src/Payment/Controller/Payment/CompleteCheckout.php", "diff": "@@ -17,6 +17,7 @@ namespace Amazon\\Payment\\Controller\\Payment;\nuse Amazon\\Core\\Model\\AmazonConfig;\nuse Amazon\\Core\\Exception\\AmazonWebapiException;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nuse Magento\\Framework\\App\\Action\\Action;\nuse Magento\\Framework\\App\\Action\\Context;\nuse Magento\\Quote\\Api\\CartManagementInterface;\n@@ -24,7 +25,8 @@ use Magento\\Quote\\Api\\GuestCartManagementInterface;\nuse Magento\\Checkout\\Model\\Session as CheckoutSession;\nuse Magento\\Customer\\Model\\Session;\nuse Magento\\Framework\\View\\Result\\PageFactory;\n-use \\Magento\\Framework\\Message\\ManagerInterface as MessageManager;\n+use Magento\\Framework\\Message\\ManagerInterface as MessageManager;\n+use Magento\\Framework\\App\\ObjectManager;\n/**\n* Class CompleteCheckout\n@@ -54,6 +56,11 @@ class CompleteCheckout extends Action\n*/\nprivate $pageFactory;\n+ /**\n+ * @var ExceptionLogger\n+ */\n+ private $exceptionLogger;\n+\n/**\n* CompleteCheckout constructor.\n*\n@@ -64,6 +71,8 @@ class CompleteCheckout extends Action\n* @param CheckoutSession $checkoutSession\n* @param Session $session\n* @param PageFactory $pageFactory\n+ * @param MessageManager $messageManager\n+ * @param ExceptionLogger $exceptionLogger\n*/\npublic function __construct(\nContext $context,\n@@ -73,7 +82,8 @@ class CompleteCheckout extends Action\nCheckoutSession $checkoutSession,\nSession $session,\nPageFactory $pageFactory,\n- MessageManager $messageManager\n+ MessageManager $messageManager,\n+ ExceptionLogger $exceptionLogger = null\n) {\nparent::__construct($context);\n$this->amazonConfig = $amazonConfig;\n@@ -82,6 +92,7 @@ class CompleteCheckout extends Action\n$this->session = $session;\n$this->pageFactory = $pageFactory;\n$this->messageManager = $messageManager;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n}\n/*\n@@ -89,6 +100,7 @@ class CompleteCheckout extends Action\n*/\npublic function execute()\n{\n+ try {\n$authenticationStatus = $this->getRequest()->getParam('AuthenticationStatus');\nswitch ($authenticationStatus) {\ncase 'Success':\n@@ -99,6 +111,7 @@ class CompleteCheckout extends Action\n$this->cartManagement->placeOrder($this->checkoutSession->getQuoteId());\nreturn $this->_redirect('checkout/onepage/success');\n} catch (AmazonWebapiException $e) {\n+ $this->exceptionLogger->logException($e);\n$this->messageManager->addErrorMessage($e->getMessage());\n}\nbreak;\n@@ -116,5 +129,9 @@ class CompleteCheckout extends Action\n));\n}\nreturn $this->_redirect('checkout/cart');\n+ } catch(\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Controller/Payment/Ipn.php", "new_path": "src/Payment/Controller/Payment/Ipn.php", "diff": "*/\nnamespace Amazon\\Payment\\Controller\\Payment;\n+use Amazon\\Core\\Exception\\AmazonWebapiException;\nuse Amazon\\Core\\Helper\\Data;\nuse Amazon\\Core\\Model\\Config\\Source\\UpdateMechanism;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nuse Amazon\\Payment\\Api\\Ipn\\CompositeProcessorInterface;\nuse Amazon\\Payment\\Ipn\\IpnHandlerFactoryInterface;\nuse Magento\\Framework\\App\\Action\\Action;\n@@ -24,6 +26,7 @@ use Magento\\Framework\\App\\Action\\Context;\nuse Magento\\Framework\\App\\RequestInterface;\nuse Magento\\Framework\\App\\ResponseInterface;\nuse Magento\\Framework\\Exception\\NotFoundException;\n+use Magento\\Framework\\App\\ObjectManager;\nclass Ipn extends Action\n{\n@@ -42,20 +45,28 @@ class Ipn extends Action\n*/\nprivate $coreHelper;\n+ /**\n+ * @var ExceptionLogger\n+ */\n+ private $exceptionLogger;\n+\npublic function __construct(\nContext $context,\nIpnHandlerFactoryInterface $ipnHandlerFactory,\nCompositeProcessorInterface $compositeProcessor,\n- Data $coreHelper\n+ Data $coreHelper,\n+ ExceptionLogger $exceptionLogger = null\n) {\nparent::__construct($context);\n$this->ipnHandlerFactory = $ipnHandlerFactory;\n$this->compositeProcessor = $compositeProcessor;\n$this->coreHelper = $coreHelper;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n}\npublic function execute()\n{\n+ try {\nif (UpdateMechanism::IPN !== $this->coreHelper->getUpdateMechanism()) {\nthrow new NotFoundException(__('IPN not enabled.'));\n}\n@@ -66,5 +77,9 @@ class Ipn extends Action\n$ipnHandler = $this->ipnHandlerFactory->create($headers, $body);\n$ipnData = $ipnHandler->toArray();\n$this->compositeProcessor->process($ipnData);\n+ } catch (\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Command/AmazonAuthCommand.php", "new_path": "src/Payment/Gateway/Command/AmazonAuthCommand.php", "diff": "@@ -17,7 +17,9 @@ use Magento\\Payment\\Gateway\\Validator\\ValidatorInterface;\nuse Psr\\Log\\LoggerInterface;\nuse Magento\\Framework\\Exception\\LocalizedException;\nuse Magento\\Framework\\Event\\ManagerInterface;\n+use Magento\\Framework\\App\\ObjectManager;\nuse Amazon\\Core\\Exception\\AmazonWebapiException;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nuse Amazon\\Payment\\Gateway\\Config\\Config;\n/**\n@@ -68,6 +70,11 @@ class AmazonAuthCommand implements CommandInterface\n*/\nprivate $config;\n+ /**\n+ * @var ExceptionLogger\n+ */\n+ private $exceptionLogger;\n+\n/**\n* @param BuilderInterface $requestBuilder\n* @param TransferFactoryInterface $transferFactory\n@@ -77,6 +84,7 @@ class AmazonAuthCommand implements CommandInterface\n* @param ValidatorInterface $validator\n* @param ErrorMessageMapperInterface|null $errorMessageMapper\n* @param Config $config\n+ * @param ExceptionLogger $exceptionLogger;\n*/\npublic function __construct(\nBuilderInterface $requestBuilder,\n@@ -86,7 +94,8 @@ class AmazonAuthCommand implements CommandInterface\nHandlerInterface $handler = null,\nValidatorInterface $validator = null,\nErrorMessageMapperInterface $errorMessageMapper = null,\n- Config $config\n+ Config $config,\n+ ExceptionLogger $exceptionLogger = null\n) {\n$this->requestBuilder = $requestBuilder;\n$this->transferFactory = $transferFactory;\n@@ -96,6 +105,7 @@ class AmazonAuthCommand implements CommandInterface\n$this->logger = $logger;\n$this->errorMessageMapper = $errorMessageMapper;\n$this->config = $config;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n}\n/**\n@@ -109,6 +119,7 @@ class AmazonAuthCommand implements CommandInterface\n*/\npublic function execute(array $commandSubject)\n{\n+ try {\n$isTimeout = 0;\n$transferO = $this->transferFactory->create(\n@@ -143,6 +154,10 @@ class AmazonAuthCommand implements CommandInterface\n$response\n);\n}\n+ } catch(\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Command/CaptureStrategyCommand.php", "new_path": "src/Payment/Gateway/Command/CaptureStrategyCommand.php", "diff": "@@ -24,7 +24,9 @@ use Magento\\Sales\\Api\\TransactionRepositoryInterface;\nuse Magento\\Framework\\Api\\SearchCriteriaBuilder;\nuse Magento\\Framework\\Api\\FilterBuilder;\nuse Magento\\Sales\\Api\\Data\\TransactionInterface;\n+use Magento\\Framework\\App\\ObjectManager;\nuse Amazon\\Core\\Helper\\Data;\n+use Amazon\\Core\\Logger\\ExceptionLogger;\nuse Amazon\\Payment\\Gateway\\Data\\Order\\OrderAdapterFactory;\nclass CaptureStrategyCommand implements CommandInterface\n@@ -66,6 +68,11 @@ class CaptureStrategyCommand implements CommandInterface\n*/\nprivate $coreHelper;\n+ /**\n+ * @var ExceptionLogger\n+ */\n+ private $exceptionLogger;\n+\n/**\n* CaptureStrategyCommand constructor.\n*\n@@ -75,6 +82,7 @@ class CaptureStrategyCommand implements CommandInterface\n* @param FilterBuilder $filterBuilder\n* @param Data $coreHelper\n* @param OrderAdapterFactory $orderAdapterFactory\n+ * @param ExceptionLogger $exceptionLogger\n*/\npublic function __construct(\nCommandPoolInterface $commandPool,\n@@ -82,7 +90,8 @@ class CaptureStrategyCommand implements CommandInterface\nSearchCriteriaBuilder $searchCriteriaBuilder,\nFilterBuilder $filterBuilder,\nData $coreHelper,\n- OrderAdapterFactory $orderAdapterFactory\n+ OrderAdapterFactory $orderAdapterFactory,\n+ ExceptionLogger $exceptionLogger = null\n) {\n$this->commandPool = $commandPool;\n$this->transactionRepository = $transactionRepository;\n@@ -90,6 +99,7 @@ class CaptureStrategyCommand implements CommandInterface\n$this->filterBuilder = $filterBuilder;\n$this->coreHelper = $coreHelper;\n$this->orderAdapterFactory = $orderAdapterFactory;\n+ $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n}\n/**\n@@ -97,6 +107,8 @@ class CaptureStrategyCommand implements CommandInterface\n*/\npublic function execute(array $commandSubject)\n{\n+ try {\n+ throw new \\Exception('failed');\nif (isset($commandSubject['payment'])) {\n$paymentDO = $commandSubject['payment'];\n$paymentInfo = $paymentDO->getPayment();\n@@ -122,6 +134,10 @@ class CaptureStrategyCommand implements CommandInterface\n$this->commandPool->get($command)->execute($commandSubject);\n}\n}\n+ } catch(\\Exception $e) {\n+ $this->exceptionLogger->logException($e);\n+ throw $e;\n+ }\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<argument name=\"logger\" xsi:type=\"object\">Amazon\\Core\\Logger\\IpnLogger</argument>\n</arguments>\n</type>\n+ <type name=\"Amazon\\Core\\Logger\\ExceptionLogger\">\n+ <arguments>\n+ <argument name=\"logger\" xsi:type=\"object\">Amazon\\Core\\Logger\\Logger</argument>\n+ </arguments>\n+ </type>\n<type name=\"Magento\\Framework\\Webapi\\ErrorProcessor\">\n<plugin name=\"amazon_payment_webapi_error_processor\" type=\"Amazon\\Payment\\Plugin\\WebapiErrorProcessor\" sortOrder=\"1\"/>\n</type>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Block/Adminhtml/Form/Field/IpnUrl.php", "new_path": "src/Core/Block/Adminhtml/Form/Field/IpnUrl.php", "diff": "@@ -32,19 +32,14 @@ class IpnUrl extends BaseField\n{\n$stores = $this->_storeManager->getStores();\n$valueReturn = '';\n- $urlArray = [];\n- foreach ($stores as $store) {\n+ if ($store = reset($stores))\n+ {\n$baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_WEB, true);\nif ($baseUrl) {\n$value = $baseUrl . 'amazonpayments/payment/ipn/';\n- $urlArray[] = \"<div>\".$this->escapeHtml($value).\"</div>\";\n- }\n+ $valueReturn = \"<div>\".$this->escapeHtml($value).\"</div>\";\n}\n-\n- $urlArray = array_unique($urlArray);\n- foreach ($urlArray as $uniqueUrl) {\n- $valueReturn .= \"<div>\".$uniqueUrl.\"</div>\";\n}\nreturn '<td class=\"value\">' . $valueReturn . '</td>';\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "new_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "diff": "@@ -18,6 +18,7 @@ namespace Amazon\\Payment\\Model\\Adapter;\nuse Amazon\\Core\\Client\\ClientFactoryInterface;\nuse Amazon\\Payment\\Domain\\AmazonSetOrderDetailsResponseFactory;\n+use Amazon\\Payment\\Model\\OrderLinkFactory;\nuse Magento\\Payment\\Model\\Method\\Logger;\nuse Amazon\\Payment\\Domain\\AmazonAuthorizationResponseFactory;\nuse Amazon\\Payment\\Domain\\AmazonCaptureResponseFactory;\n@@ -26,6 +27,7 @@ use Amazon\\Core\\Helper\\Data;\nuse Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterfaceFactory;\nuse Amazon\\Payment\\Api\\Data\\PendingCaptureInterfaceFactory;\nuse Magento\\Framework\\UrlInterface;\n+use Magento\\Sales\\Model\\OrderRepository;\nuse Magento\\Framework\\App\\ObjectManager;\n/**\n@@ -87,6 +89,16 @@ class AmazonPaymentAdapter\n*/\nprivate $urlBuilder;\n+ /**\n+ * @var OrderLinkFactory\n+ */\n+ private $orderLinkFactory;\n+\n+ /**\n+ * @var OrderRepository\n+ */\n+ private $orderRepository;\n+\n/**\n* AmazonPaymentAdapter constructor.\n* @param ClientFactoryInterface $clientFactory\n@@ -99,6 +111,8 @@ class AmazonPaymentAdapter\n* @param Data $coreHelper\n* @param Logger $logger\n* @param UrlInterface $urlBuilder\n+ * @param OrderLinkFactory $orderLinkFactory\n+ * @param OrderRepository $orderRepository\n*/\npublic function __construct(\nClientFactoryInterface $clientFactory,\n@@ -110,7 +124,9 @@ class AmazonPaymentAdapter\nSubjectReader $subjectReader,\nData $coreHelper,\nLogger $logger,\n- UrlInterface $urlBuilder = null\n+ UrlInterface $urlBuilder = null,\n+ OrderLinkFactory $orderLinkFactory = null,\n+ OrderRepository $orderRepository = null\n) {\n$this->clientFactory = $clientFactory;\n$this->amazonSetOrderDetailsResponseFactory = $amazonSetOrderDetailsResponseFactory;\n@@ -122,6 +138,8 @@ class AmazonPaymentAdapter\n$this->pendingCaptureFactory = $pendingCaptureFactory;\n$this->pendingAuthorizationFactory = $pendingAuthorizationFactory;\n$this->urlBuilder = $urlBuilder ?: ObjectManager::getInstance()->get(UrlInterface::class);\n+ $this->orderLinkFactory = $orderLinkFactory ?: ObjectManager::getInstance()->get(OrderLinkFactory::class);\n+ $this->orderRepository = $orderRepository ?: ObjectManager::getInstance()->get(OrderRepository::class);\n}\n/**\n@@ -199,6 +217,22 @@ class AmazonPaymentAdapter\nreturn $response ? $response->getDetails() : $response;\n}\n+ /**\n+ * @param $amazonOrderReferenceId\n+ * @return \\Magento\\Sales\\Api\\Data\\OrderInterface\n+ * @throws \\Magento\\Framework\\Exception\\InputException\n+ * @throws \\Magento\\Framework\\Exception\\NoSuchEntityException\n+ */\n+ private function getOrderByReference($amazonOrderReferenceId)\n+ {\n+ $orderLink = $this->orderLinkFactory->create()->load($amazonOrderReferenceId, 'amazon_order_reference_id');\n+ $orderId = $orderLink->getOrderId();\n+ if ($orderId === null) {\n+ return null;\n+ }\n+ return $this->orderRepository->get($orderId);\n+ }\n+\n/**\n* @param $data\n* @param bool $captureNow\n@@ -208,7 +242,12 @@ class AmazonPaymentAdapter\n{\n$response = [];\n$confirmResponse = null;\n+ $order = $this->getOrderByReference($data['amazon_order_reference_id']);\n+ if ($order) {\n+ $storeId = $order->getStoreId();\n+ } else {\n$storeId = $this->subjectReader->getStoreId();\n+ }\n$authMode = $this->coreHelper->getAuthorizationMode('store', $storeId);\n(isset($data['additional_information']) && $data['additional_information'] != 'default')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Helper/Data.php", "new_path": "src/Core/Helper/Data.php", "diff": "@@ -25,6 +25,7 @@ use Magento\\Framework\\Module\\ModuleListInterface;\nuse Magento\\Framework\\Module\\StatusFactory;\nuse Amazon\\Core\\Model\\AmazonConfig;\nuse Magento\\Framework\\App\\Cache\\TypeListInterface;\n+use Magento\\Framework\\App\\ObjectManager;\n/**\n* @SuppressWarnings(PHPMD.ExcessivePublicCount)\n@@ -64,6 +65,11 @@ class Data extends AbstractHelper\n*/\nprivate $config;\n+ /**\n+ * @var TypeListInterface\n+ */\n+ private $cacheTypeList;\n+\n/**\n* Data constructor.\n*\n@@ -84,7 +90,7 @@ class Data extends AbstractHelper\nClientIp $clientIpHelper,\nStatusFactory $moduleStatusFactory,\nAmazonConfig $config,\n- TypeListInterface $cacheTypeList\n+ TypeListInterface $cacheTypeList = null\n) {\nparent::__construct($context);\n$this->moduleList = $moduleList;\n@@ -93,7 +99,7 @@ class Data extends AbstractHelper\n$this->clientIpHelper = $clientIpHelper;\n$this->moduleStatusFactory = $moduleStatusFactory;\n$this->config = $config;\n- $this->cacheTypeList = $cacheTypeList;\n+ $this->cacheTypeList = $cacheTypeList ?: ObjectManager::getInstance()->get(TypeListInterface::class);\n}\n/*\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.9\",\n+ \"version\": \"3.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.9'\n+version = u'3.2.10'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.9'\n+release = u'3.2.10'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.9\",\n+ \"version\": \"3.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.9\",\n- \"amzn/login-with-amazon-module\": \"3.2.9\",\n- \"amzn/amazon-pay-module\": \"3.2.9\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.10\",\n+ \"amzn/login-with-amazon-module\": \"3.2.10\",\n+ \"amzn/amazon-pay-module\": \"3.2.10\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.9\",\n+ \"version\": \"3.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.9\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.10\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.9\",\n+ \"version\": \"3.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.9\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.10\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.9\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.10\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.9\",\n+ \"version\": \"3.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.9\",\n- \"amzn/login-with-amazon-module\": \"^3.2.9\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.10\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.10\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.9\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.10\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/configuration.rst", "new_path": "docs/configuration.rst", "diff": "@@ -121,7 +121,7 @@ Use Multi-currency\nEnables the multi-currency feature of Amazon Pay for Magento 2.\n-.. note:: Multi-currency is currently supported for payment region EU and UK only, and only on Magento 2.3 and higher. If you are using a different payment region or Magento 2 version, this option will not be available.\n+.. note:: Multi-currency is currently supported for payment region EU and UK only, and only on Magento 2.3.1 and higher. If you are using a different payment region or Magento 2 version, this option will not be available.\nThe feature includes the following currencies:\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "new_path": "src/Login/view/frontend/web/js/amazon-redirect.js", "diff": "@@ -44,30 +44,7 @@ define([\n// we don't have the customer's consent or invalid request\nthis.redirectOnRequestWithError();\nthis.setAuthStateCookies();\n- var onAmazonDefined = function () {\n- //only set this on the redirect page\n- amazon.Login.setUseCookie(true); //eslint-disable-line no-undef\n- amazonCore.verifyAmazonLoggedIn().then(function (loggedIn) {\n- if (loggedIn) {\nself.redirect();\n- } else {\n- window.location = amazonPaymentConfig.getValue('customerLoginPageUrl');\n- }\n- }, function(error) {\n- $('body').trigger('processStop');\n- customerData.set('messages', {\n- messages: [{\n- type: 'error',\n- text: error\n- }]\n- });\n- });\n- };\n- if (amazonCore.amazonDefined()) {\n- onAmazonDefined();\n- } else {\n- amazonCore.amazonDefined.subscribe(onAmazonDefined, this);\n- }\n},\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-button.js", "new_path": "src/Payment/view/frontend/web/js/amazon-button.js", "diff": "@@ -18,11 +18,13 @@ define([\n'Magento_Customer/js/section-config',\n'Amazon_Payment/js/model/amazonPaymentConfig',\n'amazonCsrf',\n+ 'Magento_Checkout/js/model/full-screen-loader',\n'modernizr/modernizr',\n'amazonCore',\n'jquery/ui',\n- 'uiRegistry'\n-], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf) {\n+ 'uiRegistry',\n+ 'mage/cookies'\n+], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf, fullScreenLoader) {\n'use strict';\nvar _this;\n@@ -96,6 +98,7 @@ define([\nif (sections) {\ncustomerData.invalidate(sections);\n}\n+ $.mage.cookies.set('amazon_Login_accessToken', event.access_token);\nwindow.location = _this.options.redirectUrl + '?access_token=' + event.access_token;\n// jscs:enable requireCamelCaseOrUpperCaseIdentifiers\n},\n@@ -150,6 +153,7 @@ define([\n* Authorization callback\n*/\nauthorization: function () {\n+ fullScreenLoader.startLoader();\n//eslint-disable-next-line no-undef\namazon.Login.authorize(_this._getLoginOptions(), _this._popupCallback());\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-core.js", "new_path": "src/Payment/view/frontend/web/js/amazon-core.js", "diff": "@@ -19,12 +19,12 @@ define([\n'mage/url',\n'amazonPaymentConfig',\n'amazonWidgetsLoader',\n- 'jquery/jquery-storageapi'\n+ 'jquery/jquery-storageapi',\n+ 'mage/cookies'\n], function ($, ko, url, amazonPaymentConfig) {\n'use strict';\n- var clientId = amazonPaymentConfig.getValue('clientId'),\n- amazonDefined = ko.observable(false),\n+ var amazonDefined = ko.observable(false),\namazonLoginError = ko.observable(false),\naccessToken = ko.observable(null),\n// Match region config to amazon.Login.Region\n@@ -32,23 +32,22 @@ define([\nsandboxMode,\nregion;\n- if (typeof amazon === 'undefined') {\n- /**\n- * Amazon login ready callback\n- */\n- window.onAmazonLoginReady = function () {\n- setClientId(clientId); //eslint-disable-line no-use-before-define\n- doLogoutOnFlagCookie(); //eslint-disable-line no-use-before-define\n+ accessToken($.mage.cookies.get('amazon_Login_accessToken'));\n- sandboxMode = amazonPaymentConfig.getValue('isSandboxEnabled', false);\n- amazon.Login.setSandboxMode(sandboxMode); //eslint-disable-line no-undef\n+ var initAmazonLogin = function () {\n+ amazon.Login.setClientId(amazonPaymentConfig.getValue('clientId')); //eslint-disable-line no-undef\n+ amazon.Login.setSandboxMode(amazonPaymentConfig.getValue('isSandboxEnabled', false)); //eslint-disable-line no-undef\n+ amazon.Login.setRegion(regions[amazonPaymentConfig.getValue('region')]); //eslint-disable-line no-undef\n+ amazon.Login.setUseCookie(true); //eslint-disable-line no-undef\n- region = regions[amazonPaymentConfig.getValue('region')];\n- amazon.Login.setRegion(region); //eslint-disable-line no-undef\n+ doLogoutOnFlagCookie(); //eslint-disable-line no-use-before-define\n+ amazonDefined(true);\n};\n+\n+ if (typeof amazon === 'undefined') {\n+ window.onAmazonLoginReady = initAmazonLogin;\n} else {\n- setClientId(clientId); //eslint-disable-line no-use-before-define\n- doLogoutOnFlagCookie(); //eslint-disable-line no-use-before-define\n+ initAmazonLogin();\n}\n// Widgets.js ready callback\n@@ -61,14 +60,13 @@ define([\n* @param {String} cid\n*/\nfunction setClientId(cid) {\n- amazon.Login.setClientId(cid); //eslint-disable-line no-undef\n- amazonDefined(true);\n}\n/**\n* Log user out of amazon\n*/\nfunction amazonLogout() {\n+ $.mage.cookies.clear('amazon_Login_accessToken');\n$.ajax({\nurl: url.build('amazon/logout'),\ncontext: this\n@@ -108,39 +106,30 @@ define([\namazonLoginError(true);\n}\n- return {\n- /**\n- * Verify a user is logged into amazon\n- */\n- verifyAmazonLoggedIn: function () {\n- var defer = $.Deferred(),\n- loginOptions = {\n- scope: amazonPaymentConfig.getValue('loginScope'),\n- popup: true,\n- interactive: 'never'\n- };\n-\n- // jscs:disable requireCamelCaseOrUpperCaseIdentifiers\n- amazon.Login.authorize(loginOptions, function (response) { //eslint-disable-line no-undef\n- if (response.error) {\n- defer.reject(response.error);\n- } else {\n- accessToken(response.access_token);\n- defer.resolve(!response.error);\n+ function handleWidgetError(error) {\n+ console.log('OffAmazonPayments.Widgets.AddressBook', error.getErrorCode(), error.getErrorMessage());\n+ switch (error.getErrorCode()) {\n+ case 'BuyerSessionExpired':\n+ messageList.addErrorMessage({message: $.mage.__('Your Amazon session has expired. Please sign in again by clicking the Amazon Pay Button.')});\n+ amazonStorage.amazonlogOut();\n+ break;\n+ case 'ITP':\n+ // ITP errors are how handled within the widget code\n+ break;\n+ default:\n+ messageList.addErrorMessage({message: $.mage.__(error.getErrorMessage())});\n+ }\n}\n- });\n- // jscs:enable requireCamelCaseOrUpperCaseIdentifiers\n-\n- return defer.promise();\n- },\n+ return {\n/**\n* Log user out of Amazon\n*/\nAmazonLogout: amazonLogout,\namazonDefined: amazonDefined,\naccessToken: accessToken,\n- amazonLoginError: amazonLoginError\n+ amazonLoginError: amazonLoginError,\n+ handleWidgetError: handleWidgetError\n};\n});\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/model/storage.js", "new_path": "src/Payment/view/frontend/web/js/model/storage.js", "diff": "@@ -33,8 +33,6 @@ define(\norderReference,\naddressConsentToken = amazonCore.accessToken,\n//eslint-disable-next-line no-use-before-define\n- isAmazonDefined = amazonCore.amazonDefined.subscribe(checkAmazonDefined),\n- //eslint-disable-next-line no-use-before-define\namazonLoginError = amazonCore.amazonLoginError.subscribe(setAmazonLoggedOutIfLoginError),\namazonDeclineCode = ko.observable(false),\nsandboxSimulationReference = ko.observable('default'),\n@@ -50,25 +48,12 @@ define(\n}),\nisLoginRedirectPage = $('body').hasClass('amazon-login-login-processauthhash');\n- /**\n- * Subscribes to amazonDefined observable which runs when amazon object becomes available\n- * @param {String} amazonDefined\n- */\n- function checkAmazonDefined(amazonDefined) {\n- if (amazonDefined && !isLoginRedirectPage) {\n- verifyAmazonLoggedIn(); //eslint-disable-line no-use-before-define\n- //remove subscription to amazonDefined once loaded\n- isAmazonDefined.dispose();\n- }\n- }\n/**\n* Log out amazon user\n*/\nfunction amazonLogOut() {\n- if (amazonCore.amazonDefined()) {\namazonCore.AmazonLogout();\n- }\nthis.isAmazonAccountLoggedIn(false);\n}\n@@ -89,19 +74,14 @@ define(\n}\n});\n- //run this on loading storage model. If not defined subscribe will trigger when true\n- checkAmazonDefined(amazonCore.amazonDefined());\n+ verifyAmazonLoggedIn();\nsetAmazonLoggedOutIfLoginError(amazonCore.amazonLoginError());\n/**\n* Verifies amazon user is logged in\n*/\nfunction verifyAmazonLoggedIn() {\n- amazonCore.verifyAmazonLoggedIn().then(function (response) {\n- if (!amazonCore.amazonLoginError()) {\n- isAmazonAccountLoggedIn(response);\n- }\n- });\n+ isAmazonAccountLoggedIn(!!amazonCore.accessToken());\n}\nreturn {\n@@ -115,6 +95,7 @@ define(\nisQuoteDirty: isQuoteDirty,\nisPwaVisible: isPwaVisible,\namazonlogOut: amazonLogOut,\n+ amazonDefined: amazonCore.amazonDefined,\n/**\n* Set order reference\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-widget-address.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-widget-address.js", "diff": "@@ -11,6 +11,7 @@ define(\n'Magento_Checkout/js/model/shipping-rate-processor/new-address',\n'Magento_Checkout/js/action/set-shipping-information',\n'Amazon_Payment/js/model/storage',\n+ 'amazonCore',\n'Magento_Checkout/js/model/shipping-service',\n'Magento_Checkout/js/model/address-converter',\n'mage/storage',\n@@ -31,6 +32,7 @@ define(\nshippingProcessor,\nsetShippingInformationAction,\namazonStorage,\n+ amazonCore,\nshippingService,\naddressConverter,\nstorage,\n@@ -71,7 +73,16 @@ define(\n* Call when component template is rendered\n*/\ninitAddressWidget: function () {\n+ if(amazonStorage.amazonDefined()) {\nself.renderAddressWidget();\n+ } else {\n+ var subscription = amazonStorage.amazonDefined.subscribe(function (defined) { //eslint-disable-line vars-on-top\n+ if (defined) {\n+ self.renderAddressWidget();\n+ subscription.dispose();\n+ }\n+ });\n+ }\n},\n/**\n@@ -104,9 +115,7 @@ define(\n/**\n* Error callback\n*/\n- onError: function (error) {\n- console.log('OffAmazonPayments.Widgets.AddressBook', error.getErrorCode(), error.getErrorMessage());\n- }\n+ onError: amazonCore.handleWidgetError\n}).bind(self.options.addressWidgetDOMId);\n},\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "new_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazon-payment-widget.js", "diff": "@@ -7,6 +7,7 @@ define(\n'Magento_Customer/js/customer-data',\n'Magento_Checkout/js/model/quote',\n'Amazon_Payment/js/model/storage',\n+ 'amazonCore',\n'mage/storage',\n'Magento_Checkout/js/model/full-screen-loader',\n'Amazon_Payment/js/action/place-order',\n@@ -27,6 +28,7 @@ define(\ncustomerData,\nquote,\namazonStorage,\n+ amazonCore,\nstorage,\nfullScreenLoader,\nplaceOrderAction,\n@@ -112,9 +114,7 @@ define(\n/**\n* Error callback\n*/\n- onError: function (error) {\n- errorProcessor.process(error);\n- }\n+ onError: amazonCore.handleWidgetError\n});\nif (this.useMultiCurrency) {\nwidget.setPresentmentCurrency(this.presentmentCurrency);\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.10\",\n+ \"version\": \"3.2.11\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.10'\n+version = u'3.2.11'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.10'\n+release = u'3.2.11'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.10\",\n+ \"version\": \"3.2.11\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.10\",\n- \"amzn/login-with-amazon-module\": \"3.2.10\",\n- \"amzn/amazon-pay-module\": \"3.2.10\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.11\",\n+ \"amzn/login-with-amazon-module\": \"3.2.11\",\n+ \"amzn/amazon-pay-module\": \"3.2.11\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.10\",\n+ \"version\": \"3.2.11\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.10\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.11\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.10\",\n+ \"version\": \"3.2.11\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.10\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.11\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.10\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.11\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.10\",\n+ \"version\": \"3.2.11\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.10\",\n- \"amzn/login-with-amazon-module\": \"^3.2.10\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.11\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.11\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.10\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.11\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"magento/module-quote\": \"^101.1\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n- \"amzn/amazon-pay-sdk-php\": \"^3.2.0\"\n+ \"amzn/amazon-pay-sdk-php\": \"^3.4.1\"\n},\n\"repositories\": [\n{\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.11\",\n+ \"version\": \"3.2.12\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.11'\n+version = u'3.2.12'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.11'\n+release = u'3.2.12'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.11\",\n+ \"version\": \"3.2.12\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.11\",\n- \"amzn/login-with-amazon-module\": \"3.2.11\",\n- \"amzn/amazon-pay-module\": \"3.2.11\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.12\",\n+ \"amzn/login-with-amazon-module\": \"3.2.12\",\n+ \"amzn/amazon-pay-module\": \"3.2.12\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.11\",\n+ \"version\": \"3.2.12\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.11\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.12\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.11\",\n+ \"version\": \"3.2.12\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.11\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.12\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.11\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.12\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.11\",\n+ \"version\": \"3.2.12\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.11\",\n- \"amzn/login-with-amazon-module\": \"^3.2.11\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.12\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.12\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.11\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.12\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.12\",\n+ \"version\": \"3.2.13\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "docs/conf.py", "new_path": "docs/conf.py", "diff": "@@ -60,9 +60,9 @@ author = u'Amazon.com Inc or its affiliates'\n# built documents.\n#\n# The short X.Y version.\n-version = u'3.2.12'\n+version = u'3.2.13'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.2.12'\n+release = u'3.2.13'\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay and Login with Amazon\",\n\"type\": \"metapackage\",\n- \"version\": \"3.2.12\",\n+ \"version\": \"3.2.13\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.12\",\n- \"amzn/login-with-amazon-module\": \"3.2.12\",\n- \"amzn/amazon-pay-module\": \"3.2.12\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.2.13\",\n+ \"amzn/login-with-amazon-module\": \"3.2.13\",\n+ \"amzn/amazon-pay-module\": \"3.2.13\"\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"name\": \"amzn/amazon-pay-and-login-with-amazon-core-module\",\n\"description\": \"Shared functionality for Amazon Pay and Login with Amazon modules\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.12\",\n+ \"version\": \"3.2.13\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Core\" setup_version=\"3.2.12\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.2.13\">\n<sequence>\n<module name=\"Magento_Store\"/>\n<module name=\"Magento_Customer\"/>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.12\",\n+ \"version\": \"3.2.13\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.12\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.13\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-store\": \"^101\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Login\" setup_version=\"3.2.12\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.2.13\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"name\": \"amzn/amazon-pay-module\",\n\"description\": \"Amazon Pay module\",\n\"type\": \"magento2-module\",\n- \"version\": \"3.2.12\",\n+ \"version\": \"3.2.13\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.12\",\n- \"amzn/login-with-amazon-module\": \"^3.2.12\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.13\",\n+ \"amzn/login-with-amazon-module\": \"^3.2.13\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n\"magento/module-eav\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_Payment\" setup_version=\"3.2.12\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.2.13\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/composer.json", "new_path": "src/Core/composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0||~7.3.0\",\n\"magento/framework\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-config\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0||~7.3.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.13\",\n\"magento/framework\": \"^102\",\n\"magento/module-customer\": \"^102\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0||~7.3.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.2.13\",\n\"amzn/login-with-amazon-module\": \"^3.2.13\",\n\"magento/framework\": \"^102\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/css/source/_module.less", "new_path": "src/Payment/view/frontend/web/css/source/_module.less", "diff": "}\n}\n- /** hide alt currency - if multicurrency is enabled this will be unhidden dynamically **/\n- tr.totals.charge {\n- display: none;\n- }\n-\n.amazon-widget {\nmax-width: 400px;\nheight: 228px;\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Gateway/Validator/GeneralResponseValidator.php", "new_path": "src/PayV2/Gateway/Validator/GeneralResponseValidator.php", "diff": "@@ -40,14 +40,14 @@ class GeneralResponseValidator extends AbstractValidator\n$response = $validationSubject['response'];\n- if (isset($response['statusDetails'])) {\n- if (!empty($response['statusDetails']['reasonCode'])) {\n+ if (isset($response['statusDetail'])) {\n+ if (!empty($response['statusDetail']['reasonCode'])) {\n$isValid = false;\n- $errorCodes[] = $response['statusDetails']['reasonCode'];\n+ $errorCodes[] = $response['statusDetail']['reasonCode'];\n}\n- if (!empty($response['statusDetails']['reasonDescription'])) {\n+ if (!empty($response['statusDetail']['reasonDescription'])) {\n$isValid = false;\n- $errorMessages[] = $response['statusDetails']['reasonDescription'];\n+ $errorMessages[] = $response['statusDetail']['reasonDescription'];\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Model/Adapter/AmazonPayV2Adapter.php", "new_path": "src/PayV2/Model/Adapter/AmazonPayV2Adapter.php", "diff": "@@ -79,7 +79,7 @@ class AmazonPayV2Adapter\n$headers = $this->getIdempotencyHeader();\n$payload = [\n- 'webCheckoutDetails' => [\n+ 'webCheckoutDetail' => [\n'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewReturnUrl(),\n],\n'storeId' => $this->amazonConfig->getClientId(),\n@@ -125,13 +125,13 @@ class AmazonPayV2Adapter\n}\n$payload = [\n- 'webCheckoutDetails' => [\n+ 'webCheckoutDetail' => [\n'checkoutResultReturnUrl' => $store->getUrl(\n'amazon_payv2/payment/completeCheckout',\n['_forced_secure' => true]\n)\n],\n- 'paymentDetails' => [\n+ 'paymentDetail' => [\n'paymentIntent' => 'Authorize',\n'canHandlePendingAuthorization' => $this->amazonConfig->canHandlePendingAuthorization(),\n'chargeAmount' => [\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Model/CheckoutSessionManagement.php", "new_path": "src/PayV2/Model/CheckoutSessionManagement.php", "diff": "@@ -89,8 +89,8 @@ class CheckoutSessionManagement implements \\Amazon\\PayV2\\Api\\CheckoutSessionMana\n$response = $this->amazonAdapter->updateCheckoutSession($quote, $amazonCheckoutSessionId);\n// Return final redirect URL to process payment on Amazon before redirecting to Magento success page\n- if (!empty($response['webCheckoutDetails']['amazonPayRedirectUrl'])) {\n- return $response['webCheckoutDetails']['amazonPayRedirectUrl'];\n+ if (!empty($response['webCheckoutDetail']['amazonPayRedirectUrl'])) {\n+ return $response['webCheckoutDetail']['amazonPayRedirectUrl'];\n}\nreturn false;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/action/place-order.js", "new_path": "src/PayV2/view/frontend/web/js/action/place-order.js", "diff": "@@ -23,9 +23,10 @@ define(\n'Magento_Customer/js/model/customer',\n'Magento_Checkout/js/model/full-screen-loader',\n'Amazon_PayV2/js/model/storage',\n- 'mage/translate'\n+ 'mage/translate',\n+ 'Magento_CheckoutAgreements/js/model/agreements-assigner'\n],\n- function (quote, urlBuilder, storage, url, errorProcessor, customer, fullScreenLoader, amazonStorage, $t) {\n+ function (quote, urlBuilder, storage, url, errorProcessor, customer, fullScreenLoader, amazonStorage, $t, agreementsAssigner) {\n'use strict';\nreturn function (paymentData, redirectOnSuccess) {\n@@ -55,6 +56,8 @@ define(\nfullScreenLoader.startLoader();\n+ agreementsAssigner(payload.paymentMethod);\n+\nreturn storage.post(\nserviceUrl,\nJSON.stringify(payload)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Plugin/AmazonCoreHelperData.php", "new_path": "src/PayV2/Plugin/AmazonCoreHelperData.php", "diff": "@@ -46,4 +46,17 @@ class AmazonCoreHelperData\nreturn $result;\n}\n+\n+ /**\n+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)\n+ */\n+ public function afterIsLwaEnabled(Data $subject, $result)\n+ {\n+ // Disable v1 LWA\n+ if ($result && $this->amazonConfig->getApiVersion() == '2') {\n+ return false;\n+ }\n+\n+ return $result;\n+ }\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -18,6 +18,11 @@ All Amazon Pay transactions are protected by Amazon's A-to-z Guarantee.\nRefer [here](https://gist.github.com/tarishah/9b12146925eb9b5dbe5a1a3936b9b382) for the V2 Checkout Installation steps.\n+## PWA Support\n+1. The V2 module exposes the REST endpoints that needs to set up. You can find them at [src/PayV2/etc/webapi.xml](https://github.com/amzn/amazon-payments-magento-2-plugin/blob/V2checkout/src/PayV2/etc/webapi.xml)\n+1. The front end needs to be setup by the merchant/developer.\n+\n+\n## Dependencies\nYou can find a list of modules in the require section of the `composer.json` file located in the\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": ".vscode/settings.json", "diff": "+{}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.0.0\",\n+ \"version\": \"1.0.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.0.0\",\n+ \"version\": \"1.0.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"magento/module-scalable-oms\": \"*\"\n},\n\"autoload\": {\n- \"files\": [\"registration.php\"],\n+ \"files\": [\n+ \"registration.php\"\n+ ],\n\"psr-4\": {\n\"Amazon\\\\PayV2\\\\\": \"\"\n}\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"1.0.0\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"1.0.1\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/etc/config.xml", "new_path": "src/PayV2/etc/config.xml", "diff": "-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:module:Magento_Store:etc/config.xsd\">\n<default>\n+ <dev>\n+ <js>\n+ <minify_exclude>\n+ <payments_amazon_checkout>\\.payments-amazon\\.com/checkout</payments_amazon_checkout>\n+ </minify_exclude>\n+ </js>\n+ </dev>\n<payment>\n<amazon_payment_v2>\n<active>0</active>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Model/AddressManagement.php", "new_path": "src/PayV2/Model/AddressManagement.php", "diff": "@@ -70,6 +70,11 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n*/\nprivate $logger;\n+ /**\n+ * @var array\n+ */\n+ private $checkoutSessions = [];\n+\n/**\n* AddressManagement constructor.\n* @param \\Magento\\Store\\Model\\StoreManagerInterface $storeManager\n@@ -112,11 +117,10 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n*/\npublic function getBillingAddress($amazonCheckoutSessionId)\n{\n- if ($this->amazonHelper->isPayOnly()) {\n$result = $this->fetchAddress($amazonCheckoutSessionId, false, function ($response) {\nreturn $response['paymentPreferences'][0]['billingAddress'] ?? [];\n});\n- } else {\n+ if (empty($result) && !$this->amazonHelper->isPayOnly()) {\n$result = $this->getShippingAddress($amazonCheckoutSessionId);\n}\nreturn $result;\n@@ -145,10 +149,7 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n}\ntry {\n- $response = $this->amazonAdapter->getCheckoutSession(\n- $this->storeManager->getStore()->getId(),\n- $amazonCheckoutSessionId\n- );\n+ $response = $this->getCheckoutSession($amazonCheckoutSessionId);\n$addressData = call_user_func($addressDataExtractor, $response);\nif (!empty($addressData)) {\n@@ -177,6 +178,21 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n}\n}\n+ /**\n+ * @param string $amazonCheckoutSessionId\n+ * @return mixed\n+ */\n+ protected function getCheckoutSession($amazonCheckoutSessionId)\n+ {\n+ if (!isset($this->checkoutSessions[$amazonCheckoutSessionId])) {\n+ $this->checkoutSessions[$amazonCheckoutSessionId] = $this->amazonAdapter->getCheckoutSession(\n+ $this->storeManager->getStore()->getId(),\n+ $amazonCheckoutSessionId\n+ );\n+ }\n+ return $this->checkoutSessions[$amazonCheckoutSessionId];\n+ }\n+\nprotected function throwUnknownErrorException()\n{\nthrow new WebapiException(\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Model/AddressManagement.php", "new_path": "src/PayV2/Model/AddressManagement.php", "diff": "@@ -154,6 +154,7 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n$addressData = call_user_func($addressDataExtractor, $response);\nif (!empty($addressData)) {\n$addressData['state'] = $addressData['stateOrRegion'];\n+ $addressData['telephone'] = $addressData['phoneNumber'];\n$address = array_combine(\narray_map('ucfirst', array_keys($addressData)),\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/model/storage.js", "new_path": "src/PayV2/view/frontend/web/js/model/storage.js", "diff": "@@ -34,14 +34,16 @@ define([\n* @returns {boolean}\n*/\nisAmazonCheckout: function () {\n- return this.getCheckoutSessionId() !== null;\n+ return typeof this.getCheckoutSessionId() === 'string';\n},\n/**\n* Clear Amazon Checkout Session ID and revert checkout\n*/\nclearAmazonCheckout: function() {\n- customerData.set(sectionKey, false);\n+ var sessionData = customerData.get(sectionKey)();\n+ sessionData['checkoutSessionId'] = null;\n+ customerData.set(sectionKey, sessionData);\n},\n/**\n@@ -51,8 +53,7 @@ define([\n*/\ngetCheckoutSessionId: function () {\nif (typeof sessionId === 'undefined') {\n- var sessionData = customerData.get(sectionKey);\n- sessionId = sessionData ? sessionData()['checkoutSessionId'] : null;\n+ sessionId = customerData.get(sectionKey)()['checkoutSessionId'];\nif (!sessionId && window.location.search.indexOf('?amazonCheckoutSessionId=') != -1) {\nsessionId = window.location.search.replace('?amazonCheckoutSessionId=', '');\nthis.reloadCheckoutSessionId();\n@@ -80,8 +81,7 @@ define([\n* @returns {boolean}\n*/\nisPayOnly: function (defaultResult) {\n- var sessionData = customerData.get(sectionKey);\n- var sessionValue = sessionData ? sessionData()['isPayOnly'] : null;\n+ var sessionValue = customerData.get(sectionKey)()['isPayOnly'];\nvar result = typeof sessionValue === 'boolean' ? sessionValue : defaultResult;\nreturn result;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Model/AddressManagement.php", "new_path": "src/PayV2/Model/AddressManagement.php", "diff": "@@ -154,7 +154,7 @@ class AddressManagement implements \\Amazon\\PayV2\\Api\\AddressManagementInterface\n$addressData = call_user_func($addressDataExtractor, $response);\nif (!empty($addressData)) {\n$addressData['state'] = $addressData['stateOrRegion'];\n- $addressData['telephone'] = $addressData['phoneNumber'];\n+ $addressData['phone'] = $addressData['phoneNumber'];\n$address = array_combine(\narray_map('ucfirst', array_keys($addressData)),\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/checkout-address.js", "new_path": "src/PayV2/view/frontend/web/js/view/checkout-address.js", "diff": "@@ -116,7 +116,9 @@ define(\n// Amazon does not return telephone or non-US regionIds, so use previous provider values\nif (checkoutProvider.shippingAddress) {\n+ if (!addressData.telephone) {\naddressData.telephone = checkoutProvider.shippingAddress.telephone;\n+ }\nif (!addressData.regionId) {\naddressData.regionId = checkoutProvider.shippingAddress.region_id;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "new_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "diff": "@@ -78,7 +78,9 @@ define(\n// Amazon does not return telephone or non-US regionIds, so use previous provider values\nvar checkoutShipping = $.extend(true, {}, checkoutProvider.shippingAddress);\nvar checkoutBilling = $.extend(true, {}, checkoutProvider.billingAddress);\n+ if (!quoteAddress.telephone) {\nquoteAddress.telephone = checkoutBilling.telephone || checkoutShipping.telephone;\n+ }\nif (!quoteAddress.regionId) {\nquoteAddress.regionId = checkoutBilling.region_id;\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/model/storage.js", "new_path": "src/PayV2/view/frontend/web/js/model/storage.js", "diff": "@@ -84,6 +84,24 @@ define([\nvar sessionValue = customerData.get(sectionKey)()['isPayOnly'];\nvar result = typeof sessionValue === 'boolean' ? sessionValue : defaultResult;\nreturn result;\n+ },\n+\n+ /**\n+ * @param value\n+ * @returns {exports}\n+ */\n+ setIsEditPaymentFlag: function (value) {\n+ var sessionData = customerData.get(sectionKey)();\n+ sessionData['IsEditBillingClicked'] = value;\n+ customerData.set(sectionKey, sessionData);\n+ return this;\n+ },\n+\n+ /**\n+ * @returns {boolean}\n+ */\n+ getIsEditPaymentFlag: function () {\n+ return customerData.get(sectionKey)()['IsEditBillingClicked'];\n}\n};\n});\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "new_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "diff": "@@ -75,6 +75,9 @@ define([\n},\neditAddress: function () {\n+ if (!amazonStorage.isPayOnly(true)) {\n+ amazonStorage.setIsEditPaymentFlag(true);\n+ }\n}\n});\n});\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/checkout-address.js", "new_path": "src/PayV2/view/frontend/web/js/view/checkout-address.js", "diff": "@@ -21,6 +21,7 @@ define(\n'Magento_Checkout/js/checkout-data',\n'Magento_Checkout/js/model/checkout-data-resolver',\n'Magento_Customer/js/model/address-list',\n+ 'Magento_Checkout/js/model/step-navigator',\n'uiRegistry',\n'Amazon_PayV2/js/action/checkout-session-address-load',\n'Amazon_PayV2/js/amazon-checkout'\n@@ -45,6 +46,7 @@ define(\ncheckoutData,\ncheckoutDataResolver,\naddressList,\n+ stepNavigator,\nregistry,\ncheckoutSessionAddressLoad,\namazonCheckout\n@@ -71,6 +73,10 @@ define(\nthis._super();\nif (!amazonStorage.isPayOnly(true) && this.isAmazonCheckout) {\nthis.getShippingAddressFromAmazon();\n+ if (amazonStorage.getIsEditPaymentFlag()) {\n+ amazonStorage.setIsEditPaymentFlag(false);\n+ stepNavigator.setHash('payment');\n+ }\n}\n},\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/billing-address/actions.html", "new_path": "src/PayV2/view/frontend/web/template/billing-address/actions.html", "diff": "visible=\"canUseCancelBillingAddress()\">\n<span translate=\"'Cancel'\"/>\n</button>\n- <button class=\"action action-edit-address\"\n- type=\"button\"\n- click=\"editAddress\">\n- <span translate=\"'Edit'\"></span>\n- </button>\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/billing-address/details.html", "new_path": "src/PayV2/view/frontend/web/template/billing-address/details.html", "diff": "<text args=\"_.values(currentBillingAddress().street).join(', ')\"/><br/>\n<text args=\"currentBillingAddress().city \"/>, <span text=\"currentBillingAddress().region\"></span> <text args=\"currentBillingAddress().postcode\"/><br/>\n<text args=\"getCountryName(currentBillingAddress().countryId)\"/><br/>\n- <a if=\"currentBillingAddress().telephone\" attr=\"'href': 'tel:' + currentBillingAddress().telephone\" text=\"currentBillingAddress().telephone\"></a><br/>\n+ <!-- ko if: currentBillingAddress().telephone -->\n+ <a attr=\"'href': 'tel:' + currentBillingAddress().telephone\" text=\"currentBillingAddress().telephone\"></a><br/>\n+ <!-- /ko -->\n<each args=\"data: currentBillingAddress().customAttributes, as: 'element'\">\n<text args=\"$parent.getCustomAttributeLabel(element)\"/>\n<br/>\n</each>\n+\n+ <button class=\"action action-edit-address\"\n+ type=\"button\"\n+ click=\"editAddress\">\n+ <span translate=\"'Edit'\"></span>\n+ </button>\n+ <br/><br/>\n</div>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.0.2\",\n+ \"version\": \"1.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.0.2\",\n+ \"version\": \"1.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"1.0.2\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"1.1.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.1.0\",\n+ \"version\": \"1.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.1.0\",\n+ \"version\": \"1.1.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"1.1.0\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"1.1.1\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.1.1\",\n+ \"version\": \"1.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.1.1\",\n+ \"version\": \"1.2.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"1.1.1\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"1.2.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/registration.php", "new_path": "src/PayV2/registration.php", "diff": "@@ -18,7 +18,10 @@ use Magento\\Framework\\Component\\ComponentRegistrar;\n$registrar = new ComponentRegistrar();\n$moduleVisibilityFlag = 'AMAZON_PAYV2_ENABLE';\n-$isModuleVisible = !empty($_ENV[$moduleVisibilityFlag]) || !empty($_SERVER[$moduleVisibilityFlag]) || file_exists(BP . '/var/.' . strtolower($moduleVisibilityFlag));\n+$isModuleVisible = !empty($_ENV[$moduleVisibilityFlag]) || !empty($_SERVER[$moduleVisibilityFlag]);\n+if (!$isModuleVisible && defined('BP')) {\n+ $isModuleVisible = file_exists(BP . '/app/etc/.' . strtolower($moduleVisibilityFlag));\n+}\nif ($isModuleVisible && $registrar->getPath(ComponentRegistrar::MODULE, 'Amazon_PayV2') === null) {\nComponentRegistrar::register(ComponentRegistrar::MODULE, 'Amazon_PayV2', __DIR__);\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "-# Amazon_PayV2 Module\n+# Amazon Pay Checkout v2\n-The Amazon_PayV2 module provides the \"Amazon Pay\" payment method using version 2 of the Amazon Pay API.\n+This module will enable \"Amazon Pay Checkout v2\" on your Magento 2 installation. Amazon Pay Checkout v2 is the next generation web checkout technology of Amazon Pay that provides several advantages over the previous Amazon Pay Checkout solution.\n-## What's new in Pay V2?\n+## What's new in Amazon Pay Checkout v2?\n-*Modular Accelerated Checkout* places the Amazon shipping and payment widgets outside the Magento checkout\n-template system, improving usability and transaction error handling.\n+* Hosted checkout experience (replacing widgets solution of the previous module)\n+* Fewer checkout steps (merging consent and address/payment selection screen)\n+* Avoids problems on browsers that have active cookie blocking or tracking protection mechanisms\n+* Supports virtual goods\n+* Automatic, graceful handling of declined authorization, increasing checkout conversion rate\n+* Integrated support for PSD2/SCA (Strong Customer Authentication)\n-## About Amazon Pay and Login\n+## About Amazon Pay\n-Amazon Pay and Login provides integration of your Magento 2 store with Amazon Pay and Login\n-with Amazon services. This helps your customers shop quickly, safely and securely.\n-Your customers can pay on your website without re-entering their payment and address details.\n-All Amazon Pay transactions are protected by Amazon's A-to-z Guarantee.\n+Amazon Pay offers a familiar and convenient buying experience that can help your customers spend more time shopping and less time checking out. Amazon Pay is used by large and small companies. From years of shopping safely with Amazon, customers trust their personal information will remain secure and know many transactions are covered by the Amazon A-to-z Guarantee. Businesses have the reassurance of our advanced fraud protection and payment protection policy.\n+\n+## Dependencies\n+\n+You can find a list of modules in the require section of the `composer.json` file located in the\n+same directory as this `README.md` file.\n## Installation Steps\n-Refer [here](https://gist.github.com/tarishah/9b12146925eb9b5dbe5a1a3936b9b382) for the V2 Checkout Installation steps.\n+**Important:** Before proceeding, please make a backup of your current Magento 2 installation.\n-## PWA Support\n-1. The V2 module exposes the REST endpoints that needs to set up. You can find them at [src/PayV2/etc/webapi.xml](https://github.com/amzn/amazon-payments-magento-2-plugin/blob/V2checkout/src/PayV2/etc/webapi.xml)\n-1. The front end needs to be setup by the merchant/developer.\n+### 1. Install module\n+The module can be either installed via composer (recommend), or manually. The steps for each option are described below.\n-## Dependencies\n+#### Composer installation\n+```\n+$ composer require amzn/amazon-payments-magento-2-plugin:dev-V2checkout\n+$ bin/magento module:enable Amazon_PayV2\n+```\n+If composer installation didn't work, use the manual procedure below. If any of these were successful, please proceed with **2. Post-installation procedure**, otherwise reach out to Amazon Pay merchant support for additional assistance.\n-You can find a list of modules in the require section of the `composer.json` file located in the\n-same directory as this `README.md` file.\n+#### Manual installation\n+* Download the [Amazon Pay V2 checkout plugin](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout) via `git clone` or 'Download ZIP'\n+* Copy src/PayV2 to app/code/Amazon/PayV2\n+(If `magento-root/app/code/Amazon/PayV2` path is not present, please create the folders Amazon and PayV2)\n+\n+In Magento root, execute:\n+```\n+$ composer require amzn/amazon-pay-sdk-v2-php\n+$ composer require aws/aws-php-sns-message-validator\n+$ bin/magento module:enable Amazon_PayV2\n+```\n+\n+### 2. Post-installation procedure\n+\n+Execute the following steps to perform the module upgrade, compile dependency injection, deploy static content and clean caches.\n+\n+```\n+$ bin/magento setup:upgrade\n+$ bin/magento setup:di:compile\n+$ bin/magento setup:static-content:deploy\n+$ bin/magento cache:clean\n+```\n+\n+## PWA Support\n+\n+1. The module exposes the REST endpoints that needs to set up. You can find them at [src/PayV2/etc/webapi.xml](https://github.com/amzn/amazon-payments-magento-2-plugin/blob/V2checkout/src/PayV2/etc/webapi.xml)\n+1. The front end needs to be setup by the merchant/developer.\n## Extension Points\nAmazon Pay does not provide any specific extension points.\n-## Additional Information\n+## Configuration\n+\n+### Amazon Pay V2 configuration ###\n+\n+After successfully installting the module, please follow the steps below for configuring it.\n-[View the Complete User Guide](https://amzn.github.io/amazon-payments-magento-2-plugin/)\n+1. Go to Stores -> Configuration -> Sales -> Payment Methods -> Amazon Pay -> Configure\n+1. Switch to 'V2' under the Amazon Pay Product Version\n+1. Under 'Private Key' field, click on the 'Generate a new public/private key pair for Amazon Pay'. This saves the Private Key in the settings and displays the text [encrypted]\n+1. Click 'Download Public Key' to save the Public Key locally\n+1. To obtain the Public Key ID, please email your Amazon Pay POC with your Seller Central Merchant ID and Public key that you just downloaded (attached in the email)\n+1. Amazon Pay will respond with the Public Key ID, which then you add in the Public Key ID field\n+1. Merchant Id will be the same as you V1 credentails, please copy and paste it here\n+1. Store Id refers to the Client Id in V1 settings, please copy and paste it here\n+1. Rest of the settings are all similar to the V1 settings. We recommend to use the same settings as used in V1. [View V1 Confirgurations documentation](https://amzn.github.io/amazon-payments-magento-2-plugin/configuration.html)\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -26,24 +26,30 @@ same directory as this `README.md` file.\n### 1. Install module\n-The module can be either installed via composer (recommend), or manually. The steps for each option are described below.\n+The module can be either installed via Composer (recommended), or manually. The steps for each option are described below.\n#### Composer installation\n+\n+In `magento-root`, execute:\n+\n```\n$ composer require amzn/amazon-payments-magento-2-plugin:dev-V2checkout\n+$ touch app/etc/.amazon_payv2_enable\n$ bin/magento module:enable Amazon_PayV2\n```\n-If composer installation didn't work, use the manual procedure below. If any of these were successful, please proceed with **2. Post-installation procedure**, otherwise reach out to Amazon Pay merchant support for additional assistance.\n+\n+If Composer installation didn't work, use the manual procedure below. If any of these were successful, please proceed with **2. Post-installation procedure**, otherwise reach out to Amazon Pay Merchant Support for additional assistance.\n#### Manual installation\n-* Download the [Amazon Pay V2 checkout plugin](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout) via `git clone` or 'Download ZIP'\n+* Download the [Amazon Pay V2 checkout plugin](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout) via `git clone` or \"Download ZIP\"\n* Copy src/PayV2 to app/code/Amazon/PayV2\n-(If `magento-root/app/code/Amazon/PayV2` path is not present, please create the folders Amazon and PayV2)\n+(If `magento-root/app/code/Amazon/PayV2` path is not present, please create the folders `Amazon` and `PayV2`)\n-In Magento root, execute:\n+In `magento-root`, execute:\n```\n$ composer require amzn/amazon-pay-sdk-v2-php\n$ composer require aws/aws-php-sns-message-validator\n+$ touch app/etc/.amazon_payv2_enable\n$ bin/magento module:enable Amazon_PayV2\n```\n@@ -71,7 +77,7 @@ Amazon Pay does not provide any specific extension points.\n### Amazon Pay V2 configuration ###\n-After successfully installting the module, please follow the steps below for configuring it.\n+Upon successful installation of the module, please follow the steps below for configuring it:\n1. Go to Stores -> Configuration -> Sales -> Payment Methods -> Amazon Pay -> Configure\n1. Switch to 'V2' under the Amazon Pay Product Version\n@@ -79,6 +85,6 @@ After successfully installting the module, please follow the steps below for con\n1. Click 'Download Public Key' to save the Public Key locally\n1. To obtain the Public Key ID, please email your Amazon Pay POC with your Seller Central Merchant ID and Public key that you just downloaded (attached in the email)\n1. Amazon Pay will respond with the Public Key ID, which then you add in the Public Key ID field\n-1. Merchant Id will be the same as you V1 credentails, please copy and paste it here\n-1. Store Id refers to the Client Id in V1 settings, please copy and paste it here\n-1. Rest of the settings are all similar to the V1 settings. We recommend to use the same settings as used in V1. [View V1 Confirgurations documentation](https://amzn.github.io/amazon-payments-magento-2-plugin/configuration.html)\n+1. Merchant Id will be the same as your V1 credentails, please copy and paste it here\n+1. Store Id refers to the Client Id in V1 settings, please copy it or retrieve it from \"Login with Amazon\" application in Seller Central and paste it here\n+1. Rest of the settings are all similar to the V1 settings. We recommend to use the same settings as used in V1. [View V1 Configuration documentation](https://amzn.github.io/amazon-payments-magento-2-plugin/configuration.html)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/css/source/_module.less", "new_path": "src/PayV2/view/frontend/web/css/source/_module.less", "diff": "}\n#checkout {\n.amazon-button-container-v2 {\n+ margin: 22px 0;\njustify-content: left;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/checkout-button.html", "new_path": "src/PayV2/view/frontend/web/template/checkout-button.html", "diff": "<!-- ko template: getTemplate() --><!-- /ko -->\n<!--/ko-->\n+<div class=\"amazon-express-title\" data-bind=\"i18n: 'Express Checkout', visible: isVisible\"></div>\n+\n<div class=\"amazon-button-container-v2\" data-bind=\"visible: isVisible\">\n<div class=\"amazon-button-column\">\n<div id=\"PayWithAmazon-Checkout\"\n</div>\n</div>\n+<div class=\"amazon-divider\" data-bind=\"visible: isVisible\">\n+ <span data-bind=\"i18n: 'Or continue below to pay with a credit card'\"></span>\n+</div>\n+\n<!-- ko foreach: getRegion('after-amazon-button') -->\n<!-- ko template: getTemplate() --><!-- /ko -->\n<!--/ko-->\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/templates/minicart-button.phtml", "new_path": "src/PayV2/view/frontend/templates/minicart-button.phtml", "diff": "?>\n<div id=\"minicart-amazon-pay-button\" class=\"amazon-button-container-v2\">\n+ <div class=\"amazon-divider\">\n+ <span><?= __('or') ?></span>\n+ </div>\n+\n<div class=\"amazon-button-column\">\n<div id=\"PayWithAmazon-Cart\"\nclass=\"amazon-checkout-button\"\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/css/source/_module.less", "new_path": "src/PayV2/view/frontend/web/css/source/_module.less", "diff": "}\n.block-minicart {\n.amazon-button-container-v2 {\n- margin-top: 20px;\n+ flex-wrap: wrap;\n+ }\n+ .amazon-divider {\n+ flex-basis: 100%;\n}\n}\n.product-info-main {\n" } ]

[ { "change_type": "RENAME", "old_path": "src/PayV2/Block/Adminhtml/Form/Field/IpnUrl.php", "new_path": "src/PayV2/Block/Adminhtml/System/Config/Form/IpnUrl.php", "diff": "* express or implied. See the License for the specific language governing\n* permissions and limitations under the License.\n*/\n-namespace Amazon\\PayV2\\Block\\Adminhtml\\Form\\Field;\n+namespace Amazon\\PayV2\\Block\\Adminhtml\\System\\Config\\Form;\nuse Magento\\Framework\\Data\\Form\\Element\\AbstractElement;\nuse Magento\\Framework\\UrlInterface;\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Model/AmazonConfig.php", "new_path": "src/PayV2/Model/AmazonConfig.php", "diff": "@@ -49,7 +49,7 @@ class AmazonConfig\npublic function __construct(\n\\Magento\\Store\\Model\\StoreManagerInterface $storeManager,\n\\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig,\n- \\Amazon\\Core\\Helper\\ClientIp $clientIpHelper,\n+ \\Amazon\\PayV2\\Helper\\ClientIp $clientIpHelper,\n\\Magento\\Framework\\UrlInterface $urlBuilder,\n\\Magento\\Framework\\App\\State $appState\n) {\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/acl.xml", "new_path": "src/PayV2/etc/acl.xml", "diff": "<resource id=\"Magento_Backend::admin\">\n<resource id=\"Amazon_PayV2::PayV2\" title=\"Amazon Pay\" sortOrder=\"51\">\n<resource id=\"Amazon_PayV2::downloadlogs\" title=\"Download Logs\" translate=\"true\"/>\n- <resource id=\"Amazon_PayV2::downloadKeys\" title=\"Download Keys\" translate=\"true\"/>\n- <resource id=\"Amazon_PayV2::generatekeys\" title=\"Generate Public/Private Key Pair\" translate=\"true\"/>\n</resource>\n</resource>\n</resources>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Note.php", "new_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Note.php", "diff": "@@ -50,7 +50,7 @@ class Note extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\nprotected function _renderValue($element)\n{\n$html = '<td class=\"value\">';\n- if ($this->amazonConfig->getPrivateKey() && $this->amazonConfig->getPublicKeyId()) {\n+ if (!$this->amazonConfig->getPrivateKey() || !$this->amazonConfig->getPublicKeyId()) {\n$html .= __('Go to Seller Central to get the keys');\n}\n$html .= '</td>';\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -83,8 +83,17 @@ Upon successful installation of the module, please follow the steps below for co\n1. Switch to 'V2' under the Amazon Pay Product Version\n1. Under 'Private Key' field, click on the 'Generate a new public/private key pair for Amazon Pay'. This saves the Private Key in the settings and displays the text [encrypted]\n1. Click 'Download Public Key' to save the Public Key locally\n-1. To obtain the Public Key ID, please email your Amazon Pay POC with your Seller Central Merchant ID and Public key that you just downloaded (attached in the email)\n-1. Amazon Pay will respond with the Public Key ID, which then you add in the Public Key ID field\n-1. Merchant Id will be the same as your V1 credentails, please copy and paste it here\n-1. Store Id refers to the Client Id in V1 settings, please copy it or retrieve it from \"Login with Amazon\" application in Seller Central and paste it here\n+1. To obtain the Public Key ID, please log in to your Amazon Pay merchant account via Seller Central.\n+1. In the dropdown box on top, select \"Amazon Pay (Production View\").\n+1. In the menu, select \"Integration\" > \"Integration Central\"\n+1. Under \"Technical guidance and API credentials\", apply the selection shown below.\n+ \n+1. In the \"API access\" section that will show up further down the page, copy the \"Merchant ID\" and \"Store ID\" and copy them into the corresponding fields of the plugin configuration.\n+ \n+1. Back in Seller Central, click \"Create Keys\".\n+1. As shown below, chose to register an \"existing public key\" and copy/paste the content of the public key that the plugin has generated into the box. Then click \"Create Keys\".\n+ \n+1. Back on the previous screen, click \"Copy\" below the newly created entry to receive your Public Key ID.\n+ \n+1. Paste the Public Key ID into the corresponding field on the configurations screen of the plugin.\n1. Rest of the settings are all similar to the V1 settings. We recommend to use the same settings as used in V1. [View V1 Configuration documentation](https://amzn.github.io/amazon-payments-magento-2-plugin/configuration.html)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "new_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "diff": "@@ -52,12 +52,6 @@ define(\n}\n},\n- initObservable: function () {\n- this._super();\n- this.selectPaymentMethod();\n- return this;\n- },\n-\ninitBillingAddress: function () {\nbillingFormAddressState.isValid.subscribe(function (isValid) {\nthis.isPlaceOrderActionAllowed(isValid);\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/payment/amazon-payment-method.html", "new_path": "src/PayV2/view/frontend/web/template/payment/amazon-payment-method.html", "diff": "<div class=\"amazon-button-column\">\n<div id=\"PayWithAmazonButton\"\nclass=\"amazon-checkout-button\"\n- data-bind=\"mageInit: {'Amazon_PayV2/js/amazon-button':{'placement': 'Checkout', 'forcePayOnly': true}}\"></div>\n+ data-bind=\"mageInit: {'Amazon_PayV2/js/amazon-button':{'placement': 'Checkout'}}\"></div>\n</div>\n</div>\n<!--/ko-->\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Version.php", "new_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Version.php", "diff": "@@ -38,7 +38,7 @@ class Version extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\n* @param \\Magento\\Framework\\Data\\Form\\Element\\AbstractElement $element\n* @return string\n*/\n- public function render($element)\n+ public function render(\\Magento\\Framework\\Data\\Form\\Element\\AbstractElement $element)\n{\n$module = $this->moduleList->getOne('Amazon_PayV2');\n$version = $module['setup_version'] ?? __('--');\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Plugin/CheckoutProcessor.php", "new_path": "src/PayV2/Plugin/CheckoutProcessor.php", "diff": "@@ -70,11 +70,6 @@ class CheckoutProcessor\n$shippingConfig['children']['address-list']['rendererTemplates']['new-customer-address']\n['component'] = 'Amazon_PayV2/js/view/shipping-address/address-renderer/default';\n- $shippingConfig['children']['shipping-address-fieldset']['children']['inline-form-manipulator'] = [\n- 'component' => 'Amazon_PayV2/js/view/shipping-address/inline-form',\n- 'sortOrder' => 1000,\n- ];\n-\n$paymentConfig['children']['payments-list']['component'] = 'Amazon_PayV2/js/view/payment/list';\n$paymentConfig['children']['payments-list']['children'][\\Amazon\\PayV2\\Gateway\\Config\\Config::CODE . '-form']['component'] = 'Amazon_PayV2/js/view/billing-address';\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "new_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "diff": "@@ -2,9 +2,10 @@ define([\n'jquery',\n'Magento_Checkout/js/view/billing-address',\n'Magento_Checkout/js/model/quote',\n+ 'Amazon_PayV2/js/action/toggle-form-fields',\n'Amazon_PayV2/js/model/storage',\n'Amazon_PayV2/js/model/billing-address/form-address-state'\n-], function ($, Component, quote, amazonStorage, billingFormAddressState) {\n+], function ($, Component, quote, toggleFormFields, amazonStorage, billingFormAddressState) {\n'use strict';\nvar self;\n@@ -31,14 +32,7 @@ define([\nname: 'Amazon_PayV2/billing-address/form',\nafterRender: function () {\nself.triggerBillingDataValidateEvent();\n-\n- var $form = $(formSelector);\n- $form.find('.field').hide();\n-\n- var $errorFields = $form.find('.field._error');\n- $errorFields.show();\n-\n- var isValid = $errorFields.length === 0;\n+ var isValid = toggleFormFields(formSelector);\nbillingFormAddressState.isValid(isValid);\nself.isAddressFormVisible(!isValid);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "new_path": "src/PayV2/view/frontend/web/js/view/payment/method-renderer/amazon-payment-method.js", "diff": "@@ -49,6 +49,7 @@ define(\nthis.initChildren();\nif (amazonStorage.isAmazonCheckout()) {\nthis.initBillingAddress();\n+ this.selectPaymentMethod();\n}\n},\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/shipping-address/address-renderer/default.js", "new_path": "src/PayV2/view/frontend/web/js/view/shipping-address/address-renderer/default.js", "diff": "define([\n'jquery',\n'Magento_Checkout/js/view/shipping-address/address-renderer/default',\n+ 'uiRegistry',\n+ 'Amazon_PayV2/js/action/toggle-form-fields',\n'Amazon_PayV2/js/model/storage',\n'Amazon_PayV2/js/amazon-checkout'\n-], function ($, Component, amazonStorage, amazonCheckout) {\n+], function ($, Component, registry, toggleFormFields, amazonStorage, amazonCheckout) {\n'use strict';\nvar editSelector = '.edit-address-link';\n@@ -25,6 +27,14 @@ define([\n});\n});\n}\n+\n+ var checkoutProvider = registry.get('checkoutProvider');\n+ checkoutProvider.trigger('shippingAddress.data.validate');\n+ if (checkoutProvider.get('shippingAddress.custom_attributes')) {\n+ checkoutProvider.trigger('shippingAddress.custom_attributes.data.validate');\n+ }\n+\n+ toggleFormFields('#co-shipping-form')\n}\n}\n},\n" }, { "change_type": "DELETE", "old_path": "src/PayV2/view/frontend/web/js/view/shipping-address/inline-form.js", "new_path": null, "diff": "-define([\n- 'uiComponent',\n- 'Magento_Checkout/js/model/shipping-service',\n- 'Amazon_PayV2/js/action/toggle-shipping-form'\n-], function (Component, shippingService, toggleShippingForm) {\n- 'use strict';\n-\n- return Component.extend({\n- defaults: {\n- template: 'Amazon_PayV2/shipping-address/inline-form'\n- },\n-\n- /**\n- * Init inline form\n- */\n- initObservable: function () {\n- this._super();\n- shippingService.isLoading.subscribe(function(isLoading) {\n- if (!isLoading) {\n- toggleShippingForm.toggleFields();\n- }\n- });\n- return this;\n- },\n-\n- /**\n- * Show/hide inline form depending on Amazon checkout status\n- */\n- manipulateInlineForm: function () {\n- toggleShippingForm.toggleFields();\n- }\n- });\n-});\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/shipping.js", "new_path": "src/PayV2/view/frontend/web/js/view/shipping.js", "diff": "define(\n[\n'jquery',\n- 'underscore',\n- 'ko',\n'Magento_Checkout/js/view/shipping',\n- 'Magento_Customer/js/model/customer',\n- 'Magento_Checkout/js/model/quote',\n- 'Magento_Checkout/js/action/set-shipping-information',\n- 'Magento_Checkout/js/model/step-navigator',\n- 'Amazon_PayV2/js/model/storage',\n- 'Amazon_PayV2/js/action/toggle-shipping-form'\n+ 'Amazon_PayV2/js/model/storage'\n],\nfunction (\n$,\n- _,\n- ko,\nComponent,\n- customer,\n- quote,\n- setShippingInformationAction,\n- stepNavigator,\n- amazonStorage,\n- toggleShippingForm\n+ amazonStorage\n) {\n'use strict';\n@@ -48,14 +34,6 @@ define(\n$(loginFormSelector).validation();\nreturn $(loginFormSelector + ' input[type=email]').valid();\n- },\n-\n- /**\n- * \"Next\"\n- */\n- setShippingInformation: function () {\n- toggleShippingForm.toggleFields(); // Display error fields if needed\n- this._super();\n}\n});\n}\n" }, { "change_type": "DELETE", "old_path": "src/PayV2/view/frontend/web/template/shipping-address/inline-form.html", "new_path": null, "diff": "-<div data-bind=\"afterRender: manipulateInlineForm\"></div>\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -26,4 +26,5 @@ same directory as this `README.md` file.\n## Installation and Configuration\nThis section will be released once Magento 2.4.0 is widely available in June 2020.\n+\nIf you are on M2.2.x or M2.3.x, please use the [V2checkout-1.2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x) branch. The [README.md](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x#amazon-pay-checkout-v2) contains all the installation and configuration information.\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.2.0\",\n+ \"version\": \"2.0.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"1.2.0\",\n+ \"version\": \"2.0.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"1.2.0\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"2.0.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Note.php", "new_path": "src/PayV2/Block/Adminhtml/System/Config/Form/Note.php", "diff": "namespace Amazon\\PayV2\\Block\\Adminhtml\\System\\Config\\Form;\n+use Magento\\Framework\\Data\\Form\\Element\\AbstractElement;\n+\nclass Note extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\n{\n/**\n@@ -35,19 +37,19 @@ class Note extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\n}\n/**\n- * @param \\Magento\\Framework\\Data\\Form\\Element\\AbstractElement $element\n+ * @param AbstractElement $element\n* @return string\n*/\n- protected function _renderScopeLabel($element)\n+ protected function _renderScopeLabel(AbstractElement $element)\n{\nreturn '';\n}\n/**\n- * @param \\Magento\\Framework\\Data\\Form\\Element\\AbstractElement $element\n+ * @param AbstractElement $element\n* @return string\n*/\n- protected function _renderValue($element)\n+ protected function _renderValue(AbstractElement $element)\n{\n$html = '<td class=\"value\">';\nif (!$this->amazonConfig->getPrivateKey() || !$this->amazonConfig->getPublicKeyId()) {\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/registration.php", "new_path": "src/PayV2/registration.php", "diff": "@@ -17,12 +17,6 @@ use Magento\\Framework\\Component\\ComponentRegistrar;\n$registrar = new ComponentRegistrar();\n-$moduleVisibilityFlag = 'AMAZON_PAYV2_ENABLE';\n-$isModuleVisible = !empty($_ENV[$moduleVisibilityFlag]) || !empty($_SERVER[$moduleVisibilityFlag]) || getenv($moduleVisibilityFlag);\n-if (!$isModuleVisible && defined('BP')) {\n- $isModuleVisible = file_exists(BP . '/app/etc/.' . strtolower($moduleVisibilityFlag));\n-}\n-\n-if ($isModuleVisible && $registrar->getPath(ComponentRegistrar::MODULE, 'Amazon_PayV2') === null) {\n+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Amazon_PayV2') === null) {\nComponentRegistrar::register(ComponentRegistrar::MODULE, 'Amazon_PayV2', __DIR__);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"2.0.0\",\n+ \"version\": \"2.0.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"2.0.0\",\n+ \"version\": \"2.0.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"2.0.0\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"2.0.1\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Model/Adapter/AmazonPayV2Adapter.php", "new_path": "src/PayV2/Model/Adapter/AmazonPayV2Adapter.php", "diff": "@@ -84,6 +84,27 @@ class AmazonPayV2Adapter\nreturn sprintf('Magento Version: 2, Plugin Version: %s (v2)', $this->amazonHelper->getVersion());\n}\n+ /**\n+ * @param mixed $amount\n+ * @param string $currencyCode\n+ * @return array\n+ */\n+ protected function createPrice($amount, $currencyCode)\n+ {\n+ switch ($currencyCode) {\n+ case 'JPY':\n+ $amount = round($amount);\n+ break;\n+ default:\n+ $amount = (float) $amount;\n+ break;\n+ }\n+ return [\n+ 'amount' => $amount,\n+ 'currencyCode' => $currencyCode,\n+ ];\n+ }\n+\n/**\n* Create new Amazon Checkout Session\n*\n@@ -151,10 +172,7 @@ class AmazonPayV2Adapter\n'paymentDetail' => [\n'paymentIntent' => 'Authorize',\n'canHandlePendingAuthorization' => $this->amazonConfig->canHandlePendingAuthorization(),\n- 'chargeAmount' => [\n- 'amount' => $quote->getGrandTotal(),\n- 'currencyCode' => $store->getCurrentCurrency()->getCode(),\n- ],\n+ 'chargeAmount' => $this->createPrice($quote->getGrandTotal(), $quote->getQuoteCurrencyCode()),\n],\n'merchantMetadata' => [\n'merchantReferenceId' => $quote->getReservedOrderId(),\n@@ -197,10 +215,7 @@ class AmazonPayV2Adapter\n$payload = [\n'chargePermissionId' => $chargePermissionId,\n- 'chargeAmount' => [\n- 'amount' => $amount,\n- 'currencyCode' => $currency,\n- ]\n+ 'chargeAmount' => $this->createPrice($amount, $currency),\n];\n$response = $this->clientFactory->create($storeId)->createCharge($payload, $headers);\n@@ -222,10 +237,7 @@ class AmazonPayV2Adapter\n$headers = $this->getIdempotencyHeader();\n$payload = [\n- 'captureAmount' => [\n- 'amount' => $amount,\n- 'currencyCode' => $currency,\n- ]\n+ 'captureAmount' => $this->createPrice($amount, $currency),\n];\n$response = $this->clientFactory->create($storeId)->captureCharge($chargeId, $payload, $headers);\n@@ -248,10 +260,7 @@ class AmazonPayV2Adapter\n$payload = [\n'chargeId' => $chargeId,\n- 'refundAmount' => [\n- 'amount' => $amount,\n- 'currencyCode' => $currency,\n- ]\n+ 'refundAmount' => $this->createPrice($amount, $currency),\n];\n$response = $this->clientFactory->create($storeId)->createRefund($payload, $headers);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Block/Config.php", "new_path": "src/PayV2/Block/Config.php", "diff": "@@ -24,6 +24,14 @@ namespace Amazon\\PayV2\\Block;\n*/\nclass Config extends \\Magento\\Framework\\View\\Element\\Template\n{\n+ const LANG_DE = 'de_DE';\n+ const LANG_FR = 'fr_FR';\n+ const LANG_ES = 'es_ES';\n+ const LANG_IT = 'it_IT';\n+ const LANG_JA = 'ja_JP';\n+ const LANG_UK = 'en_GB';\n+ const LANG_US = 'en_US';\n+\n/**\n* @var \\Magento\\Framework\\Locale\\Resolver\n*/\n@@ -58,6 +66,49 @@ class Config extends \\Magento\\Framework\\View\\Element\\Template\n$this->categoryExclusionHelper = $categoryExclusionHelper;\n}\n+ /**\n+ * @return string\n+ */\n+ protected function getLanguage()\n+ {\n+ $paymentRegion = $this->amazonConfig->getRegion();\n+ @list($lang, $region) = explode('_', $this->localeResolver->getLocale());\n+ switch ($lang) {\n+ case 'de':\n+ $result = self::LANG_DE;\n+ break;\n+ case 'fr':\n+ $result = self::LANG_FR;\n+ break;\n+ case 'es':\n+ $result = self::LANG_ES;\n+ break;\n+ case 'it':\n+ $result = self::LANG_IT;\n+ break;\n+ case 'ja':\n+ $result = self::LANG_JA;\n+ break;\n+ case 'en':\n+ $result = $paymentRegion == 'us' ? self::LANG_US : self::LANG_UK;\n+ break;\n+ }\n+ if (!isset($result)) {\n+ switch ($paymentRegion) {\n+ case 'jp':\n+ $result = self::LANG_JA;\n+ break;\n+ case 'us':\n+ $result = self::LANG_US;\n+ break;\n+ default:\n+ $result = self::LANG_UK;\n+ break;\n+ }\n+ }\n+ return $result;\n+ }\n+\n/**\n* @return string\n*/\n@@ -68,7 +119,7 @@ class Config extends \\Magento\\Framework\\View\\Element\\Template\n'region' => $this->amazonConfig->getRegion(),\n'currency' => $this->amazonConfig->getCurrencyCode(),\n'sandbox' => $this->amazonConfig->isSandboxEnabled(),\n- 'language' => $this->localeResolver->getLocale(),\n+ 'language' => $this->getLanguage(),\n'placement' => 'Cart',\n'code' => \\Amazon\\PayV2\\Gateway\\Config\\Config::CODE,\n'is_method_available' => $this->amazonConfig->isPayButtonAvailableAsPaymentMethod(),\n" } ]

[ { "change_type": "DELETE", "old_path": "src/PayV2/Test/Mftf/Data/AmazonPaymentData.xml", "new_path": null, "diff": "-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<entities xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd\">\n- <entity name=\"AmazonPayment\" type=\"amazon_payment\">\n- <data key=\"v1MethodName\">Amazon Pay</data>\n- <data key=\"v2MethodName\">AmazonPay</data>\n- </entity>\n-</entities>\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Test/Mftf/Section/AmazonCheckoutSection.xml", "new_path": "src/PayV2/Test/Mftf/Section/AmazonCheckoutSection.xml", "diff": "<element name=\"shippingAddress\" type=\"text\" selector=\"#checkout-step-shipping .shipping-address-item.selected-item\"/>\n<element name=\"countryNameByCode\" type=\"text\" selector=\"select[name=country_id] option[value={{country_code}}]\" parameterized=\"true\"/>\n<element name=\"editShippingButton\" type=\"button\" selector=\"#checkout-step-shipping .shipping-address-item.selected-item .edit-address-link\"/>\n+ <element name=\"v1Method\" type=\"input\" selector=\"#amazonlogin\"/>\n+ <element name=\"v2Method\" type=\"input\" selector=\"#amazon_payment_v2\"/>\n</section>\n</sections>\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Test/Mftf/Test/AmazonButtonTest.xml", "new_path": "src/PayV2/Test/Mftf/Test/AmazonButtonTest.xml", "diff": "<argument name=\"shippingMethod\" value=\"Flat Rate\"/>\n</actionGroup>\n<!--Verify only Amazon Payment Button V1 is present-->\n- <click selector=\"{{CheckoutPaymentSection.paymentMethodByName(AmazonPayment.v1MethodName)}}\" stepKey=\"selectEnabledAmazonPaymentMethod\"/>\n+ <click selector=\"{{AmazonCheckoutSection.v1Method}}\" stepKey=\"selectEnabledAmazonPaymentMethod\"/>\n<seeElement selector=\"{{AmazonButtonSection.v1Payment}}\" stepKey=\"seeEnabledAmazonButton\"/>\n- <dontSee selector=\"{{CheckoutPaymentSection.paymentMethodByName(AmazonPayment.v2MethodName)}}\" stepKey=\"dontSeeDisabledAmazonPaymentMethod\"/>\n+ <dontSee selector=\"{{AmazonCheckoutSection.v2Method}}\" stepKey=\"dontSeeDisabledAmazonPaymentMethod\"/>\n<dontSeeElement selector=\"{{AmazonButtonSection.v2Payment}}\" stepKey=\"dontSeeDisabledAmazonButton\"/>\n</test>\n<test name=\"PaymentAmazonButtonV2\">\n<argument name=\"shippingMethod\" value=\"Flat Rate\"/>\n</actionGroup>\n<!--Verify only Amazon Payment Button V2 is present-->\n- <click selector=\"{{CheckoutPaymentSection.paymentMethodByName(AmazonPayment.v2MethodName)}}\" stepKey=\"selectEnabledAmazonPaymentMethod\"/>\n+ <click selector=\"{{AmazonCheckoutSection.v2Method}}\" stepKey=\"selectEnabledAmazonPaymentMethod\"/>\n<seeElement selector=\"{{AmazonButtonSection.v2Payment}}\" stepKey=\"seeEnabledAmazonButton\"/>\n- <dontSee selector=\"{{CheckoutPaymentSection.paymentMethodByName(AmazonPayment.v1MethodName)}}\" stepKey=\"dontSeeDisabledAmazonPaymentMethod\"/>\n+ <dontSee selector=\"{{AmazonCheckoutSection.v1Method}}\" stepKey=\"dontSeeDisabledAmazonPaymentMethod\"/>\n<dontSeeElement selector=\"{{AmazonButtonSection.v1Payment}}\" stepKey=\"dontSeeDisabledAmazonButton\"/>\n</test>\n</tests>\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Test/Mftf/Test/AmazonCheckoutTest.xml", "new_path": "src/PayV2/Test/Mftf/Test/AmazonCheckoutTest.xml", "diff": "<waitForPageLoad stepKey=\"waitForCheckoutPaymentPageLoad\"/>\n<!--Verify only Amazon Pay method is visible-->\n<seeNumberOfElements selector=\"{{CheckoutPaymentSection.availablePaymentSolutions}}\" userInput=\"1\" stepKey=\"seeSingleAvailablePaymentSolution\"/>\n- <seeElement selector=\"{{CheckoutPaymentSection.paymentMethodByName(AmazonPayment.v2MethodName)}}\" stepKey=\"seeAmazonPaymentMethod\"/>\n+ <seeElement selector=\"{{AmazonCheckoutSection.v2Method}}\" stepKey=\"seeAmazonPaymentMethod\"/>\n<!--Place order-->\n<actionGroup ref=\"CheckoutPlaceOrderActionGroup\" stepKey=\"guestPlaceorder\">\n<argument name=\"orderNumberMessage\" value=\"CONST.successGuestCheckoutOrderNumberMessage\" />\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/Model/AmazonConfig.php", "new_path": "src/PayV2/Model/AmazonConfig.php", "diff": "@@ -293,6 +293,19 @@ class AmazonConfig\n);\n}\n+ /**\n+ * @param string $scope\n+ * @param string $scopeCode\n+ * @return boolean\n+ */\n+ public function isBillingAddressEditable($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n+ {\n+ return in_array($this->getPaymentRegion($scope, $scopeCode), [\n+ 'de',\n+ 'uk',\n+ ]);\n+ }\n+\n/**\n* Return Private Key\n*\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/Plugin/CheckoutProcessor.php", "new_path": "src/PayV2/Plugin/CheckoutProcessor.php", "diff": "@@ -72,6 +72,7 @@ class CheckoutProcessor\n$paymentConfig['children']['payments-list']['component'] = 'Amazon_PayV2/js/view/payment/list';\n$paymentConfig['children']['payments-list']['children'][\\Amazon\\PayV2\\Gateway\\Config\\Config::CODE . '-form']['component'] = 'Amazon_PayV2/js/view/billing-address';\n+ $paymentConfig['children']['payments-list']['children'][\\Amazon\\PayV2\\Gateway\\Config\\Config::CODE . '-form']['isAddressEditable'] = $this->amazonConfig->isBillingAddressEditable();\nunset($paymentConfig['children']['renders']['children']['amazonlogin']); // legacy\n} else {\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "new_path": "src/PayV2/view/frontend/web/js/view/billing-address.js", "diff": "define([\n'jquery',\n'Magento_Checkout/js/view/billing-address',\n- 'Magento_Checkout/js/model/quote',\n'Amazon_PayV2/js/action/toggle-form-fields',\n'Amazon_PayV2/js/model/storage',\n'Amazon_PayV2/js/model/billing-address/form-address-state'\n-], function ($, Component, quote, toggleFormFields, amazonStorage, billingFormAddressState) {\n+], function ($, Component, toggleFormFields, amazonStorage, billingFormAddressState) {\n'use strict';\nvar self;\n@@ -20,11 +19,15 @@ define([\nname: 'Amazon_PayV2/billing-address/form',\nafterRender: function () {\nself.triggerBillingDataValidateEvent();\n- var isValid = toggleFormFields(formSelector, false);\n+ var isValid = toggleFormFields(formSelector, !self.isAddressEditable);\nbillingFormAddressState.isValid(isValid);\n+ self.isAddressFormVisible(!isValid);\n+ if (self.isAddressEditable) {\nself.isAddressDetailsVisible(isValid);\n}\n+ }\n},\n+ isAddressEditable: true,\n},\n/**\n@@ -44,9 +47,27 @@ define([\n}\n},\n+ editAddress: function () {\n+ this._super();\n+ this.isAddressFormVisible(true);\n+ },\n+\n+ cancelAddressEdit: function () {\n+ this._super();\n+ this.isAddressFormVisible(false);\n+ },\n+\nupdateAddress: function () {\nthis._super();\n- billingFormAddressState.isValid(!this.source.get('params.invalid'));\n+ var isValid = !this.source.get('params.invalid');\n+ if (this.isAddressEditable) {\n+ this.isAddressFormVisible(!isValid);\n+ }\n+ billingFormAddressState.isValid(isValid);\n+ },\n+\n+ canUseCancelBillingAddress: function () {\n+ return this.isAddressEditable ? this._super() : false;\n},\nbindEditPaymentAction: function (elem) {\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/billing-address.html", "new_path": "src/PayV2/view/frontend/web/template/billing-address.html", "diff": "<div class=\"checkout-billing-address\">\n<render args=\"detailsTemplate\"/>\n- <fieldset class=\"fieldset\" data-bind=\"visible: !isAddressDetailsVisible()\">\n+ <fieldset class=\"fieldset\" data-bind=\"visible: isAddressFormVisible()\">\n<render args=\"formTemplate\"/>\n<render args=\"actionsTemplate\"/>\n</fieldset>\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/template/billing-address/details.html", "new_path": "src/PayV2/view/frontend/web/template/billing-address/details.html", "diff": "data-bind=\"afterRender: bindEditPaymentAction($element)\">\n<span translate=\"'Edit Payment Method'\"></span>\n</button>\n- <button class=\"action action-edit-address\"\n+ <button if=\"isAddressEditable\"\n+ class=\"action action-edit-address\"\ntype=\"button\"\nclick=\"editAddress\">\n<span translate=\"'Edit Billing Address'\"></span>\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-magento-2-module\",\n\"description\": \"Official Magento2 Plugin to integrate with Amazon Pay V2\",\n\"type\": \"magento2-module\",\n- \"version\": \"2.0.1\",\n+ \"version\": \"2.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/composer.json", "new_path": "src/PayV2/composer.json", "diff": "\"name\": \"amzn/amazon-pay-v2-module\",\n\"description\": \"Amazon Pay V2 module\",\n\"type\": \"magento2-module\",\n- \"version\": \"2.0.1\",\n+ \"version\": \"2.0.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/PayV2/etc/module.xml", "new_path": "src/PayV2/etc/module.xml", "diff": "*/\n-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Module/etc/module.xsd\">\n- <module name=\"Amazon_PayV2\" setup_version=\"2.0.1\" >\n+ <module name=\"Amazon_PayV2\" setup_version=\"2.0.2\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/PayV2/view/frontend/web/js/action/checkout-session-address-load.js", "new_path": "src/PayV2/view/frontend/web/js/action/checkout-session-address-load.js", "diff": "*/\ndefine([\n- 'Amazon_PayV2/js/model/storage',\n+ 'Magento_Checkout/js/model/quote',\n'mage/storage',\n'Magento_Checkout/js/model/url-builder',\n'Magento_Checkout/js/model/full-screen-loader',\n'Magento_Checkout/js/model/error-processor'\n-], function (amazonStorage, storage, urlBuilder, fullScreenLoader, errorProcessor) {\n+], function (quote, storage, urlBuilder, fullScreenLoader, errorProcessor) {\n'use strict';\nreturn function (addressType, callback) {\n- var serviceUrl = urlBuilder.createUrl('/amazon-v2-checkout-session/:amazonCheckoutSessionId/' + addressType + '-address', {\n- amazonCheckoutSessionId: amazonStorage.getCheckoutSessionId()\n+ var serviceUrl = urlBuilder.createUrl('/amazon-v2-checkout-session/:cartId/' + addressType + '-address', {\n+ cartId: quote.getQuoteId()\n});\nfullScreenLoader.startLoader();\n" } ]