Datasets:

JetBrains-Research

/

commit-chronicle

like 5

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/template/checkout-button.html", "new_path": "src/Payment/view/frontend/web/template/checkout-button.html", "diff": "<!-- ko ifnot: (isAmazonAccountLoggedIn) -->\n<div class=\"amazon-button-container\">\n<div class=\"amazon-button-container__cell\">\n- <div id=\"PayWithAmazon\" class=\"login-with-amazon\" data-bind=\"mageInit: {'amazonButton':{'buttonType': 'PwA'}}\"></div>\n+ <div class=\"login-with-amazon\" data-bind=\"attr: {id: 'PayWithAmazon_' + displayArea}, mageInit: {'amazonButton':{'buttonType': 'PwA'}}\"></div>\n</div>\n<div class=\"amazon-button-container__cell\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Block/Adminhtml/System/Config/Form/Version.php", "new_path": "src/Core/Block/Adminhtml/System/Config/Form/Version.php", "diff": "namespace Amazon\\Core\\Block\\Adminhtml\\System\\Config\\Form;\nuse Magento\\Backend\\Block\\Template\\Context;\n-use Magento\\Framework\\Module\\ModuleListInterface;\n+use Amazon\\Core\\Helper\\Data as CoreHelper;\nclass Version extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\n{\n- const MODULE_AMAZON_CORE = 'Amazon_Core';\n- const MODULE_AMAZON_LOGIN = 'Amazon_Login';\n- const MODULE_AMAZON_PAYMENT = 'Amazon_Payment';\n-\n/**\n- * @var ModuleListInterface\n+ * @var CoreHelper\n*/\n- protected $_moduleList;\n+ protected $coreHelper;\n/**\n* Version constructor.\n- * @param ModuleListInterface $moduleList\n+ * @param CoreHelper $coreHelper\n* @param Context $context\n* @param array $data\n*/\npublic function __construct(\n- ModuleListInterface $moduleList,\n+ CoreHelper $coreHelper,\nContext $context,\narray $data = []\n) {\n- $this->_moduleList = $moduleList;\n+ $this->coreHelper = $coreHelper;\nparent::__construct($context, $data);\n}\n@@ -37,26 +33,13 @@ class Version extends \\Magento\\Config\\Block\\System\\Config\\Form\\Field\n*/\npublic function render(\\Magento\\Framework\\Data\\Form\\Element\\AbstractElement $element)\n{\n+ $version = $this->coreHelper->getVersion();\n+ if (!$version) {\n+ $version = __('--');\n+ }\n$output = '<div style=\"background-color:#eee;padding:1em;border:1px solid #ddd;\">';\n- $output .= __('Module version') . ': ' . $this->getVersion(self::MODULE_AMAZON_CORE);\n+ $output .= __('Module version') . ': ' . $version;\n$output .= \"</div>\";\nreturn $output;\n}\n-\n- /**\n- * @param $module\n- * @return \\Magento\\Framework\\Phrase\n- */\n- protected function getVersion($module)\n- {\n- /*\n- $version = $this->_moduleList->getOne($module);\n- if ($version && isset($version['setup_version'])) {\n- return $version['setup_version'];\n- } else {\n- return __('--');\n- }\n- */\n- return \"1.1.3\";\n- }\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Helper/Data.php", "new_path": "src/Core/Helper/Data.php", "diff": "@@ -20,6 +20,7 @@ use Magento\\Framework\\App\\Helper\\Context;\nuse Magento\\Framework\\Encryption\\EncryptorInterface;\nuse Magento\\Store\\Model\\ScopeInterface;\nuse Magento\\Store\\Model\\StoreManagerInterface;\n+use Magento\\Framework\\Module\\ModuleListInterface;\nclass Data extends AbstractHelper\n{\n@@ -76,18 +77,27 @@ class Data extends AbstractHelper\nprivate $clientIpHelper;\n/**\n+ * @var ModuleListInterface\n+ */\n+ protected $moduleList;\n+\n+ /**\n+ * Data constructor.\n+ * @param ModuleListInterface $moduleList\n* @param Context $context\n* @param EncryptorInterface $encryptor\n* @param StoreManagerInterface $storeManager\n* @param ClientIp $clientIpHelper\n*/\npublic function __construct(\n+ ModuleListInterface $moduleList,\nContext $context,\nEncryptorInterface $encryptor,\nStoreManagerInterface $storeManager,\nClientIp $clientIpHelper\n) {\nparent::__construct($context);\n+ $this->moduleList = $moduleList;\n$this->encryptor = $encryptor;\n$this->storeManager = $storeManager;\n$this->clientIpHelper = $clientIpHelper;\n@@ -680,4 +690,14 @@ class Data extends AbstractHelper\n{\nreturn $this->amazonCredentialsEncryptedFields;\n}\n+\n+ public function getVersion()\n+ {\n+ $version = $this->moduleList->getOne('Amazon_Core');\n+ if ($version && isset($version['setup_version'])) {\n+ return $version['setup_version'];\n+ } else {\n+ return null;\n+ }\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Model/Config/SimplePath.php", "new_path": "src/Core/Model/Config/SimplePath.php", "diff": "namespace Amazon\\Core\\Model\\Config;\n-use Amazon\\Core\\Helper\\Data;\n+use Amazon\\Core\\Helper\\Data as CoreHelper;\nuse Magento\\Framework\\App\\State;\nuse Magento\\Framework\\App\\Cache\\Type\\Config as CacheTypeConfig;\nuse Magento\\Backend\\Model\\UrlInterface;\n@@ -35,16 +35,18 @@ class SimplePath\nprotected $_scope;\nprotected $_scopeId;\n+ protected $coreHelper;\n+\n/**\n* SimplePath constructor.\n*/\npublic function __construct(\n+ CoreHelper $coreHelper,\n\\Magento\\Framework\\App\\Config\\ConfigResource\\ConfigInterface $config,\n\\Magento\\Framework\\App\\Config\\ScopeConfigInterface $scopeConfig,\n\\Magento\\Framework\\App\\ProductMetadataInterface $productMeta,\n\\Magento\\Framework\\Encryption\\EncryptorInterface $encryptor,\n\\Magento\\Framework\\Message\\ManagerInterface $messageManager,\n- \\Magento\\Framework\\Module\\ModuleListInterface $moduleList,\n\\Magento\\Framework\\App\\ResourceConnection $connection,\n\\Magento\\Framework\\App\\Cache\\Manager $cacheManager,\n\\Magento\\Framework\\App\\Request\\Http $request,\n@@ -55,7 +57,7 @@ class SimplePath\n\\Psr\\Log\\LoggerInterface $logger\n)\n{\n-\n+ $this->coreHelper = $coreHelper;\n$this->config = $config;\n$this->scopeConfig = $scopeConfig;\n$this->productMeta = $productMeta;\n@@ -63,7 +65,6 @@ class SimplePath\n$this->backendUrl = $backendUrl;\n$this->cacheManager = $cacheManager;\n$this->connection = $connection;\n- $this->moduleList = $moduleList;\n$this->state = $state;\n$this->request = $request;\n$this->storeManager = $storeManager;\n@@ -384,8 +385,10 @@ class SimplePath\n}\n$urlArray = array_unique($urlArray);\n- $version = $this->moduleList->getOne('Amazon_Core');\n- $coreVersion = ($version && isset($version['setup_version'])) ? $version['setup_version'] : '--';\n+ $coreVersion = $this->coreHelper->getVersion();\n+ if (!$coreVersion) {\n+ $coreVersion = '--';\n+ }\n$currency = $this->getConfig('currency/options/default');\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Setup/UpgradeSchema.php", "new_path": "src/Payment/Setup/UpgradeSchema.php", "diff": "@@ -21,6 +21,7 @@ use Amazon\\Payment\\Model\\ResourceModel\\OrderLink;\nuse Amazon\\Payment\\Model\\ResourceModel\\PendingAuthorization;\nuse Amazon\\Payment\\Model\\ResourceModel\\PendingCapture;\nuse Amazon\\Payment\\Model\\ResourceModel\\QuoteLink;\n+use Amazon\\Payment\\Api\\Data\\PendingRefundInterface;\nuse Magento\\Eav\\Setup\\EavSetup;\nuse Magento\\Framework\\App\\ObjectManager;\nuse Magento\\Framework\\DB\\Adapter\\AdapterInterface;\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Observer/CompleteOrder.php", "new_path": "src/Payment/Observer/CompleteOrder.php", "diff": "@@ -55,7 +55,12 @@ class CompleteOrder implements ObserverInterface\n}\nif ($order->getState() == Order::STATE_COMPLETE &&\n- $order->getStoredData()[OrderInterface::STATE] != Order::STATE_COMPLETE) {\n+ ($order->isObjectNew() || (\n+ array_key_exists(OrderInterface::STATE, $order->getStoredData()) &&\n+ $order->getStoredData()[OrderInterface::STATE] != Order::STATE_COMPLETE\n+ )\n+ )\n+ ) {\n$this->closeOrderReference($order);\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\": \"1.1.3\",\n+ \"version\": \"1.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"1.1.3\",\n+ \"version\": \"1.1.4\",\n\"license\": [\n\"Apache-2.0\"\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\": \"1.1.3\",\n+ \"version\": \"1.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": "<?xml version=\"1.0\"?>\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=\"1.0.1\">\n+ <module name=\"Amazon_Core\" setup_version=\"1.1.4\">\n<sequence>\n<module name=\"Magento_Config\" />\n<module name=\"Magento_Store\" />\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\": \"1.1.3\",\n+ \"version\": \"1.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"1.1.3\",\n+ \"version\": \"1.1.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Helper/Email.php", "new_path": "src/Payment/Helper/Email.php", "diff": "@@ -74,9 +74,9 @@ class Email extends AbstractHelper\n$order->getStoreId()\n);\n- $storeName = $this->coreHelper->getStoreName(ScopeInterface::SCOPE_STORE, $order->getStoreId());\n+ $storeName = $this->amazonCoreHelper->getStoreName(ScopeInterface::SCOPE_STORE, $order->getStoreId());\nif (!$storeName) {\n- $storeName = $this->coreHelper->getStoreFrontName($order->getStoreId());\n+ $storeName = $this->amazonCoreHelper->getStoreFrontName($order->getStoreId());\n}\n$vars = [\n@@ -99,9 +99,9 @@ class Email extends AbstractHelper\n{\n$emailTransportBuilder = $this->emailTransportBuilderFactory->create();\n- $storeName = $this->coreHelper->getStoreName(ScopeInterface::SCOPE_STORE, $order->getStoreId());\n+ $storeName = $this->amazonCoreHelper->getStoreName(ScopeInterface::SCOPE_STORE, $order->getStoreId());\nif (!$storeName) {\n- $storeName = $this->coreHelper->getStoreFrontName($order->getStoreId());\n+ $storeName = $this->amazonCoreHelper->getStoreFrontName($order->getStoreId());\n}\n$emailTransportBuilder->addTo($order->getCustomerEmail(), $order->getCustomerName());\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\": \"1.1.4\",\n+ \"version\": \"1.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"1.1.4\",\n+ \"version\": \"1.1.5\",\n\"license\": [\n\"Apache-2.0\"\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\": \"1.1.4\",\n+ \"version\": \"1.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": "<?xml version=\"1.0\"?>\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=\"1.1.4\">\n+ <module name=\"Amazon_Core\" setup_version=\"1.1.5\">\n<sequence>\n<module name=\"Magento_Config\" />\n<module name=\"Magento_Store\" />\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\": \"1.1.4\",\n+ \"version\": \"1.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"1.1.4\",\n+ \"version\": \"1.1.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/ResourceModel/PendingRefund.php", "new_path": "src/Payment/Model/ResourceModel/PendingRefund.php", "diff": "namespace Amazon\\Payment\\Model\\ResourceModel;\nuse Amazon\\Payment\\Api\\Data\\PendingRefundInterface;\n-use Amazon\\Payment\\Setup\\Table\\AmazonPendingRefund as AmazonPendingRefundTable;\n+use Amazon\\Payment\\Setup\\UpgradeSchema as AmazonSchemaHelper;\nuse Magento\\Framework\\Model\\ResourceModel\\Db\\AbstractDb;\nclass PendingRefund extends AbstractDb\n{\n- const TABLE_NAME = AmazonPendingRefundTable::TABLE_NAME;\n+ const TABLE_NAME = AmazonSchemaHelper::PENDING_REFUND_TABLE_NAME;\nprotected function _construct()\n{\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Helper/Data.php", "new_path": "src/Payment/Helper/Data.php", "diff": "@@ -39,13 +39,4 @@ class Data extends AbstractHelper\nparent::__construct($context);\n$this->moduleList = $moduleList;\n}\n-\n- /**\n- * @return string\n- */\n- public function getModuleVersion()\n- {\n- // there is a similar function here: src/Core/Block/Adminhtml/System/Config/Form/Version.php, please update in parallel\n- return \"1.1.3\";\n- }\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/OrderInformationManagement.php", "new_path": "src/Payment/Model/OrderInformationManagement.php", "diff": "@@ -22,7 +22,6 @@ use Amazon\\Payment\\Api\\Data\\QuoteLinkInterfaceFactory;\nuse Amazon\\Payment\\Api\\OrderInformationManagementInterface;\nuse Amazon\\Payment\\Domain\\AmazonSetOrderDetailsResponse;\nuse Amazon\\Payment\\Domain\\AmazonSetOrderDetailsResponseFactory;\n-use Amazon\\Payment\\Helper\\Data as PaymentHelper;\nuse Exception;\nuse Magento\\Checkout\\Model\\Session;\nuse Magento\\Framework\\App\\ProductMetadata;\n@@ -45,11 +44,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n*/\nprotected $clientFactory;\n- /**\n- * @var PaymentHelper\n- */\n- protected $paymentHelper;\n-\n/**\n* @var CoreHelper\n*/\n@@ -78,7 +72,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n/**\n* @param Session $session\n* @param ClientFactoryInterface $clientFactory\n- * @param PaymentHelper $paymentHelper\n* @param CoreHelper $coreHelper\n* @param AmazonSetOrderDetailsResponseFactory $amazonSetOrderDetailsResponseFactory\n* @param QuoteLinkInterfaceFactory $quoteLinkFactory\n@@ -88,7 +81,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\npublic function __construct(\nSession $session,\nClientFactoryInterface $clientFactory,\n- PaymentHelper $paymentHelper,\nCoreHelper $coreHelper,\nAmazonSetOrderDetailsResponseFactory $amazonSetOrderDetailsResponseFactory,\nQuoteLinkInterfaceFactory $quoteLinkFactory,\n@@ -97,7 +89,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n) {\n$this->session = $session;\n$this->clientFactory = $clientFactory;\n- $this->paymentHelper = $paymentHelper;\n$this->coreHelper = $coreHelper;\n$this->amazonSetOrderDetailsResponseFactory = $amazonSetOrderDetailsResponseFactory;\n$this->quoteLinkFactory = $quoteLinkFactory;\n@@ -131,7 +122,7 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n'store_name' => $storeName,\n'custom_information' =>\n'Magento Version : ' . $this->productMetadata->getVersion() . ' ' .\n- 'Plugin Version : ' . $this->paymentHelper->getModuleVersion()\n+ 'Plugin Version : ' . $this->coreHelper->getVersion()\n,\n'platform_id' => 'A2ZAYEJU54T1BM'\n];\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~5.6.0|7.0.2|~7.0.6\",\n- \"magento/framework\": \"^100.1.0\",\n- \"magento/module-sales\": \"^100.1.0\",\n- \"magento/module-checkout\": \"^100.1.0\",\n- \"magento/module-payment\": \"^100.1.0\",\n- \"magento/module-eav\": \"^100.1.0\",\n- \"magento/module-developer\": \"^100.1.0\",\n- \"magento/module-config\": \"^100.1.0\",\n- \"magento/module-backend\": \"^100.1.0\",\n- \"magento/module-quote\": \"^100.1.0\",\n- \"magento/module-customer\": \"^100.1.0\",\n- \"magento/module-store\": \"^100.1.0\",\n+ \"magento/framework\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-sales\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-checkout\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-payment\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-eav\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-developer\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-config\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-backend\": \"^100.1.0|100.2.0\",\n+ \"magento/module-quote\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-customer\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-store\": \"^100.1.0|^100.2.0\",\n\"amzn/amazon-pay-sdk-php\": \"^3.1.0\"\n},\n\"require-dev\": {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/adminhtml/system.xml", "new_path": "src/Core/etc/adminhtml/system.xml", "diff": "<field id=\"packstation_terms_validation_switch\">1</field>\n</depends>\n</field>\n- <field id=\"excluded_categories\" translate=\"label comment\" type=\"Amazon\\Core\\Block\\Adminhtml\\Form\\Field\\CategoryMultiselect\" sortOrder=\"30\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Excluded Categories</label>\n- <config_path>payment/amazon_payment/excluded_categories</config_path>\n- <comment><![CDATA[The \"Amazon Pay \" button will not be available for products of the selected categories.]]></comment>\n- </field>\n</group>\n<group id=\"developer_options\" translate=\"label\" type=\"text\" sortOrder=\"40\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n<label>Developer Options</label>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/adminhtml/system.xml", "new_path": "src/Core/etc/adminhtml/system.xml", "diff": "<config_path>payment/amazon_payment/storename</config_path>\n</field>\n</group>\n- <group id=\"sales_exclusions\" translate=\"label\" type=\"text\" sortOrder=\"30\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Sales Exclusions</label>\n- <field id=\"packstation_terms_validation_switch\" translate=\"label\" type=\"select\" sortOrder=\"10\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Is Packing Stations Terms Validation Enabled</label>\n- <source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n- <config_path>payment/amazon_payment/packstation_terms_validation_enabled</config_path>\n- </field>\n- <field id=\"packstation_terms\" translate=\"label comment\" type=\"text\" sortOrder=\"20\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Packing Stations Terms</label>\n- <config_path>payment/amazon_payment/packstation_terms</config_path>\n- <comment><![CDATA[A comma-separated list of case-insensitive terms which will be used to check whether a Customer Address is a locker or packing station.]]></comment>\n- <depends>\n- <field id=\"packstation_terms_validation_switch\">1</field>\n- </depends>\n- </field>\n- </group>\n<group id=\"developer_options\" translate=\"label\" type=\"text\" sortOrder=\"40\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n<label>Developer Options</label>\n<field id=\"logging\" translate=\"label\" type=\"select\" sortOrder=\"10\" showInDefault=\"1\" showInWebsite=\"0\" showInStore=\"0\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "diff": "@@ -8,7 +8,8 @@ define(\n'Amazon_Payment/js/model/storage',\n'mage/storage',\n'Magento_Checkout/js/model/error-processor',\n- 'Magento_Checkout/js/model/url-builder'\n+ 'Magento_Checkout/js/model/url-builder',\n+ 'Magento_Checkout/js/model/full-screen-loader'\n],\nfunction (\n$,\n@@ -18,7 +19,8 @@ define(\namazonStorage,\nstorage,\nerrorProcessor,\n- urlBuilder\n+ urlBuilder,\n+ fullScreenLoader\n) {\n'use strict';\n@@ -35,15 +37,18 @@ define(\nthis._super();\n},\nrevertCheckout: function () {\n+ fullScreenLoader.startLoader();\nvar serviceUrl = urlBuilder.createUrl('/amazon/order-ref', {});\nstorage.delete(\nserviceUrl\n).done(\nfunction () {\namazonStorage.amazonlogOut();\n+ window.location.reload();\n}\n).fail(\nfunction (response) {\n+ fullScreenLoader.stopLoader();\nerrorProcessor.process(response);\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\": \"1.2.0\",\n+ \"version\": \"1.2.1\",\n\"license\": [\n\"Apache-2.0\"\n],\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:^1.2.0`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.2.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:^1.2.0` will always instal 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:^1.2.1` will always instal 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\": \"1.2.0\",\n+ \"version\": \"1.2.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"amzn/amazon-pay-sdk-php\": \"^3.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.0\",\n- \"amzn/login-with-amazon-module\": \"1.2.0\",\n- \"amzn/amazon-pay-module\": \"1.2.0\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.1\",\n+ \"amzn/login-with-amazon-module\": \"1.2.1\",\n+ \"amzn/amazon-pay-module\": \"1.2.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\": \"1.2.0\",\n+ \"version\": \"1.2.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": "<?xml version=\"1.0\"?>\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=\"1.2.0\">\n+ <module name=\"Amazon_Core\" setup_version=\"1.2.1\">\n<sequence>\n<module name=\"Magento_Config\" />\n<module name=\"Magento_Store\" />\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\": \"1.2.0\",\n+ \"version\": \"1.2.1\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"1.2.0\",\n+ \"version\": \"1.2.1\",\n\"license\": [\n\"Apache-2.0\"\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\": \"1.2.1\",\n+ \"version\": \"1.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\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:^1.2.1`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.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:^1.2.1` will always instal 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:^1.2.2` will always instal 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\": \"1.2.1\",\n+ \"version\": \"1.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"amzn/amazon-pay-sdk-php\": \"^3.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.1\",\n- \"amzn/login-with-amazon-module\": \"1.2.1\",\n- \"amzn/amazon-pay-module\": \"1.2.1\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.2\",\n+ \"amzn/login-with-amazon-module\": \"1.2.2\",\n+ \"amzn/amazon-pay-module\": \"1.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\": \"1.2.1\",\n+ \"version\": \"1.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"magento/framework\": \"^100.1.0\",\n- \"magento/module-config\": \"^100.1.0\",\n- \"magento/module-store\": \"^100.1.0\",\n- \"magento/module-developer\": \"^100.1.0\",\n- \"magento/module-quote\": \"^100.1.0\",\n+ \"magento/framework\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-developer\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-config\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-quote\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-store\": \"^100.1.0|^100.2.0\",\n\"amzn/amazon-pay-sdk-php\": \"^3.1.0\"\n},\n\"autoload\": {\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"1.2.1\">\n+ <module name=\"Amazon_Core\" setup_version=\"1.2.2\">\n<sequence>\n<module name=\"Magento_Config\" />\n<module name=\"Magento_Store\" />\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\": \"1.2.1\",\n+ \"version\": \"1.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.1.0\",\n- \"magento/module-customer\": \"^100.1.0\",\n- \"magento/module-checkout\": \"^100.1.0\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.2\",\n+ \"magento/module-checkout\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-customer\": \"^100.1.0|^101.0.0\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\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\": \"1.2.1\",\n+ \"version\": \"1.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.1.0\",\n- \"amzn/login-with-amazon-module\": \"^1.1.0\",\n- \"magento/module-eav\": \"^100.1.0\",\n- \"magento/module-sales\": \"^100.1.0\",\n- \"magento/module-quote\": \"^100.1.0\",\n- \"magento/module-payment\": \"^100.1.0\",\n- \"magento/module-backend\": \"^100.1.0\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.2\",\n+ \"amzn/login-with-amazon-module\": \"^1.2.2\",\n+ \"magento/module-sales\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-payment\": \"^100.1.0|^100.2.0\",\n+ \"magento/module-eav\": \"^100.1.0|^101.0.0\",\n+ \"magento/module-backend\": \"^100.1.0|100.2.0\",\n+ \"magento/module-quote\": \"^100.1.0|^101.0.0\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "\"magento/module-sales\": \"^100.1.0|^101.0.0\",\n\"magento/module-quote\": \"^100.1.0|^101.0.0\",\n\"magento/module-payment\": \"^100.1.0|^100.2.0\",\n- \"magento/module-backend\": \"^100.1.0|100.2.0\",\n+ \"magento/module-backend\": \"^100.1.0|100.2.0\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"license\": [\n\"Apache-2.0\"\n],\n- \"require\": {\n- \"magento/framework\": \"^100.1.0|^101.0.0\",\n- \"magento/module-sales\": \"^100.1.0|^101.0.0\",\n- \"magento/module-checkout\": \"^100.1.0|^100.2.0\",\n- \"magento/module-payment\": \"^100.1.0|^100.2.0\",\n- \"magento/module-eav\": \"^100.1.0|^101.0.0\",\n- \"magento/module-developer\": \"^100.1.0|^100.2.0\",\n- \"magento/module-config\": \"^100.1.0|^101.0.0\",\n- \"magento/module-backend\": \"^100.1.0|100.2.0\",\n- \"magento/module-quote\": \"^100.1.0|^101.0.0\",\n- \"magento/module-customer\": \"^100.1.0|^101.0.0\",\n- \"magento/module-store\": \"^100.1.0|^100.2.0\",\n- \"amzn/amazon-pay-sdk-php\": \"^3.1.0\"\n- },\n\"require-dev\": {\n\"guzzlehttp/guzzle\": \"^6.2.0\",\n\"phpunit/phpunit\": \"4.1.0\",\n" }, { "change_type": "MODIFY", "old_path": "marketplace-composer.json", "new_path": "marketplace-composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-sdk-php\": \"^3.1.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.4\",\n\"amzn/login-with-amazon-module\": \"1.2.4\",\n\"amzn/amazon-pay-module\": \"1.2.4\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/di.xml", "new_path": "src/Core/etc/di.xml", "diff": "<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:ObjectManager/etc/config.xsd\">\n<preference for=\"Amazon\\Core\\Client\\ClientFactoryInterface\" type=\"Amazon\\Core\\Client\\ClientFactory\" />\n<preference for=\"AmazonPay\\ClientInterface\" type=\"Amazon\\Core\\Client\\Client\" />\n- <type name=\"AmazonPay\\ClientInterface\">\n+ <type name=\"Amazon\\Core\\Client\\Client\">\n<arguments>\n<argument name=\"config\" xsi:type=\"array\" />\n</arguments>\n</argument>\n</arguments>\n</virtualType>\n- <type name=\"Amazon\\Core\\Client\\ClientFactoryInterface\">\n+ <type name=\"Amazon\\Core\\Client\\ClientFactory\">\n<arguments>\n<argument name=\"logger\" xsi:type=\"object\">amazonClientLogger</argument>\n</arguments>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/view/frontend/templates/amazon_payments_mark.phtml", "new_path": "src/Core/view/frontend/templates/amazon_payments_mark.phtml", "diff": "<?php if($block->isBadgeEnabled()): ?>\n<div class=\"amazon-payments-mark-container\">\n<div class=\"amazon-payments-mark _grad\">\n- <span class=\"text\"><?php /* @escapeNotVerified */ echo __('Amazon Pay'); ?></span>\n+ <span class=\"text\"><?php /* @noEscape */ echo __('Amazon Pay'); ?></span>\n</div>\n</div>\n<?php endif; ?>\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/frontend/templates/config.phtml", "new_path": "src/Core/view/frontend/templates/config.phtml", "diff": "?>\n<script>\n- window.amazonPayment = <?php /* @escapeNotVerified */ echo \\Zend_Json::encode($block->getConfig()); ?>;\n+ window.amazonPayment = <?php /* @noEscape */ echo \\Zend_Json::encode($block->getConfig()); ?>;\n</script>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/templates/form/validate.phtml", "new_path": "src/Login/view/frontend/templates/form/validate.phtml", "diff": "<div class=\"amazon-validate-container\">\n<div class=\"block block-amazon-validate\">\n<div class=\"block-title\">\n- <strong id=\"block-amazon-login-heading\" role=\"heading\" aria-level=\"2\"><?php /* @escapeNotVerified */ echo __('Welcome back!') ?></strong>\n+ <strong id=\"block-amazon-login-heading\" role=\"heading\" aria-level=\"2\"><?php /* @noEscape */ echo __('Welcome back!') ?></strong>\n</div>\n<div class=\"block-content\" aria-labelledby=\"block-amazon-login-heading\">\n- <p><?php /* @escapeNotVerified */ echo __('A shop account for this email address already exists. Please enter your shop accounts password to log in without leaving the shop.') ?></p>\n+ <p><?php /* @noEscape */ echo __('A shop account for this email address already exists. Please enter your shop accounts password to log in without leaving the shop.') ?></p>\n<form class=\"form password validate\"\n- action=\"<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/validatepost') ?>\"\n+ action=\"<?php echo $block->escapeUrl($block->getUrl('*/*/validatepost')) ?>\"\nmethod=\"post\"\nid=\"form-validate\"\ndata-mage-init='{\"validation\":{}}'>\n- <fieldset class=\"fieldset\" data-hasrequired=\"<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>\">\n+ <fieldset class=\"fieldset\" data-hasrequired=\"<?php /* @noEscape */ echo __('* Required Fields') ?>\">\n<div class=\"field email required\">\n- <label for=\"password\" class=\"label\"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>\n+ <label for=\"password\" class=\"label\"><span><?php /* @noEscape */ echo __('Password') ?></span></label>\n<div class=\"control\">\n<input type=\"password\" name=\"password\" alt=\"password\" id=\"password\" class=\"input-text\" value=\"\" data-validate=\"{required:true}\">\n</div>\n</div>\n<div class=\"actions-toolbar\">\n<div class=\"primary\">\n- <button type=\"submit\" class=\"action submit primary\"><span><?php /* @escapeNotVerified */ echo __('Ok') ?></span></button>\n+ <button type=\"submit\" class=\"action submit primary\"><span><?php /* @noEscape */ echo __('Ok') ?></span></button>\n</div>\n<div class=\"secondary continue-as-guest\">\n- <a class=\"action secondary\" href=\"<?php /* @escapeNotVerified */ echo $block->getContinueAsGuestUrl() ?>\"><span><?php /* @escapeNotVerified */ echo __('Continue as Guest') ?></span></a>\n+ <a class=\"action secondary\" href=\"<?php echo $block->escapeUrl($block->getContinueAsGuestUrl()) ?>\"><span><?php /* @noEscape */ echo __('Continue as Guest') ?></span></a>\n</div>\n<div class=\"secondary forgot-password\">\n- <a class=\"action secondary\" href=\"<?php /* @escapeNotVerified */ echo $block->getForgotPasswordUrl() ?>\"><span><?php /* @escapeNotVerified */ echo __('Forgot Your Password?') ?></span></a>\n+ <a class=\"action secondary\" href=\"<?php echo $block->escapeUrl($block->getForgotPasswordUrl()) ?>\"><span><?php /* @noEscape */ echo __('Forgot Your Password?') ?></span></a>\n</div>\n</div>\n</fieldset>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/templates/login.phtml", "new_path": "src/Login/view/frontend/templates/login.phtml", "diff": "<?php /** @var \\Amazon\\Login\\Block\\Login $block */?>\n<div class=\"block block-amazon-login\">\n<div class=\"block-title\">\n- <strong id=\"block-amazon-login-heading\" role=\"heading\" aria-level=\"2\"><?php /* @escapeNotVerified */ echo __('Login with Amazon') ?></strong>\n+ <strong id=\"block-amazon-login-heading\" role=\"heading\" aria-level=\"2\"><?php /* @noEscape */ echo __('Login with Amazon') ?></strong>\n</div>\n<div class=\"block-content\" aria-labelledby=\"block-amazon-login-heading\">\n- <p><?php /* @escapeNotVerified */ echo __('With Amazon Pay and Login with Amazon, you can easily sign-in and use the shipping and payment information stored in your Amazon account to place an order on this shop. ') ?></p>\n+ <p><?php /* @noEscape */ echo __('With Amazon Pay and Login with Amazon, you can easily sign-in and use the shipping and payment information stored in your Amazon account to place an order on this shop. ') ?></p>\n<div class=\"actions-toolbar\">\n<div class=\"primary\">\n<div class=\"amazon-button-container\">\n<div class=\"amazon-button-container__cell\">\n<div class=\"field-tooltip toggle\">\n<span class=\"field-tooltip-action action-help\" data-mage-init='{\"dropdown\": {\"activeClass\": \"_active\"}}' data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\"></span>\n- <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @escapeNotVerified */ echo __('Securely login into our website using your existing Amazon details.'); ?></div>\n+ <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @noEscape */ echo __('Securely login into our website using your existing Amazon details.'); ?></div>\n</div>\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/minicart-button.phtml", "new_path": "src/Payment/view/frontend/templates/minicart-button.phtml", "diff": "@@ -39,7 +39,7 @@ $tooltipConfig = [\n<div class=\"amazon-button-container__cell\">\n<div class=\"field-tooltip toggle\">\n<span class=\"field-tooltip-action action-help\" data-mage-init='<?php /* @noEscape */ echo json_encode($tooltipConfig); ?>' data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\"></span>\n- <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @escapeNotVerified */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n+ <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @noEscape */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n</div>\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/payment-link-product-page.phtml", "new_path": "src/Payment/view/frontend/templates/payment-link-product-page.phtml", "diff": "<div class=\"amazon-button-container__cell\">\n<div class=\"field-tooltip toggle\">\n<span class=\"field-tooltip-action action-help\" data-bind=\"mageInit: {'dropdown':{'activeClass': '_active'}}\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\"></span>\n- <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @escapeNotVerified */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n+ <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @noEscape */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n</div>\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/payment-link.phtml", "new_path": "src/Payment/view/frontend/templates/payment-link.phtml", "diff": "<div class=\"amazon-button-container__cell\">\n<div class=\"field-tooltip toggle\">\n<span class=\"field-tooltip-action action-help\" data-bind=\"mageInit: {'dropdown':{'activeClass': '_active'}}\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\"></span>\n- <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @escapeNotVerified */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n+ <div class=\"field-tooltip-content\" data-target=\"dropdown\" aria-hidden=\"true\"><?php /* @noEscape */ echo __('Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.'); ?></div>\n</div>\n</div>\n</div>\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/faq.rst", "new_path": "docs/faq.rst", "diff": "@@ -5,7 +5,7 @@ I am using a custom theme, what do I have to do?\n------------------------------------------------\nThe styles used are based on the Luma theme Magento provides. Especially responsive breakpoints and other variables, like `@screen__m`_, in the LESS files are defined by the Luma theme.\n-If your custom theme is based on Luma, you should be fine. If it isn't, you should define all the variables and `Responsive Breakpoints` used.\n+If your custom theme is based on the Magento themes Luma or Blank, you should be fine. If it isn't, you should define all the variables and `Responsive Breakpoints` used.\nMagento provides detailed information about `Responsive Breakpoints` and responsive design in general. See `responsive.html in the magento2 repository`_ (vendor/magento/magento2-base/lib/web/css/docs/responsive.html in your Magento 2 installation) for more detailed explanations.\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": "var AmazonSp = <?php echo $this->getAmazonSpJson(); ?>;\n-require([\"prototype\"], function(){\n+require(['uiRegistry', \"prototype\"], function(registry){\n// Country code for ID selectors\nvar co = AmazonSp.co.toLowerCase();\n@@ -104,7 +104,9 @@ require([\"prototype\"], function(){\n}\nvar popupWidth = this.action.indexOf('payments-eu') == -1 ? 768 : 1050;\n- window.launchPopup('', popupWidth, popupHeight);\n+\n+ var launchPopup = registry.get('launchPopup');\n+ launchPopup('', popupWidth, popupHeight);\n// Show fields and import\namazonFields.each(Element.show);\n@@ -220,10 +222,9 @@ require([\"jquery\", \"jquery/validate\"], function($) {\n</script>\n-\n<script>\n// Amazon Pop-up\n-(function () {\n+require(['uiRegistry'], function (registry) {\n'use strict';\nfunction launchPopup(url, requestedWidth, requestedHeight) {\n@@ -268,6 +269,9 @@ require([\"jquery\", \"jquery/validate\"], function($) {\n}\n}\n- window.launchPopup = launchPopup;\n-})();\n+ // window.launchPopup = launchPopup;\n+ registry.set('launchPopup', launchPopup);\n+\n+});\n</script>\n+\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/frontend/templates/config.phtml", "new_path": "src/Core/view/frontend/templates/config.phtml", "diff": "?>\n<script>\n- window.amazonPayment = <?php /* @noEscape */ echo \\Zend_Json::encode($block->getConfig()); ?>;\n+\n+require (['uiRegistry'], function(registry) {\n+ registry.set('amazonPayment', <?php /* @noEscape */ echo \\Zend_Json::encode($block->getConfig()); ?>);\n+});\n+\n</script>\n+\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "new_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "diff": "* permissions and limitations under the License.\n*/\n-if (window.amazonPayment.allowAmLoginLoading == true) {\n+var registry = require('uiRegistry');\n+var amazonPayment = registry.get('amazonPayment');\n+\n+if (amazonPayment.allowAmLoginLoading == true) {\ndefine(['require', 'Amazon_Login/js/view/login-button'], function (require) {\nreturn require(\"Amazon_Login/js/view/login-button\");\n});\n@@ -22,3 +25,4 @@ if (window.amazonPayment.allowAmLoginLoading == true) {\nreturn require(\"uiComponent\");\n});\n}\n+\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "new_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "diff": "* permissions and limitations under the License.\n*/\n-define([window.amazonPayment.widgetUrl], function () {\n+var registry = require('uiRegistry');\n+var amazonPayment = registry.get('amazonPayment');\n+\n+define([amazonPayment.widgetUrl], function () {\n//after amazon widgets file as loaded\n});\n+\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/model/amazonPaymentConfig.js", "new_path": "src/Payment/view/frontend/web/js/model/amazonPaymentConfig.js", "diff": "* permissions and limitations under the License.\n*/\ndefine(\n- [],\n- function () {\n+ ['uiRegistry'],\n+ function (registry) {\n'use strict';\n- var config = window.amazonPayment || {};\n+ var config = registry.get('amazonPayment') || {};\nreturn {\ngetValue: function (key, defaultValue) {\n@@ -28,7 +28,7 @@ define(\n}\n},\nisDefined: function () {\n- return window.amazonPayment !== undefined\n+ return registry.get('amazonPayment') !== undefined;\n}\n};\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "diff": "@@ -9,7 +9,8 @@ define(\n'mage/storage',\n'Magento_Checkout/js/model/error-processor',\n'Magento_Checkout/js/model/url-builder',\n- 'Magento_Checkout/js/model/full-screen-loader'\n+ 'Magento_Checkout/js/model/full-screen-loader',\n+ 'uiRegistry'\n],\nfunction (\n$,\n@@ -20,7 +21,8 @@ define(\nstorage,\nerrorProcessor,\nurlBuilder,\n- fullScreenLoader\n+ fullScreenLoader,\n+ registry\n) {\n'use strict';\n@@ -31,7 +33,7 @@ define(\ntemplate: 'Amazon_Payment/checkout-revert'\n},\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\n- isAmazonEnabled: ko.observable(window.amazonPayment.isPwaEnabled),\n+ isAmazonEnabled: ko.observable(registry.get('amazonPayment').isPwaEnabled),\ninitialize: function () {\nself = this;\nthis._super();\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-sandbox-simulator.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-sandbox-simulator.js", "diff": "@@ -5,13 +5,15 @@ define(\n'jquery',\n\"uiComponent\",\n'ko',\n- 'Amazon_Payment/js/model/storage'\n+ 'Amazon_Payment/js/model/storage',\n+ 'uiRegistry'\n],\nfunction (\n$,\nComponent,\nko,\n- amazonStorage\n+ amazonStorage,\n+ registry\n) {\n'use strict';\n@@ -22,9 +24,9 @@ define(\ntemplate: 'Amazon_Payment/checkout-sandbox-simulator'\n},\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\n- isSandboxEnabled: ko.observable(window.amazonPayment.isSandboxEnabled),\n+ isSandboxEnabled: ko.observable(registry.get('amazonPayment').isSandboxEnabled),\nsandboxSimulationReference: amazonStorage.sandboxSimulationReference,\n- sandboxSimulationOptions: ko.observableArray(window.amazonPayment.sandboxSimulationOptions),\n+ sandboxSimulationOptions: ko.observableArray(registry.get('amazonPayment').sandboxSimulationOptions),\ninitialize: function () {\nself = this;\nthis._super();\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": "@@ -18,7 +18,8 @@ define(\n'Magento_Checkout/js/model/error-processor',\n'Magento_Checkout/js/model/url-builder',\n'Magento_Checkout/js/checkout-data',\n- 'Magento_Checkout/js/model/checkout-data-resolver'\n+ 'Magento_Checkout/js/model/checkout-data-resolver',\n+ 'uiRegistry'\n],\nfunction (\n$,\n@@ -37,7 +38,8 @@ define(\nerrorProcessor,\nurlBuilder,\ncheckoutData,\n- checkoutDataResolver\n+ checkoutDataResolver,\n+ registry\n) {\n'use strict';\nvar self;\n@@ -47,13 +49,13 @@ define(\ntemplate: 'Amazon_Payment/checkout-widget-address'\n},\noptions: {\n- sellerId: window.amazonPayment.merchantId,\n+ sellerId: registry.get('amazonPayment').merchantId,\naddressWidgetDOMId: 'addressBookWidgetDiv',\n- widgetScope: window.amazonPayment.loginScope\n+ widgetScope: registry.get('amazonPayment').loginScope\n},\nisCustomerLoggedIn: customer.isLoggedIn,\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\n- isAmazonEnabled: ko.observable(window.amazonPayment.isPwaEnabled),\n+ isAmazonEnabled: ko.observable(registry.get('amazonPayment').isPwaEnabled),\nrates: shippingService.getShippingRates(),\ninitialize: function () {\nself = this;\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/notification.js", "new_path": "src/Payment/view/frontend/web/js/view/notification.js", "diff": "@@ -5,14 +5,16 @@ define(\n\"underscore\",\n'ko',\n'uiComponent',\n- 'Amazon_Payment/js/model/storage'\n+ 'Amazon_Payment/js/model/storage',\n+ 'uiRegistry'\n],\nfunction (\n$,\n_,\nko,\nComponent,\n- amazonStorage\n+ amazonStorage,\n+ registry\n) {\n'use strict';\n@@ -23,8 +25,8 @@ define(\ntemplate: 'Amazon_Payment/notification'\n},\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\n- chargeOnOrder: ko.observable(window.amazonPayment.chargeOnOrder),\n- isEuPaymentRegion: ko.observable(window.amazonPayment.isEuPaymentRegion),\n+ chargeOnOrder: ko.observable(registry.get('amazonPayment').chargeOnOrder),\n+ isEuPaymentRegion: ko.observable(registry.get('amazonPayment').isEuPaymentRegion),\ninitialize: function () {\nself = this;\nthis._super();\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": "@@ -16,7 +16,8 @@ define(\n'Magento_Checkout/js/action/select-billing-address',\n'Magento_Checkout/js/model/payment/additional-validators',\n'Magento_Checkout/js/model/url-builder',\n- 'amazonPaymentConfig'\n+ 'amazonPaymentConfig',\n+ 'uiRegistry'\n],\nfunction (\n$,\n@@ -35,7 +36,8 @@ define(\nselectBillingAddress,\nadditionalValidators,\nurlBuilder,\n- amazonPaymentConfig\n+ amazonPaymentConfig,\n+ registry\n) {\n'use strict';\n@@ -48,9 +50,9 @@ define(\n},\noptions: {\n- sellerId: window.amazonPayment.merchantId,\n+ sellerId: registry.get('amazonPayment').merchantId,\npaymentWidgetDOMId: 'walletWidgetDiv',\n- widgetScope: window.amazonPayment.loginScope\n+ widgetScope: registry.get('amazonPayment').loginScope\n},\nisCustomerLoggedIn: customer.isLoggedIn,\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/Controller/Login/Authorize.php", "new_path": "src/Login/Controller/Login/Authorize.php", "diff": "@@ -38,52 +38,52 @@ class Authorize extends Action\n/**\n* @var ClientFactoryInterface\n*/\n- protected $clientFactory;\n+ private $clientFactory;\n/**\n* @var CompositeMatcherInterface\n*/\n- protected $matcher;\n+ private $matcher;\n/**\n* @var CustomerManagerInterface\n*/\n- protected $customerManager;\n+ private $customerManager;\n/**\n* @var Session\n*/\n- protected $session;\n+ private $session;\n/**\n* @var AccountRedirect\n*/\n- protected $accountRedirect;\n+ private $accountRedirect;\n/**\n* @var AmazonCustomerFactory\n*/\n- protected $amazonCustomerFactory;\n+ private $amazonCustomerFactory;\n/**\n* @var LoggerInterface\n*/\n- protected $logger;\n+ private $logger;\n/**\n* @var AmazonCoreHelper\n*/\n- protected $amazonCoreHelper;\n+ private $amazonCoreHelper;\n/**\n* @var Url\n*/\n- protected $customerUrl;\n+ private $customerUrl;\n/**\n* @var AccessTokenRequestValidator\n*/\n- protected $accessTokenRequestValidator;\n+ private $accessTokenRequestValidator;\n/**\n* @param Context $context\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/Controller/Login/Authorize.php", "new_path": "src/Login/Controller/Login/Authorize.php", "diff": "@@ -38,52 +38,52 @@ class Authorize extends Action\n/**\n* @var ClientFactoryInterface\n*/\n- private $clientFactory;\n+ protected $clientFactory;\n/**\n* @var CompositeMatcherInterface\n*/\n- private $matcher;\n+ protected $matcher;\n/**\n* @var CustomerManagerInterface\n*/\n- private $customerManager;\n+ protected $customerManager;\n/**\n* @var Session\n*/\n- private $session;\n+ protected $session;\n/**\n* @var AccountRedirect\n*/\n- private $accountRedirect;\n+ protected $accountRedirect;\n/**\n* @var AmazonCustomerFactory\n*/\n- private $amazonCustomerFactory;\n+ protected $amazonCustomerFactory;\n/**\n* @var LoggerInterface\n*/\n- private $logger;\n+ protected $logger;\n/**\n* @var AmazonCoreHelper\n*/\n- private $amazonCoreHelper;\n+ protected $amazonCoreHelper;\n/**\n* @var Url\n*/\n- private $customerUrl;\n+ protected $customerUrl;\n/**\n* @var AccessTokenRequestValidator\n*/\n- private $accessTokenRequestValidator;\n+ protected $accessTokenRequestValidator;\n/**\n* @param Context $context\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/action/populate-shipping-address.js", "new_path": "src/Payment/view/frontend/web/js/action/populate-shipping-address.js", "diff": "@@ -36,7 +36,7 @@ define(\n$.extend({}, checkoutProvider.get('shippingAddress'), shippingAddressData)\n);\n});\n-\n+ $(\"#co-shipping-form\").css(\"display\", \"none\");\ncheckoutDataResolver.resolveShippingAddress();\n}\n@@ -45,16 +45,7 @@ define(\n* @private\n*/\nreturn function () {\n- //check to see if user is logged out of amazon (otherwise shipping form won't be in DOM)\n- if (!amazonStorage.isAmazonAccountLoggedIn) {\n- populateShippingForm();\n- }\n- //subscribe to logout and trigger shippingform population when logged out.\n- amazonStorage.isAmazonAccountLoggedIn.subscribe(function (loggedIn) {\n- if (!loggedIn) {\npopulateShippingForm();\n}\n- });\n- }\n}\n);\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": "@@ -19,7 +19,8 @@ define(\n'Magento_Checkout/js/model/url-builder',\n'Magento_Checkout/js/checkout-data',\n'Magento_Checkout/js/model/checkout-data-resolver',\n- 'uiRegistry'\n+ 'uiRegistry',\n+ 'Amazon_Payment/js/action/populate-shipping-address'\n],\nfunction (\n$,\n@@ -39,7 +40,8 @@ define(\nurlBuilder,\ncheckoutData,\ncheckoutDataResolver,\n- registry\n+ registry,\n+ populateShippingAddressAction\n) {\n'use strict';\nvar self;\n@@ -119,6 +121,7 @@ define(\n}\ncheckoutData.setShippingAddressFromData(addressConverter.quoteAddressToFormAddressData(addressData));\ncheckoutDataResolver.resolveEstimationAddress();\n+ populateShippingAddressAction();\n}\n).fail(\nfunction (response) {\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": "define([\n+ 'jquery',\n'uiComponent',\n'ko',\n'Amazon_Payment/js/model/storage'\n-], function (Component, ko, amazonStorage) {\n+], function ($, Component, ko, amazonStorage) {\n'use strict';\nreturn Component.extend({\ndefaults: {\ntemplate: 'Amazon_Payment/shipping-address/inline-form',\n- formSelector: 'co-shipping-form'\n+ formSelector: '#co-shipping-form'\n},\ninitObservable: function () {\nthis._super();\n@@ -21,9 +22,22 @@ define([\n},\nmanipulateInlineForm: function () {\nif (amazonStorage.isAmazonAccountLoggedIn()) {\n- var elem = document.getElementById(this.formSelector);\n+ var errorCount = 0;\n+ $(this.formSelector).find(\".field\").each(function () {\n+ if ($(this).hasClass('_error')) {\n+ errorCount ++;\n+ $(this).show();\n+ } else {\n+ $(this).css(\"display\", \"none\");\n+ }\n+ });\n+ var elem = $(this.formSelector);\nif (elem) {\n- document.getElementById(this.formSelector).style.display = 'none';\n+ if (errorCount > 0) {\n+ $(this.formSelector).show();\n+ } else {\n+ $(this.formSelector).hide();\n+ }\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/shipping.js", "new_path": "src/Payment/view/frontend/web/js/view/shipping.js", "diff": "@@ -8,7 +8,9 @@ define(\n'Magento_Customer/js/model/customer',\n'Magento_Checkout/js/action/set-shipping-information',\n'Magento_Checkout/js/model/step-navigator',\n- 'Amazon_Payment/js/model/storage'\n+ 'Amazon_Payment/js/model/storage',\n+ 'Magento_Customer/js/model/address-list',\n+ 'Magento_Checkout/js/model/quote'\n],\nfunction (\n$,\n@@ -18,10 +20,15 @@ define(\ncustomer,\nsetShippingInformationAction,\nstepNavigator,\n- amazonStorage\n+ amazonStorage,\n+ addressList,\n+ quote\n) {\n'use strict';\nreturn Component.extend({\n+ isFormInline: ko.observable(addressList().length == 0),\n+ formSelector: '#co-shipping-form',\n+\ninitialize: function () {\nthis._super();\nthis.isNewAddressAdded(amazonStorage.isAmazonAccountLoggedIn());\n@@ -48,9 +55,12 @@ define(\n);\n}\nif (amazonStorage.isAmazonAccountLoggedIn() && customer.isLoggedIn()) {\n+ this.isFormInline(true);\n+ if (this.validateShippingInformation()) {\nsetShippingInformationAmazon();\n+ }\n} else if (amazonStorage.isAmazonAccountLoggedIn() && !customer.isLoggedIn()) {\n- if (this.validateGuestEmail()) {\n+ if (this.validateGuestEmail() && this.validateShippingInformation()) {\nsetShippingInformationAmazon();\n}\n} else {\n@@ -59,6 +69,61 @@ define(\nsetShippingInformationAmazon();\n}\n}\n+ },\n+\n+ validateShippingInformation: function () {\n+ var shippingAddress,\n+ addressData,\n+ loginFormSelector = 'form[data-role=email-with-possible-login]',\n+ emailValidationResult = customer.isLoggedIn();\n+\n+ if (!quote.shippingMethod()) {\n+ this.errorValidationMessage($t('Please specify a shipping method.'));\n+\n+ return false;\n+ }\n+\n+ if (!customer.isLoggedIn()) {\n+ $(loginFormSelector).validation();\n+ emailValidationResult = Boolean($(loginFormSelector + ' input[name=username]').valid());\n+ }\n+\n+ if (this.isFormInline()) {\n+ this.source.set('params.invalid', false);\n+ this.source.trigger('shippingAddress.data.validate');\n+\n+ if (this.source.get('shippingAddress.custom_attributes')) {\n+ this.source.trigger('shippingAddress.custom_attributes.data.validate');\n+ }\n+\n+ if (this.source.get('params.invalid') ||\n+ !quote.shippingMethod().method_code ||\n+ !quote.shippingMethod().carrier_code ||\n+ !emailValidationResult\n+ ) {\n+ var errorCount = 0;\n+ $(this.formSelector).find(\".field\").each(function () {\n+ if ($(this).hasClass('_error')) {\n+ errorCount ++;\n+ $(this).show();\n+ } else {\n+ $(this).css(\"display\", \"none\");\n+ }\n+ });\n+ var elem = $(this.formSelector);\n+ if (elem) {\n+ if (errorCount > 0) {\n+ $(this.formSelector).show();\n+ } else {\n+ $(this.formSelector).hide();\n+ }\n+ }\n+ return false;\n+ }\n+\n+\n+ }\n+ return this._super();\n}\n});\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/faq.rst", "new_path": "docs/faq.rst", "diff": "@@ -24,6 +24,6 @@ Amazon Pay provides two LESS files in this extension. They need to be adapted to\nAmazon Pay Widgets are not surfaced\n-----------------------------------\n-Please check if you are using a theme, which is not based on Magento's Luma theme first and follow the advice above.\n+Please check if you are using a theme, which is not based on Magento's Luma or Blank theme first and follow the advice above.\nIf this is not the case and you need help, please file an issue with us.\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "<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=\"1.2.4\">\n<sequence>\n- <module name=\"Magento_Config\" />\n<module name=\"Magento_Store\"/>\n- <module name=\"Magento_Developer\" />\n+ <module name=\"Magento_Customer\"/>\n+ <module name=\"Magento_Payment\"/>\n+ <module name=\"Magento_Checkout\"/>\n+ <module name=\"Magento_Vault\"/>\n+ <module name=\"Magento_Catalog\"/>\n<module name=\"Magento_Quote\"/>\n</sequence>\n</module>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "<module name=\"Amazon_Login\" setup_version=\"1.2.0\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n- <module name=\"Magento_Customer\"/>\n- <module name=\"Magento_Checkout\"/>\n</sequence>\n</module>\n</config>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n- <module name=\"Magento_Eav\"/>\n- <module name=\"Magento_Sales\"/>\n- <module name=\"Magento_Quote\"/>\n- <module name=\"Magento_Payment\"/>\n- <module name=\"Magento_Backend\"/>\n</sequence>\n</module>\n</config>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Block/Config.php", "new_path": "src/Core/Block/Config.php", "diff": "@@ -96,6 +96,14 @@ class Config extends Template\nreturn ($this->coreHelper->isPwaEnabled());\n}\n+ /**\n+ * @return bool\n+ */\n+ public function isExtensionEnabled()\n+ {\n+ return ($this->coreHelper->isPwaEnabled() || $this->coreHelper->isLwaEnabled());\n+ }\n+\n/**\n* @return bool\n*/\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/frontend/templates/config.phtml", "new_path": "src/Core/view/frontend/templates/config.phtml", "diff": "*/\n?>\n+<?php if ($block->isExtensionEnabled()): ?>\n<script>\nrequire (['uiRegistry'], function(registry) {\n@@ -22,4 +23,4 @@ require (['uiRegistry'], function(registry) {\n});\n</script>\n-\n+<?php endif ?>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "new_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "diff": "var registry = require('uiRegistry');\nvar amazonPayment = registry.get('amazonPayment');\n-if (amazonPayment.allowAmLoginLoading == true) {\n+if (amazonPayment != undefined && amazonPayment.allowAmLoginLoading == true) {\ndefine(['require', 'Amazon_Login/js/view/login-button'], function (require) {\nreturn require(\"Amazon_Login/js/view/login-button\");\n});\n" } ]

[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "## Installation and Configuration\nPlease follow the instructions in the [User Guide](https://amzn.github.io/amazon-payments-magento-2-plugin)\n-\n-## Release Notes\n-### v1.1.1 stability\n-#### Enhancements:\n- * Display the module version in the admin html\n- * Support for Modernizr 3.x\n- * Added extended support for japanese names\n- * Removed disturbing message for charge on order\n- * Configuration option to supply the store name added\n-\n-#### Bug Fixes:\n- * Order handling for free orders corrected\n- * Fixed incompatibility on CompleteOrder\n- * Displayed URLs did not take the store-view configured domain into account\n- * Removed unneeded CSS and layout\n- * jQuery storage API not always present\n-\n-### v1.1.0 Rebrand\n-#### Enhancements:\n- * This release does not add any new features\n-\n-#### Bug Fixes:\n- * This release does not fix any bugs\n-\n-### v1.0.10 Small fixes\n-#### Enhancements:\n- * #31 Scope parameter propagated to the Amazon Pay widgets\n- * #11 Integrate checkout agreement blocks in the checkout\n-\n-#### Bug Fixes:\n- * #27 Get the payment method from the order instead of the quote\n- * #33 Fix the checkout layout block to be in line with Magento 2.1\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/ISSUE_TEMPLATE.md", "new_path": ".github/ISSUE_TEMPLATE.md", "diff": "#### Your setup\n-* Magento version:\n+* Magento version: 2.x.x\n+* Amazon Pay Extension Version:\n* Magento Edition: Community / Enterprise / Enterprise Cloud\n* JavaScript Console: Please add a screenshot of the Chrome JavaScript console to speed up the process\n* Shop URL : <!-- if you are willing to share -->\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/i18n/en_US.csv", "new_path": "src/Payment/i18n/en_US.csv", "diff": "-\"Amazon authorize invalid state : %1 with reason %2\",\"Unexpected state for the Amazon Pay authoriziation. State: %1, Reason code: %2\"\n+\"Amazon authorize invalid state : %1 with reason %2\",\"Unexpected state for the Amazon Pay authorization. State: %1, Reason code: %2\"\n\"Amazon capture declined : %1\",\"Amazon Pay declined the capture. Reason code: %1\"\n\"Amazon capture invalid state : %1 with reason %2\",\"Unexpected state for the Amazon Pay capture. State: %1, Reason code: %2\"\n\"Amazon refund invalid state : %1 with reason %2\",\"Unexpected state for the Amazon Pay refund. State: %1, Reason code: %2\"\n\"the country for your address is not allowed for this store\",\"The country associated with your address is not allowed for this store.\"\n-\"Unfortunately it is not possible to pay with Amazon Pay for this order. Please choose another payment method.\",\"Unfortunately it is not possible to Pay with Amazon Pay for this order. Please choose another payment method.\"\n+\"Unfortunately it is not possible to pay with Amazon Pay for this order. Please choose another payment method.\",\"Unfortunately it is not possible to pay with Amazon Pay for this order. Please choose another payment method.\"\n\"There has been a problem with the selected payment method on your Amazon account. Please choose another one.\",\"There has been a problem with the selected payment method on your Amazon account. Please choose another one.\"\n\"The currency selected is not supported by Amazon Pay\",\"The currency selected is not supported by Amazon Pay on this store.\"\n\"Captured amount of %1 online\",\"Captured amount of %1 online.\"\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\": \"1.2.5\",\n+ \"version\": \"1.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'1.2.5'\n+version = u'1.2.6'\n# The full version, including alpha/beta/rc tags.\n-release = u'1.2.5'\n+release = u'1.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:^1.2.5`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^1.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:^1.2.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:^1.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\": \"1.2.5\",\n+ \"version\": \"1.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.5\",\n- \"amzn/login-with-amazon-module\": \"1.2.5\",\n- \"amzn/amazon-pay-module\": \"1.2.5\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"1.2.6\",\n+ \"amzn/login-with-amazon-module\": \"1.2.6\",\n+ \"amzn/amazon-pay-module\": \"1.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\": \"1.2.5\",\n+ \"version\": \"1.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": "<?xml version=\"1.0\"?>\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=\"1.2.5\">\n+ <module name=\"Amazon_Core\" setup_version=\"1.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\": \"1.2.5\",\n+ \"version\": \"1.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.6\",\n\"magento/module-customer\": \"^100.1.0|^101.0.0\",\n\"magento/module-checkout\": \"^100.1.0|^100.2.0\"\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\": \"1.2.5\",\n+ \"version\": \"1.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.5\",\n- \"amzn/login-with-amazon-module\": \"^1.2.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^1.2.6\",\n+ \"amzn/login-with-amazon-module\": \"^1.2.6\",\n\"magento/module-eav\": \"^100.1.0|^101.0.0\",\n\"magento/module-sales\": \"^100.1.0|^101.0.0\",\n\"magento/module-quote\": \"^100.1.0|^101.0.0\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/configuration.rst", "new_path": "docs/configuration.rst", "diff": "@@ -25,7 +25,11 @@ The credentials can be found in Seller Central at :menuselection:`Integration --\nPayment Region\n..............\n-Select the region where you registered your seller account from the provided list. If you're unsure about this information, please consult the Amazon Pay merchant support.\n+Select the region where you registered your seller account from the provided list. If you're unsure about this information, please consult the Amazon Pay merchant support. Supported regions are:\n+* Euro (use for countries that use EUR as their currency, e.g. Germany, France, Italy, Spain, etc.)\n+* United Kingdom\n+* United States\n+* Japan\nSandbox\n.......\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Helper/Data.php", "new_path": "src/Core/Helper/Data.php", "diff": "@@ -22,6 +22,9 @@ use Magento\\Store\\Model\\ScopeInterface;\nuse Magento\\Store\\Model\\StoreManagerInterface;\nuse Magento\\Framework\\Module\\ModuleListInterface;\n+/**\n+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)\n+ */\nclass Data extends AbstractHelper\n{\nconst AMAZON_SECRET_KEY = 'secret_key';\n@@ -31,8 +34,9 @@ class Data extends AbstractHelper\nconst AMAZON_CLIENT_SECRET = 'client_secret';\nconst AMAZON_REGION = 'region';\nconst AMAZON_SANDBOX = 'sandbox';\n+ const AMAZON_ACTIVE = 'payment/amazon_payment/active';\n- protected $amazonAccountUrl\n+ private $amazonAccountUrl\n= [\n'us' => 'https://payments.amazon.com/overview',\n'uk' => 'https://payments.amazon.co.uk/overview',\n@@ -43,7 +47,7 @@ class Data extends AbstractHelper\n/**\n* @var Array\n*/\n- protected $amazonCredentialsFields\n+ private $amazonCredentialsFields\n= [\nself::AMAZON_SECRET_KEY,\nself::AMAZON_ACCESS_KEY,\n@@ -55,7 +59,7 @@ class Data extends AbstractHelper\n/**\n* @var Array\n*/\n- protected $amazonCredentialsEncryptedFields\n+ private $amazonCredentialsEncryptedFields\n= [\nself::AMAZON_SECRET_KEY,\nself::AMAZON_CLIENT_SECRET\n@@ -64,12 +68,12 @@ class Data extends AbstractHelper\n/**\n* @var EncryptorInterface\n*/\n- protected $encryptor;\n+ private $encryptor;\n/**\n* @var StoreManagerInterface\n*/\n- protected $storeManager;\n+ private $storeManager;\n/**\n* @var \\Amazon\\Core\\Helper\\ClientIp\n@@ -79,7 +83,7 @@ class Data extends AbstractHelper\n/**\n* @var ModuleListInterface\n*/\n- protected $moduleList;\n+ private $moduleList;\n/**\n* Data constructor.\n@@ -218,7 +222,8 @@ class Data extends AbstractHelper\n'de' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/de/lpa/js/Widgets.js?nomin',\n'uk' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/uk/lpa/js/Widgets.js?nomin',\n'us' => 'https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js?nomin',\n- 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod/lpa/js/Widgets.js?nomin',\n+ 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod' .\n+ '/lpa/js/Widgets.js?nomin',\n];\nif ($sandboxEnabled) {\n@@ -226,7 +231,8 @@ class Data extends AbstractHelper\n'de' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/de/sandbox/lpa/js/Widgets.js?nomin',\n'uk' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/uk/sandbox/lpa/js/Widgets.js?nomin',\n'us' => 'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js?nomin',\n- 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod/lpa/js/Widgets.js?nomin',\n+ 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod/lpa/js' .\n+ '/Widgets.js?nomin',\n];\n}\n@@ -290,7 +296,7 @@ class Data extends AbstractHelper\n}\nreturn $this->scopeConfig->isSetFlag(\n- 'payment/amazon_payment/pwa_enabled',\n+ self::AMAZON_ACTIVE,\n$scope,\n$scopeCode\n);\n@@ -312,6 +318,14 @@ class Data extends AbstractHelper\n);\n}\n+ /*\n+ * @return bool\n+ */\n+ public function isEnabled($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n+ {\n+ return $this->isLwaEnabled($scope, $scopeCode) || $this->isPwaEnabled($scope, $scopeCode);\n+ }\n+\n/*\n* @return string\n*/\n@@ -521,7 +535,8 @@ class Data extends AbstractHelper\nif (in_array($context, ['authorization', 'authorization_capture'])) {\n$simulationStrings['Authorization:Declined:InvalidPaymentMethod']\n- = '{\"SandboxSimulation\": {\"State\":\"Declined\", \"ReasonCode\":\"InvalidPaymentMethod\", \"PaymentMethodUpdateTimeInMins\":5}}';\n+ = '{\"SandboxSimulation\": {\"State\":\"Declined\", \"ReasonCode\":\"InvalidPaymentMethod\", ' .\n+ '\"PaymentMethodUpdateTimeInMins\":5}}';\n$simulationStrings['Authorization:Declined:AmazonRejected']\n= '{\"SandboxSimulation\": {\"State\":\"Declined\", \"ReasonCode\":\"AmazonRejected\"}}';\n$simulationStrings['Authorization:Declined:TransactionTimedOut']\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/frontend/templates/config.phtml", "new_path": "src/Core/view/frontend/templates/config.phtml", "diff": "<script>\nrequire (['uiRegistry'], function(registry) {\n- registry.set('amazonPayment', <?php /* @noEscape */ echo \\Zend_Json::encode($block->getConfig()); ?>);\n+ registry.set('amazonPayment', <?= /* @noEscape */ \\Zend_Json::encode($block->getConfig()); ?>);\n});\n</script>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Model/Config/SimplePath.php", "new_path": "src/Core/Model/Config/SimplePath.php", "diff": "@@ -334,8 +334,8 @@ class SimplePath\n*/\npublic function autoEnable()\n{\n- if (!$this->getConfig('payment/amazon_payment/pwa_enabled')) {\n- $this->config->saveConfig('payment/amazon_payment/pwa_enabled', true, $this->_scope, $this->_scopeId);\n+ if (!$this->getConfig('payment/amazon_payment/active')) {\n+ $this->config->saveConfig('payment/amazon_payment/active', true, $this->_scope, $this->_scopeId);\n$this->messageManager->addSuccess(__(\"Login and Pay with Amazon is now enabled.\"));\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/adminhtml/system.xml", "new_path": "src/Core/etc/adminhtml/system.xml", "diff": "</group>\n<group id=\"options\" translate=\"label\" type=\"text\" sortOrder=\"20\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n<label>Options</label>\n- <field id=\"pwa_enabled\" translate=\"label\" type=\"select\" sortOrder=\"10\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n+ <field id=\"active\" translate=\"label\" type=\"select\" sortOrder=\"10\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n<label>Enable Amazon Pay</label>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n- <config_path>payment/amazon_payment/pwa_enabled</config_path>\n+ <config_path>payment/amazon_payment/active</config_path>\n</field>\n<field id=\"lwa_enabled\" translate=\"label\" type=\"select\" sortOrder=\"20\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n<label>Enable Login with Amazon</label>\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/config.xml", "new_path": "src/Core/etc/config.xml", "diff": "<default>\n<payment>\n<amazon_payment>\n- <active>1</active>\n+ <active>0</active>\n<is_gateway>1</is_gateway>\n<title>Amazon Pay</title>\n<sort_order>1</sort_order>\n<can_void>1</can_void>\n<can_use_checkout>1</can_use_checkout>\n<packstation_terms>Packstation,Pack-Station,Pack Station,PO Box,Post Office box,Locker</packstation_terms>\n- <pwa_enabled>0</pwa_enabled>\n<lwa_enabled>0</lwa_enabled>\n<authorization_mode>synchronous</authorization_mode>\n<update_mechanism>polling</update_mechanism>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "new_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "diff": "* permissions and limitations under the License.\n*/\n-var registry = require('uiRegistry');\n-var amazonPayment = registry.get('amazonPayment');\n+var registry = require('uiRegistry'),\n+ amazonPayment = registry.get('amazonPayment');\n+if (amazonPayment !== undefined) {\ndefine([amazonPayment.widgetUrl], function () {\n+ 'use strict';\n+\n//after amazon widgets file as loaded\n});\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-revert.js", "diff": "@@ -27,7 +27,7 @@ define(\n'use strict';\nvar self;\n-\n+ if (registry.get('amazonPayment') !== undefined) {\nreturn Component.extend({\ndefaults: {\ntemplate: 'Amazon_Payment/checkout-revert'\n@@ -56,5 +56,8 @@ define(\n);\n}\n});\n+ } else {\n+ return Component.extend({});\n+ }\n}\n);\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/checkout-sandbox-simulator.js", "new_path": "src/Payment/view/frontend/web/js/view/checkout-sandbox-simulator.js", "diff": "define(\n[\n'jquery',\n- \"uiComponent\",\n+ 'uiComponent',\n'ko',\n'Amazon_Payment/js/model/storage',\n'uiRegistry'\n@@ -16,9 +16,7 @@ define(\nregistry\n) {\n'use strict';\n-\n- var self;\n-\n+ if (registry.get('amazonPayment') !== undefined) {\nreturn Component.extend({\ndefaults: {\ntemplate: 'Amazon_Payment/checkout-sandbox-simulator'\n@@ -27,10 +25,17 @@ define(\nisSandboxEnabled: ko.observable(registry.get('amazonPayment').isSandboxEnabled),\nsandboxSimulationReference: amazonStorage.sandboxSimulationReference,\nsandboxSimulationOptions: ko.observableArray(registry.get('amazonPayment').sandboxSimulationOptions),\n+\n+ /**\n+ * Init\n+ */\ninitialize: function () {\n- self = this;\nthis._super();\n}\n});\n}\n+ else {\n+ return Component.extend({});\n+ }\n+ }\n);\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": "define(\n[\n'jquery',\n- \"uiComponent\",\n+ 'uiComponent',\n'ko',\n'Magento_Customer/js/model/customer',\n'Magento_Checkout/js/model/quote',\n@@ -42,8 +42,9 @@ define(\nregistry\n) {\n'use strict';\n- var self;\n+ var self;\n+ if (registry.get('amazonPayment') !== undefined) {\nreturn Component.extend({\ndefaults: {\ntemplate: 'Amazon_Payment/checkout-widget-address'\n@@ -57,34 +58,54 @@ define(\nisAmazonAccountLoggedIn: amazonStorage.isAmazonAccountLoggedIn,\nisAmazonEnabled: ko.observable(registry.get('amazonPayment').isPwaEnabled),\nrates: shippingService.getShippingRates(),\n+\n+ /**\n+ * Init\n+ */\ninitialize: function () {\nself = this;\nthis._super();\n},\n+\n/**\n* Call when component template is rendered\n*/\ninitAddressWidget: function () {\nself.renderAddressWidget();\n},\n+\n/**\n* render Amazon address Widget\n*/\nrenderAddressWidget: function () {\n- new OffAmazonPayments.Widgets.AddressBook({\n+ new OffAmazonPayments.Widgets.AddressBook({ // eslint-disable-line no-undef\nsellerId: self.options.sellerId,\nscope: self.options.widgetScope,\n+\n+ /**\n+ * Order reference creation callback\n+ */\nonOrderReferenceCreate: function (orderReference) {\nvar orderid = orderReference.getAmazonOrderReferenceId();\n+\namazonStorage.setOrderReference(orderid);\n},\n- onAddressSelect: function (orderReference) {\n+\n+ /**\n+ * Address select callback\n+ */\n+ onAddressSelect: function () { // orderReference\nself.getShippingAddressFromAmazon();\n},\ndesign: {\ndesignMode: 'responsive'\n},\n+\n+ /**\n+ * Error callback\n+ */\nonError: function (error) {\n+ console.log(error);\n}\n}).bind(self.options.addressWidgetDOMId);\n},\n@@ -93,9 +114,13 @@ define(\n* Get shipping address from Amazon API\n*/\ngetShippingAddressFromAmazon: function () {\n+ var serviceUrl, payload;\n+\namazonStorage.isShippingMethodsLoading(true);\nshippingService.isLoading(true);\n- var serviceUrl = urlBuilder.createUrl('/amazon-shipping-address/:amazonOrderReference', {amazonOrderReference: amazonStorage.getOrderReference()}),\n+ serviceUrl = urlBuilder.createUrl('/amazon-shipping-address/:amazonOrderReference', {\n+ amazonOrderReference: amazonStorage.getOrderReference()\n+ }),\npayload = {\naddressConsentToken: amazonStorage.getAddressConsentToken()\n};\n@@ -106,18 +131,21 @@ define(\n).done(\nfunction (data) {\nvar amazonAddress = data.shift(),\n- addressData = addressConverter.formAddressDataToQuoteAddress(amazonAddress);\n+ addressData = addressConverter.formAddressDataToQuoteAddress(amazonAddress),\n+ i;\n//if telephone is blank set it to 00000000 so it passes the required validation\n- addressData.telephone = !(addressData.telephone) ? '0000000000' : addressData.telephone;\n+ addressData.telephone = !addressData.telephone ? '0000000000' : addressData.telephone;\n//fill in blank street fields\nif ($.isArray(addressData.street)) {\n- for (var i = addressData.street.length; i <= 2; i++) {\n+ for (i = addressData.street.length; i <= 2; i++) {\naddressData.street[i] = '';\n}\n}\n- checkoutData.setShippingAddressFromData(addressConverter.quoteAddressToFormAddressData(addressData));\n+ checkoutData.setShippingAddressFromData(\n+ addressConverter.quoteAddressToFormAddressData(addressData)\n+ );\ncheckoutDataResolver.resolveEstimationAddress();\n}\n).fail(\n@@ -130,14 +158,23 @@ define(\n);\n},\n+ /**\n+ * Get Amazon Order Reference ID\n+ */\ngetAmazonOrderReference: function () {\nreturn amazonStorage.getOrderReference();\n},\n+ /**\n+ * Get Amazon Address Consent Token\n+ */\ngetAddressConsentToken: function () {\nreturn amazonStorage.getAddressConsentToken();\n}\n});\n+ } else {\n+ return Component.extend({});\n+ }\n}\n);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<argument name=\"amazonConfig\" xsi:type=\"object\">Amazon\\Payment\\Model\\Config</argument>\n</arguments>\n</type>\n+ <type name=\"Magento\\ScalableCheckout\\Console\\Command\\SplitQuote\">\n+ <arguments>\n+ <argument name=\"tables\" xsi:type=\"array\">\n+ <item name=\"amazon_quote\" xsi:type=\"string\">amazon_quote</item>\n+ </argument>\n+ </arguments>\n+ </type>\n</config>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "</argument>\n</arguments>\n</type>\n+ <type name=\"Amazon\\Payment\\Model\\ResourceModel\\QuoteLink\">\n+ <arguments>\n+ <argument name=\"connectionName\" xsi:type=\"string\">checkout</argument>\n+ </arguments>\n+ </type>\n</config>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/Helper/Session.php", "new_path": "src/Login/Helper/Session.php", "diff": "@@ -19,6 +19,7 @@ use Amazon\\Core\\Domain\\AmazonCustomer;\nuse Amazon\\Login\\Domain\\ValidationCredentials;\nuse Magento\\Customer\\Api\\Data\\CustomerInterface;\nuse Magento\\Customer\\Model\\Session as CustomerSession;\n+use Magento\\Checkout\\Model\\Session as CheckoutSession;\nuse Magento\\Framework\\Event\\ManagerInterface as EventManagerInterface;\nclass Session\n@@ -26,12 +27,17 @@ class Session\n/**\n* @var CustomerSession\n*/\n- protected $session;\n+ private $session;\n+\n+ /**\n+ * @var CheckoutSession\n+ */\n+ private $checkoutSession;\n/**\n* @var EventManagerInterface\n*/\n- protected $eventManager;\n+ private $eventManager;\n/**\n* @param CustomerSession $session\n@@ -39,9 +45,11 @@ class Session\n*/\npublic function __construct(\nCustomerSession $session,\n- EventManagerInterface $eventManager\n+ EventManagerInterface $eventManager,\n+ CheckoutSession $checkoutSession\n) {\n$this->session = $session;\n+ $this->checkoutSession = $checkoutSession;\n$this->eventManager = $eventManager;\n}\n@@ -56,6 +64,7 @@ class Session\n$this->dispatchAuthenticationEvent();\n$this->session->setCustomerDataAsLoggedIn($customerData);\n$this->session->regenerateId();\n+ $this->checkoutSession->loadCustomerQuote();\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/amazon-csrf.js", "new_path": "src/Login/view/frontend/web/js/amazon-csrf.js", "diff": "@@ -18,25 +18,43 @@ define([\n'jquery',\n'mage/cookies'\n], function (sjcl, $) {\n- \"use strict\";\n+ 'use strict';\nreturn {\noptions: {\nwordsLength: 8,\ncookieName: 'amazon-csrf-state'\n},\n+\n+ /**\n+ * Create random string for Amazon CSRF cookie\n+ */\ngenerateNewValue: function () {\nvar randomString = sjcl.codec.base64.fromBits(sjcl.random.randomWords(this.options.wordsLength));\n+\n$.mage.cookies.set(this.options.cookieName, randomString);\n+\nreturn randomString;\n},\n+\n+ /**\n+ * Check if Amazon CSRF cookie is valid and clear cookie\n+ * @param {String} stateString\n+ * @returns {Boolean}\n+ */\nisValid: function (stateString) {\nvar isValid = $.mage.cookies.get(this.options.cookieName) === stateString;\n+\nthis.clear(); // always clear nonce when validating\n+\nreturn isValid;\n},\n+\n+ /**\n+ * Clear Amazon CSRF cookie\n+ */\nclear: function () {\n$.mage.cookies.clear(this.options.cookieName);\n}\n- }\n+ };\n});\n" }, { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/amazon-logout.js", "new_path": "src/Login/view/frontend/web/js/amazon-logout.js", "diff": "define([\n'jquery',\n'amazonCore',\n- 'jquery/ui'\n+ 'jquery/ui',\n+ 'mage/cookies'\n], function ($, core) {\n- \"use strict\";\n-\n- var _this;\n+ 'use strict';\n$.widget('amazon.AmazonLogout', {\noptions: {\nonInit: false\n},\n+\n/**\n* Create Amazon Logout Widget\n* @private\n*/\n_create: function () {\n- _this = this;\nif (this.options.onInit) {\ncore.AmazonLogout(); //logout amazon user on init\n+ $.mage.cookies.clear('amazon_Login_accessToken');\n}\n},\n+\n/**\n* Logs out a user if called directly\n* @private\n*/\n_logoutAmazonUser: function () {\ncore.AmazonLogout();\n+ $.mage.cookies.clear('amazon_Login_accessToken');\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": "@@ -21,8 +21,8 @@ define([\n'mage/loader',\n'jquery/ui',\n'mage/cookies'\n-], function ($, amazonCore, amazonPaymentConfig, amazonCsrf, loader) {\n- \"use strict\";\n+], function ($, amazonCore, amazonPaymentConfig, amazonCsrf) {\n+ 'use strict';\nvar self;\n@@ -45,7 +45,7 @@ define([\nthis.setAuthStateCookies();\namazonCore.amazonDefined.subscribe(function () {\n//only set this on the redirect page\n- amazon.Login.setUseCookie(true);\n+ amazon.Login.setUseCookie(true); //eslint-disable-line no-undef\namazonCore.verifyAmazonLoggedIn().then(function (loggedIn) {\nif (loggedIn) {\nself.redirect();\n@@ -56,13 +56,13 @@ define([\n/**\n* getURLParamater from URL for access OAuth Token\n- * @param name\n- * @param source\n- * @returns {string|null}\n+ * @param {String} name\n+ * @param {String} source\n+ * @returns {String|Null}\n*/\ngetURLParameter: function (name, source) {\nreturn decodeURIComponent((new RegExp('[?|&|#]' + name + '=' +\n- '([^&]+?)(&|#|;|$)').exec(source) || [,\"\"])[1].replace(\n+ '([^&]+?)(&|#|;|$)').exec(source) || [,''])[1].replace(\n/\\+/g,\n'%20'\n)) || null;\n@@ -70,27 +70,40 @@ define([\n/**\n* Set State Cache Auth Cookies if they aren't already set\n- * @returns {boolean}\n+ * @returns {Boolean}\n*/\nsetAuthStateCookies: function () {\n- var token = this.getURLParameter(\"access_token\", location.hash);\n+ var token = this.getURLParameter('access_token', location.hash);\n+\nif (typeof token === 'string' && token.match(/^Atza/)) {\n$.mage.cookies.set('amazon_Login_accessToken', token);\n}\n+\nreturn true;\n},\n+\n/**\n* Redirect user to correct controller which logs them into M2 via Amazon hash\n*/\nredirect: function () {\n- window.location = amazonPaymentConfig.getValue('redirectUrl') + '?access_token=' + this.getURLParameter('access_token', location.hash);\n+ window.location = amazonPaymentConfig.getValue('redirectUrl') + '?access_token=' +\n+ this.getURLParameter('access_token', location.hash);\n},\n+\n+ /**\n+ * Redirect user on invalid state\n+ */\nredirectOnInvalidState: function () {\nvar state = this.getURLParameter('state', location.hash);\n+\nif (!state || !amazonCsrf.isValid(state)) {\nwindow.location = amazonPaymentConfig.getValue('customerLoginPageUrl');\n}\n},\n+\n+ /**\n+ * Redirect user on request error\n+ */\nredirectOnRequestWithError: function () {\nif (this.getURLParameter('error', window.location)) {\nwindow.location = amazonPaymentConfig.getValue('customerLoginPageUrl');\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Observer/AddAmazonButton.php", "new_path": "src/Payment/Observer/AddAmazonButton.php", "diff": "@@ -25,12 +25,12 @@ class AddAmazonButton implements ObserverInterface\n/**\n* @var Data\n*/\n- protected $coreHelper;\n+ private $coreHelper;\n/**\n* @var ShortcutFactory\n*/\n- protected $shortcutFactory;\n+ private $shortcutFactory;\n/**\n* @param Data $coreHelper\n@@ -50,7 +50,6 @@ class AddAmazonButton implements ObserverInterface\n$shortcutButtons = $observer->getEvent()->getContainer();\nif ($this->coreHelper->isPwaEnabled() && $this->coreHelper->isCurrentCurrencySupportedByAmazon()) {\n-\n$params = [\n'shortcutValidator' => $this->shortcutFactory->create($observer->getEvent()->getCheckoutSession()),\n];\n@@ -58,7 +57,7 @@ class AddAmazonButton implements ObserverInterface\n/** @var \\Magento\\Framework\\View\\Element\\Template $shortcut */\n$shortcut = $shortcutButtons->getLayout()->createBlock(\n- 'Amazon\\Payment\\Block\\Minicart\\Button',\n+ \\Amazon\\Payment\\Block\\Minicart\\Button::class,\n'',\n$params\n);\n@@ -69,7 +68,7 @@ class AddAmazonButton implements ObserverInterface\n$observer->getEvent()->getOrPosition()\n);\n- $shortcut->setIsCart(get_class($shortcutButtons) == 'Magento\\Checkout\\Block\\QuoteShortcutButtons');\n+ $shortcut->setIsCart(get_class($shortcutButtons) == \\Magento\\Checkout\\Block\\QuoteShortcutButtons::class);\n$shortcutButtons->addShortcut($shortcut);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<argument name=\"amazonConfig\" xsi:type=\"object\">Amazon\\Payment\\Model\\Config</argument>\n</arguments>\n</type>\n+ <type name=\"Magento\\ScalableCheckout\\Console\\Command\\SplitQuote\">\n+ <arguments>\n+ <argument name=\"tables\" xsi:type=\"array\">\n+ <item name=\"amazon_quote\" xsi:type=\"string\">amazon_quote</item>\n+ </argument>\n+ </arguments>\n+ </type>\n+ <type name=\"Amazon\\Payment\\Model\\ResourceModel\\QuoteLink\">\n+ <arguments>\n+ <argument name=\"connectionName\" xsi:type=\"string\">checkout</argument>\n+ </arguments>\n+ </type>\n+ <type name=\"Magento\\ScalableOms\\Console\\Command\\SplitSales\">\n+ <arguments>\n+ <argument name=\"tables\" xsi:type=\"array\">\n+ <item name=\"amazon_sales_order\" xsi:type=\"string\">amazon_sales_order</item>\n+ </argument>\n+ </arguments>\n+ </type>\n+ <type name=\"Amazon\\Payment\\Model\\ResourceModel\\OrderLink\">\n+ <arguments>\n+ <argument name=\"connectionName\" xsi:type=\"string\">sales</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": "@@ -222,8 +222,7 @@ class Data extends AbstractHelper\n'de' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/de/lpa/js/Widgets.js?nomin',\n'uk' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/uk/lpa/js/Widgets.js?nomin',\n'us' => 'https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js?nomin',\n- 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod' .\n- '/lpa/js/Widgets.js?nomin',\n+ 'jp' => 'https://static-fe.payments-amazon.com/OffAmazonPayments/jp/lpa/js/Widgets.js?nomin',\n];\nif ($sandboxEnabled) {\n@@ -231,8 +230,7 @@ class Data extends AbstractHelper\n'de' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/de/sandbox/lpa/js/Widgets.js?nomin',\n'uk' => 'https://static-eu.payments-amazon.com/OffAmazonPayments/uk/sandbox/lpa/js/Widgets.js?nomin',\n'us' => 'https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js?nomin',\n- 'jp' => 'https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod/lpa/js' .\n- '/Widgets.js?nomin',\n+ 'jp' => 'https://static-fe.payments-amazon.com/OffAmazonPayments/jp/sandbox/lpa/js/Widgets.js?nomin',\n];\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "docs/configuration.rst", "new_path": "docs/configuration.rst", "diff": "@@ -26,6 +26,7 @@ The credentials can be found in Seller Central at :menuselection:`Integration --\nPayment Region\n..............\nSelect the region where you registered your seller account from the provided list. If you're unsure about this information, please consult the Amazon Pay merchant support. Supported regions are:\n+\n* Euro (use for countries that use EUR as their currency, e.g. Germany, France, Italy, Spain, etc.)\n* United Kingdom\n* United States\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/catalog-add-to-cart.js", "new_path": "src/Payment/view/frontend/web/js/catalog-add-to-cart.js", "diff": "@@ -23,8 +23,9 @@ define([\n$.widget('amazon.catalogAddToCart', $.mage.catalogAddToCart, {\n_create: function () {\n- //this is overridden here and ignores the redirect option until fixed by Magento (as of 2.1)\n+ if (this.options.bindSubmit) {\nthis._bindSubmit();\n+ }\n},\n_bindSubmit: function () {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/config.xml", "new_path": "src/Core/etc/config.xml", "diff": "<de>https://static-eu.payments-amazon.com/OffAmazonPayments/de/lpa/js/Widgets.js?nomin</de>\n<uk>https://static-eu.payments-amazon.com/OffAmazonPayments/uk/lpa/js/Widgets.js?nomin</uk>\n<us>https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js?nomin</us>\n- <jp>https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/live/prod/lpa/js/Widgets.js?nomin</jp>\n+ <jp>https://static-fe.payments-amazon.com/OffAmazonPayments/jp/lpa/js/Widgets.js?nomin</jp>\n</production>\n<sandbox>\n<de>https://static-eu.payments-amazon.com/OffAmazonPayments/de/sandbox/lpa/js/Widgets.js?nomin</de>\n<uk>https://static-eu.payments-amazon.com/OffAmazonPayments/uk/sandbox/lpa/js/Widgets.js?nomin</uk>\n<us>https://static-na.payments-amazon.com/OffAmazonPayments/us/sandbox/js/Widgets.js?nomin</us>\n- <jp>https://origin-na.ssl-images-amazon.com/images/G/09/EP/offAmazonPayments/sandbox/prod/lpa/js/Widgets.js?nomin</jp>\n+ <jp>https://static-fe.payments-amazon.com/OffAmazonPayments/jp/sandbox/lpa/js/Widgets.js</jp>\n</sandbox>\n</widget>\n</default>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/composer.json", "new_path": "src/Login/composer.json", "diff": "],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.0.14\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n\"magento/module-customer\": \"^100.1.0|^101.0.4\",\n\"magento/module-store\": \"^100.1.0|^100.2.3\",\n\"magento/module-eav\": \"^100.1.0|^101.0.3\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/composer.json", "new_path": "src/Payment/composer.json", "diff": "],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.0.14\",\n- \"amzn/login-with-amazon-module\": \"^2.0.14\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n+ \"amzn/login-with-amazon-module\": \"^3.0.0\",\n\"magento/module-eav\": \"^100.1.0|^101.0.3\",\n\"magento/module-sales\": \"^100.1.0|^101.0.3\",\n\"magento/module-quote\": \"^100.1.0|^101.0.3\",\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": "<span class=\"apsp-getstarted\">\n<button><span><?= $block->escapeHtml(__('Get started with account registration')); ?></span></button>\n+ <input id=\"spId\" name=\"spId\" type=\"hidden\"/>\n</span>\n<span class=\"apsp-or\">\n&nbsp; <?= $block->escapeHtml(__('or')); ?> &nbsp;\n</div>\n<div id=\"amazon_simplepath_back\">\n- <a href=\"#\">&laquo; <?= $block->escapeHtml(__('Back')); ?></a>\n+ <a href=\"#\">&laquo; <?= $block->escapeHtml(__('Back to register or connect an account')); ?></a>\n</div>\n<script>\nvar AmazonSp = <?= /* @noEscape */ $block->getAmazonSpJson(); ?>;\n- require(['uiRegistry', \"prototype\"], function(registry){\n+ require(['uiRegistry', \"prototype\", \"domReady!\"], function (registry) {\n// Country code for ID selectors\nvar co = AmazonSp.co.toLowerCase();\n+ var form;\n// Poll every ms for keys\nvar amazonPollInterval = 1500;\nvar amazonSimplepath = $('amazon_simplepath');\nvar amazonFields = $$('#payment_' + co + '_amazon_payment .form-list');\nvar amazonSpBack = $('amazon_simplepath_back');\n+ var amazonCredentialJson = jQuery('#row_payment_' + co + '_amazon_payment_credentials_credentials_json');\n+\n+ jQuery('button#save').click(function () {\n+ if (jQuery('#simplepath_form').length > 0) {\n+ jQuery('#simplepath_form').empty();\n+ }\n+ if (amazonPollTimer) {\n+ clearTimeout(amazonPollTimer);\n+ }\n+ });\n// Not enabled\nif ($('simplepath_hint') == null) {\n}\n}\n+ if (!form) {\n// Generate form to post to Amazon\n- var form = new Element('form', { method: 'post',\n+ form = new Element('form', {\n+ method: 'post',\naction: AmazonSp.amazonUrl,\nid: 'simplepath_form',\n- target: 'simplepath'});\n+ target: 'simplepath'\n+ });\namazonSimplepath.wrap(form);\n// Convert formParams JSON to hidden inputs\nif (typeof AmazonSp.formParams[key] == 'object' || typeof AmazonSp.formParams[key] == 'array') {\nfor (var i in AmazonSp.formParams[key]) {\nif (typeof AmazonSp.formParams[key][i] != 'function') {\n- form.insert(new Element('input', { type: 'hidden', name: key, value: AmazonSp.formParams[key][i]}));\n+ form.insert(new Element('input', {\n+ type: 'hidden',\n+ name: key,\n+ value: AmazonSp.formParams[key][i]\n+ }));\n}\n}\n} else {\namazonSimplepath.insert({bottom: tableJson});\n$('sp-td-json-value').insert($('json-import-wrapper').show());\n-\n// Enable Crednetials JSON config field\nvar elIdCredCheck = '#payment_' + co + '_amazon_payment_credentials_credentials_json_inherit:checked';\nvar elJsonCheckDefault = $$(elIdCredCheck);\nelJson.value = json;\n$('save').click();\n});\n-\n}\n// Autoset payment region (for EU/UK)\nif (elRegion) {\nelRegion.value = region;\n}\n-\n});\n+ }\n// User is skipping simplepath\namazonSimplepath.select('#simplepath-skip')[0].observe('click', function (e) {\namazonSimplepath.show();\n});\n-\nfunction showAmazonConfig() {\namazonFields.each(Element.show);\namazonSimplepath.hide();\n} else {\namazonPollTimer = setTimeout(pollForKeys, amazonPollInterval);\n}\n-\n},\n- onFailure: function() { },\n+ onFailure: function () {\n+ },\n// Disable \"Please Wait\" modal\nonCreate: function (request) {\nAjax.Responders.unregister(varienLoaderHandler.handler);\n});\n}\n-\n+ if (amazonCredentialJson.length > 0) {\n+ var jsonField = jQuery('#payment_' + co + '_amazon_payment_credentials_credentials_json');\n+ jsonField.on('input', function (e) {\n+ var elJson = jsonField.val();\n+ var obj = null;\n+ try {\n+ obj = jQuery.parseJSON(jQuery.trim(elJson));\n+ }\n+ catch (err) {\n+ obj = null;\n+ jsonField.val('').attr('placeholder', '<?= $block->escapeHtml(__('Invalid JSON credentials entered, please try again.')); ?>').focus();\n+ }\n+ if (obj && typeof obj === 'object') {\n+ var success = true;\n+ for (var prop in obj) {\n+ var item = jQuery('#payment_' + co + '_amazon_payment_credentials_' + jQuery.trim(prop));\n+ if (item && item.length) {\n+ jQuery('#payment_' + co + '_amazon_payment_credentials_' + jQuery.trim(prop)).val(jQuery.trim(obj[prop]));\n+ }\n+ else {\n+ success = false;\n+ }\n+ }\n+ if (success) {\n+ jsonField.val('').attr('placeholder', '<?= $block->escapeHtml(__('Credential fields successfully updated and being saved.')); ?>').focus();\n+ $('save').click();\n+ }\n+ else {\n+ jsonField.val('').attr('placeholder', '<?= $block->escapeHtml(__('One or more of your credential fields did not parse correctly. Please review your entry and try again.')); ?>').focus();\n+ }\n+ showAmazonConfig();\n+ }\n+ });\n+ }\n});\n// Add Mage validator to fix \"Save Config\" button from not submitting\n}\n});\n-\n</script>\n<script>\nfunction getLeftOffset(requestedWidth) {\nvar dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left;\n-\nreturn ((windowWidth() / 2) - (requestedWidth / 2)) + dualScreenLeft;\n}\nfunction getTopOffset(requestedHeight) {\nvar dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top;\n-\nreturn ((windowHeight() / 2) - (requestedHeight / 2)) + dualScreenTop;\n}\nreturn screen.height;\n}\n}\n-\n// window.launchPopup = launchPopup;\nregistry.set('launchPopup', launchPopup);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/PaymentManagement/Capture.php", "new_path": "src/Payment/Model/PaymentManagement/Capture.php", "diff": "* express or implied. See the License for the specific language governing\n* permissions and limitations under the License.\n*/\n+\nnamespace Amazon\\Payment\\Model\\PaymentManagement;\nuse Amazon\\Core\\Client\\ClientFactoryInterface;\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": "@@ -23,10 +23,9 @@ define([\n'jquery/ui'\n], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf) {\n'use strict';\n-\nvar _this,\n$button;\n-\n+ if (amazonPaymentConfig.isDefined()) {\n$.widget('amazon.AmazonButton', {\noptions: {\nmerchantId: null,\n@@ -162,4 +161,5 @@ define([\n});\nreturn $.amazon.AmazonButton;\n+ }\n});\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "new_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "diff": "* permissions and limitations under the License.\n*/\n-var registry = require('uiRegistry'),\n- amazonPayment = registry.get('amazonPayment');\n+var registry = require('uiRegistry');\n+\n+if (registry.get('amazonPayment') !== undefined) {\n+\n+ var amazonPayment = registry.get('amazonPayment');\ndefine([amazonPayment.widgetUrl], function () {\n'use strict';\n//after amazon widgets file as loaded\n});\n+}\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<type name=\"Magento\\Framework\\Webapi\\ErrorProcessor\">\n<plugin name=\"amazon_payment_webapi_error_processor\" type=\"Amazon\\Payment\\Plugin\\WebapiErrorProcessor\" sortOrder=\"1\" />\n</type>\n- <type name=\"Magento\\Framework\\Mail\\MessageInterface\" shared=\"false\" />\n<type name=\"Amazon\\Payment\\Gateway\\Config\\Config\">\n<arguments>\n<argument name=\"methodCode\" xsi:type=\"const\">Amazon\\Payment\\Gateway\\Config\\Config::CODE</argument>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "new_path": "src/Core/Observer/PaymentConfigSaveAfter.php", "diff": "@@ -24,6 +24,7 @@ use Magento\\Framework\\Message\\ManagerInterface;\nuse Magento\\Framework\\App\\Config\\ReinitableConfigInterface;\nuse Magento\\Framework\\App\\RequestInterface;\nuse Magento\\Store\\Model\\ScopeInterface;\n+use Magento\\Framework\\App\\Config\\Storage\\WriterInterface;\nclass PaymentConfigSaveAfter implements ObserverInterface\n{\n@@ -60,10 +61,20 @@ class PaymentConfigSaveAfter implements ObserverInterface\nprivate $request;\n/**\n+ * @var WriterInterface\n+ */\n+ private $configWriter;\n+\n+ /**\n+ * PaymentConfigSaveAfter constructor.\n+ *\n* @param ApiCredentialsValidatorFactory $apiCredentialsValidatorFactory\n* @param ManagerInterface $messageManager\n* @param Json $jsonCredentials\n* @param Data $amazonCoreHelper\n+ * @param ReinitableConfigInterface $config\n+ * @param RequestInterface $request\n+ * @param WriterInterface $configWriter\n*/\npublic function __construct(\nApiCredentialsValidatorFactory $apiCredentialsValidatorFactory,\n@@ -71,7 +82,8 @@ class PaymentConfigSaveAfter implements ObserverInterface\nJson $jsonCredentials,\nData $amazonCoreHelper,\nReinitableConfigInterface $config,\n- RequestInterface $request\n+ RequestInterface $request,\n+ WriterInterface $configWriter\n) {\n$this->apiCredentialsValidatorFactory = $apiCredentialsValidatorFactory;\n$this->messageManager = $messageManager;\n@@ -79,6 +91,7 @@ class PaymentConfigSaveAfter implements ObserverInterface\n$this->jsonCredentials = $jsonCredentials;\n$this->appConfig = $config;\n$this->request = $request;\n+ $this->configWriter = $configWriter;\n}\n/**\n@@ -86,6 +99,9 @@ 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": "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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.0\",\n- \"amzn/login-with-amazon-module\": \"3.0.0\",\n- \"amzn/amazon-pay-module\": \"3.0.0\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.1.0\",\n+ \"amzn/login-with-amazon-module\": \"2.1.0\",\n+ \"amzn/amazon-pay-module\": \"2.1.0\"\n}\n}\n\\ No newline at end of file\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.0\",\n+ \"version\": \"2.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": "<?xml version=\"1.0\"?>\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.0\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"magento/module-customer\": \"^101.0\",\n\"magento/module-store\": \"^100.1\",\n\"magento/module-eav\": \"101.0.*\",\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n- \"amzn/login-with-amazon-module\": \"^3.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n+ \"amzn/login-with-amazon-module\": \"^2.1.0\",\n\"magento/module-eav\": \"101.0.*\",\n\"magento/module-sales\": \"101.0.*\",\n\"magento/module-quote\": \"101.0.*\",\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"magento/module-customer\": \"^101.0\",\n\"magento/module-store\": \"^100.1\",\n\"magento/module-eav\": \"101.0.*\",\n},\n\"suggest\": {\n- \"magento/module-sales\": \"101.0.*\",\n+ \"magento/module-sales\": \"101.0.*\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\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.0\",\n+ \"version\": \"2.1.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n- \"amzn/login-with-amazon-module\": \"^3.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n+ \"amzn/login-with-amazon-module\": \"^2.1.0\",\n\"magento/module-eav\": \"101.0.*\",\n\"magento/module-sales\": \"101.0.*\",\n\"magento/module-quote\": \"101.0.*\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/etc/module.xml", "new_path": "src/Login/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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.0\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.1.0\">\n<sequence>\n<module name=\"Amazon_Core\"/>\n</sequence>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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.0\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.1.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/amazon_error_mapping.xml", "new_path": "src/Payment/etc/amazon_error_mapping.xml", "diff": "<?xml version=\"1.0\"?>\n<mapping xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:module:Magento_Payment:etc/error_mapping.xsd\">\n<message_list>\n- <message code=\"AmazonRejected\" translate=\"true\">Rejected - please choose a different payment method.</message>\n+ <message code=\"AmazonRejected\" translate=\"true\">Unfortunately it is not possible to use Amazon Pay for this order, please choose another payment method.</message>\n<message code=\"ProcessingFailure\" translate=\"true\">Processing Failure - unable to authorize transaction.</message>\n<message code=\"BillingAgreementConstraintsExist\" translate=\"true\">Unable to authorize transaction.</message>\n<message code=\"PaymentMethodNotUpdated\" translate=\"true\">Buyer did not specify valid Amazon Wallet payment method.</message>\n<message code=\"InvalidAddress\" translate=\"true\">Invalid values passed in request.</message>\n<message code=\"InvalidParameterValue\" translate=\"true\">Invalid values passed in request.</message>\n<message code=\"OrderReferenceCountExceeded\" translate=\"true\">You have attempted to create more than the maximum allowed limit of one Order Reference object on a Billing Agreement object that is in the Draft State.</message>\n- <message code=\"TransactionTimedOut\" translate=\"true\">Unable to complete this transaction. Please try again later or choose a different payment method.</message>\n+ <message code=\"TransactionTimedOut\" translate=\"true\">Unfortunately it is not possible to use Amazon Pay for this order, please choose another payment method.</message>\n<message code=\"TransactionCountExceeded\" translate=\"true\">Number of authorizations, captures or refunds has exceeded allowed limits.</message>\n<message code=\"TransactionAmountExceeded\" translate=\"true\">Number of authorizations, captures or refunds has exceeded allowed limits.</message>\n<message code=\"InvalidSandboxSimulationSpecified\" translate=\"true\">Invalid operation for sandbox environment.</message>\n<message code=\"RequestThrottled\" translate=\"true\">Request rejected because request rate is higher than allocated throttling limits.</message>\n<message code=\"ServiceUnavailable\" translate=\"true\">The service is temporarily unavailable. Please try again later.</message>\n<message code=\"PaymentMethodNotAllowed\" translate=\"true\">Invalid payment method - please select a different payment method.</message>\n- <message code=\"InvalidPaymentMethod\" translate=\"true\">Invalid payment method - please select a different payment method.</message>\n+ <message code=\"InvalidPaymentMethod\" translate=\"true\">There has been a problem with the selected payment method on your Amazon account. Please choose another one.</message>\n</message_list>\n</mapping>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressFactory.php", "new_path": "src/Core/Domain/AmazonAddressFactory.php", "diff": "@@ -82,7 +82,7 @@ class AmazonAddressFactory\n$data = [\nAmazonAddressInterface::CITY => $this->escaper->escapeHtml($address['City']),\n- AmazonAddressInterface::POSTAL_CODE => $this->escaper->escapeHtml($address['PostalCode']),\n+ AmazonAddressInterface::POSTAL_CODE => isset($address['PostalCode']) ? $this->escaper->escapeHtml($address['PostalCode']) : '',\nAmazonAddressInterface::COUNTRY_CODE => $this->escaper->escapeHtml($address['CountryCode']),\nAmazonAddressInterface::TELEPHONE => $this->escaper->escapeHtml($address['Phone']) ?? '',\nAmazonAddressInterface::STATE_OR_REGION => $this->escaper->escapeHtml($address['StateOrRegion']) ?? '',\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Setup/UpgradeData.php", "new_path": "src/Core/Setup/UpgradeData.php", "diff": "@@ -33,7 +33,7 @@ class UpgradeData implements UpgradeDataInterface\npublic function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)\n{\n// Used update query because all scopes needed to have this value updated and this is a fast, simple approach\n- if (version_compare($context->getVersion(), '3.0.0', '<')) {\n+ if (version_compare($context->getVersion(), '2.1.0', '<')) {\n$select = $setup->getConnection()->select()->from(\n$setup->getTable('core_config_data'),\n['config_id', 'value']\n" }, { "change_type": "MODIFY", "old_path": "src/Login/Model/CustomerLinkRepository.php", "new_path": "src/Login/Model/CustomerLinkRepository.php", "diff": "@@ -24,7 +24,6 @@ use Amazon\\Login\\Api\\Data;\nuse Amazon\\Login\\Api\\Data\\CustomerLinkInterface;\nuse Amazon\\Login\\Api\\Data\\CustomerLinkSearchResultsInterfaceFactory;\nuse Amazon\\Login\\Model\\ResourceModel\\CustomerLink as CustomerLinkResourceModel;\n-use Amazon\\Login\\Model\\ResourceModel\\CustomerLink\\Collection;\nuse Amazon\\Login\\Model\\ResourceModel\\CustomerLink\\CollectionFactory;\n/**\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": "@@ -73,7 +73,7 @@ define(\nvar intervalId = setInterval(function () {\nclearInterval(intervalId);\nwindow.location.replace(url.build('checkout/cart/'));\n- }, 3000);\n+ }, 2000);\n}\n}\n);\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": "@@ -73,7 +73,7 @@ define(\nvar intervalId = setInterval(function () {\nclearInterval(intervalId);\nwindow.location.replace(url.build('checkout/cart/'));\n- }, 2000);\n+ }, 5000);\n}\n}\n);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/payment-link-product-page.phtml", "new_path": "src/Payment/view/frontend/templates/payment-link-product-page.phtml", "diff": "id=\"amazon-addtoCart-<?= /* @noEscape */ $block->getJsId() ?>\"\ndata-mage-init='{\"amazonProductAdd\": {}}'>\n</a>\n- <div id=\"LoginWithAmazon-<?= /* @noEscape */ $block->getJsId() ?>\"\n+ <div id=\"PayWithAmazon-<?= /* @noEscape */ $block->getJsId() ?>\"\nclass=\"login-with-amazon\"\ndata-mage-init='{\"amazonButton\": {\"buttonType\": \"PwA\"}}'>\n</div>\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": "@@ -20,7 +20,8 @@ define([\n'amazonCsrf',\n'modernizr/modernizr',\n'amazonCore',\n- 'jquery/ui'\n+ 'jquery/ui',\n+ 'uiRegistry',\n], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf) {\n'use strict';\nvar _this,\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Domain/AmazonAddressFactory.php", "new_path": "src/Core/Domain/AmazonAddressFactory.php", "diff": "@@ -81,11 +81,11 @@ class AmazonAddressFactory\n);\n$data = [\n- AmazonAddressInterface::CITY => $this->escaper->escapeHtml($address['City']),\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']),\n- AmazonAddressInterface::TELEPHONE => $this->escaper->escapeHtml($address['Phone']) ?? '',\n- AmazonAddressInterface::STATE_OR_REGION => $this->escaper->escapeHtml($address['StateOrRegion']) ?? '',\n+ AmazonAddressInterface::TELEPHONE => isset($address['Phone']) ? $this->escaper->escapeHtml($address['Phone']) : '',\n+ AmazonAddressInterface::STATE_OR_REGION => isset($address['StateOrRegion']) ? $this->escaper->escapeHtml($address['StateOrRegion']) : '',\nAmazonAddressInterface::FIRST_NAME => $this->escaper->escapeHtml($amazonName->getFirstName()),\nAmazonAddressInterface::LAST_NAME => $this->escaper->escapeHtml($amazonName->getLastName()),\nAmazonAddressInterface::LINES => $this->getLines($address)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Helper/SubjectReader.php", "new_path": "src/Payment/Gateway/Helper/SubjectReader.php", "diff": "@@ -137,20 +137,6 @@ class SubjectReader\nreturn $quoteLink;\n}\n- /**\n- * Adds status message - should be called after transaction and order are saved\n- * and ID exists.\n- *\n- * @param $message\n- */\n- public function setOrderMessage($message)\n- {\n- $order = $this->getOrder();\n- if ($order) {\n- $order->addStatusHistoryComment($message);\n- }\n- }\n-\n/**\n* @return \\Magento\\Sales\\Model\\Order\n*/\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/CompleteAuthHandler.php", "new_path": "src/Payment/Gateway/Response/CompleteAuthHandler.php", "diff": "@@ -95,11 +95,6 @@ class CompleteAuthHandler implements HandlerInterface\n$payment->setIsTransactionClosed(false);\n$quoteLink = $this->subjectReader->getQuoteLink();\n$quoteLink->setConfirmed(true)->save();\n-\n- $message = __('Authorized amount of %1 online', $order->getGrandTotal());\n- $message .= ' ' . __('Transaction ID: \"%1\"', $amazonId);\n-\n- $order->addStatusHistoryComment($message);\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/CompleteSaleHandler.php", "new_path": "src/Payment/Gateway/Response/CompleteSaleHandler.php", "diff": "@@ -104,12 +104,6 @@ class CompleteSaleHandler implements HandlerInterface\n$quoteLink = $this->subjectReader->getQuoteLink();\n$quoteLink->setConfirmed(true)->save();\n-\n- $message = __('Captured amount of %1 online', $order->getGrandTotal());\n- $message .= ' ' . __('Transaction ID: \"%1\"', $amazonId);\n-\n- $order->addStatusHistoryComment($message);\n-\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/SettlementHandler.php", "new_path": "src/Payment/Gateway/Response/SettlementHandler.php", "diff": "@@ -100,12 +100,6 @@ class SettlementHandler implements HandlerInterface\n$quote = $this->quoteRepository->get($order->getQuoteId());\n$quoteLink = $this->subjectReader->getQuoteLink($quote->getId());\n$quoteLink->setConfirmed(true)->save();\n-\n- $message = __('Captured amount of %1 online', $order->getGrandTotal());\n- $message .= ' ' . __('Transaction ID: \"%1\"', $quoteLink->getAmazonOrderReferenceId());\n-\n- $order->addStatusHistoryComment($message);\n-\n}\n}\nelse {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Logger/Handler/Client.php", "new_path": "src/Core/Logger/Handler/Client.php", "diff": "namespace Amazon\\Core\\Logger\\Handler;\nuse Magento\\Framework\\Logger\\Handler\\Base;\n-use Monolog\\Logger;\nclass Client extends Base\n{\n@@ -30,5 +29,5 @@ class Client extends Base\n/**\n* @var int\n*/\n- protected $loggerType = Logger::DEBUG;\n+ protected $loggerType = \\Monolog\\Logger::DEBUG;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Logger/Handler/Ipn.php", "new_path": "src/Core/Logger/Handler/Ipn.php", "diff": "namespace Amazon\\Core\\Logger\\Handler;\nuse Magento\\Framework\\Logger\\Handler\\Base;\n-use Monolog\\Logger;\nclass Ipn extends Base\n{\n@@ -30,5 +29,5 @@ class Ipn extends Base\n/**\n* @var int\n*/\n- protected $loggerType = Logger::DEBUG;\n+ protected $loggerType = \\Monolog\\Logger::DEBUG;\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Core/Logger/IpnLogger.php", "diff": "+<?php\n+/*\n+ * Copyright 2017 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://www.apache.org/licenses/LICENSE-2.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+\n+namespace Amazon\\Core\\Logger;\n+\n+/**\n+ * Class Logger\n+ *\n+ * @package Amazon\\MCF\\Logger\n+ */\n+class IpnLogger extends \\Monolog\\Logger\n+{\n+}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Core/Logger/Logger.php", "diff": "+<?php\n+/*\n+ * Copyright 2017 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://www.apache.org/licenses/LICENSE-2.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+\n+namespace Amazon\\Core\\Logger;\n+\n+/**\n+ * Class Logger\n+ *\n+ * @package Amazon\\MCF\\Logger\n+ */\n+class Logger extends \\Monolog\\Logger\n+{\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/di.xml", "new_path": "src/Core/etc/di.xml", "diff": "<argument name=\"remoteAddress\" xsi:type=\"object\">Amazon_Core_RemoteAddressWithAdditionalIpHeaders</argument>\n</arguments>\n</type>\n- <virtualType name=\"amazonClientLogger\" type=\"Magento\\Framework\\Logger\\Monolog\">\n+ <type name=\"Amazon\\Core\\Logger\\Logger\">\n<arguments>\n+ <argument name=\"name\" xsi:type=\"string\">amazonClientLogger</argument>\n<argument name=\"handlers\" xsi:type=\"array\">\n<item name=\"debug\" xsi:type=\"object\">Amazon\\Core\\Logger\\Handler\\Client</item>\n</argument>\n</arguments>\n- </virtualType>\n+ </type>\n<type name=\"Amazon\\Core\\Client\\ClientFactory\">\n<arguments>\n- <argument name=\"logger\" xsi:type=\"object\">amazonClientLogger</argument>\n+ <argument name=\"logger\" xsi:type=\"object\">Amazon\\Core\\Logger\\Logger</argument>\n</arguments>\n</type>\n<type name=\"Amazon\\Core\\Helper\\CategoryExclusion\">\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "</argument>\n</arguments>\n</type>\n- <virtualType name=\"amazonIpnLogger\" type=\"Magento\\Framework\\Logger\\Monolog\">\n+ <type name=\"Amazon\\Core\\Logger\\IpnLogger\">\n<arguments>\n+ <argument name=\"name\" xsi:type=\"string\">amazonIpnLogger</argument>\n<argument name=\"handlers\" xsi:type=\"array\">\n<item name=\"debug\" xsi:type=\"object\">Amazon\\Core\\Logger\\Handler\\Ipn</item>\n</argument>\n</arguments>\n- </virtualType>\n+ </type>\n<type name=\"Amazon\\Payment\\Ipn\\IpnHandlerFactoryInterface\">\n<arguments>\n<argument name=\"logger\" xsi:type=\"object\">amazonIpnLogger</argument>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Logger/IpnLogger.php", "new_path": "src/Core/Logger/IpnLogger.php", "diff": "<?php\n-/*\n- * Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.\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://www.apache.org/licenses/LICENSE-2.0\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-\nnamespace Amazon\\Core\\Logger;\n/**\n- * Class Logger\n- *\n- * @package Amazon\\MCF\\Logger\n+ * Enables implementation of custom log file.\n*/\nclass IpnLogger extends \\Monolog\\Logger\n{\n" }, { "change_type": "MODIFY", "old_path": "src/Core/Logger/Logger.php", "new_path": "src/Core/Logger/Logger.php", "diff": "<?php\n-/*\n- * Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.\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://www.apache.org/licenses/LICENSE-2.0\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-\nnamespace Amazon\\Core\\Logger;\n/**\n- * Class Logger\n- *\n- * @package Amazon\\MCF\\Logger\n+ * Enables implementation of custom log file.\n*/\nclass Logger extends \\Monolog\\Logger\n{\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "</type>\n<type name=\"Amazon\\Payment\\Ipn\\IpnHandlerFactoryInterface\">\n<arguments>\n- <argument name=\"logger\" xsi:type=\"object\">amazonIpnLogger</argument>\n+ <argument name=\"logger\" xsi:type=\"object\">Amazon\\Core\\Logger\\IpnLogger</argument>\n</arguments>\n</type>\n<type name=\"Magento\\Framework\\Webapi\\ErrorProcessor\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Helper/Data.php", "new_path": "src/Core/Helper/Data.php", "diff": "@@ -559,9 +559,9 @@ class Data extends AbstractHelper\n'Authorization:Declined:InvalidPaymentMethod' => __('Authorization soft decline'),\n'Authorization:Declined:AmazonRejected' => __('Authorization hard decline'),\n'Authorization:Declined:TransactionTimedOut' => __('Authorization timed out'),\n- 'Capture:Declined:AmazonRejected' => __('Capture declined'),\n- 'Capture:Pending' => __('Capture pending'),\n- 'Refund:Declined' => __('Refund declined')\n+ // 'Capture:Declined:AmazonRejected' => __('Capture declined'),\n+ // 'Capture:Pending' => __('Capture pending'),\n+ //'Refund:Declined' => __('Refund declined')\n];\nreturn $simulationlabels;\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"ciaranmcnulty/behat-stepthroughextension\": \"dev-master\"\n},\n\"require\": {\n- \"php\": \"~7.0.13|~7.1.0\",\n\"magento/framework\": \"101.0.*\",\n\"magento/module-sales\": \"101.0.*\",\n\"magento/module-checkout\": \"100.2.*\",\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.0.13|~7.1.0\",\n\"magento/framework\": \"101.0.*\",\n\"magento/module-config\": \"101.0.*\",\n\"magento/module-store\": \"^100.1\",\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.0.13|~7.1.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"magento/module-customer\": \"^101.0\",\n\"magento/module-store\": \"^100.1\",\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.0.13|~7.1.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"amzn/login-with-amazon-module\": \"^2.1.0\",\n\"magento/module-eav\": \"101.0.*\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Http/Client/AbstractClient.php", "new_path": "src/Payment/Gateway/Http/Client/AbstractClient.php", "diff": "@@ -95,7 +95,7 @@ abstract class AbstractClient implements ClientInterface\ntry {\n$response = $this->process($data);\n} catch (\\Exception $e) {\n- $message = $e->getMessage() ?: \"Something went wrong during Gateway request.\";\n+ $message = $e->getMessage() ? $e->getMessage() : \"Something went wrong during Gateway request.\";\n$log['error'] = $message;\n$this->logger->debug($log);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"Apache-2.0\"\n],\n\"require-dev\": {\n- \"guzzlehttp/guzzle\": \"^6.2.0\",\n- \"phpunit/phpunit\": \"4.1.0\",\n+ \"guzzlehttp/guzzle\": \">=4.1.4 <7.0\",\n+ \"phpunit/phpunit\": \"*\",\n\"behat/behat\": \"^3.1.0\",\n\"behat/mink\": \"^1.7.1\",\n\"behat/mink-extension\": \"^2.2\",\n\"ciaranmcnulty/behat-stepthroughextension\": \"dev-master\"\n},\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n- \"magento/framework\": \"101.0.*\",\n- \"magento/module-sales\": \"101.0.*\",\n- \"magento/module-checkout\": \"100.2.*\",\n- \"magento/module-payment\": \"100.2.*\",\n- \"magento/module-eav\": \"101.0.*\",\n- \"magento/module-developer\": \"100.2.*\",\n- \"magento/module-config\": \"101.0.*\",\n- \"magento/module-backend\": \"100.2.*\",\n- \"magento/module-quote\": \"101.0.*\",\n- \"magento/module-customer\": \"^101.0\",\n- \"magento/module-store\": \"^100.1\",\n+ \"php\": \"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/module-developer\": \"*\",\n+ \"magento/module-config\": \"*\",\n+ \"magento/module-backend\": \"*\",\n+ \"magento/module-quote\": \"*\",\n+ \"magento/module-customer\": \"*\",\n+ \"magento/module-store\": \"^*\",\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": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n- \"magento/framework\": \"101.0.*\",\n- \"magento/module-config\": \"101.0.*\",\n- \"magento/module-store\": \"^100.1\",\n- \"magento/module-developer\": \"100.2.*\",\n- \"magento/module-quote\": \"101.0.*\",\n- \"magento/module-catalog\": \"102.0.*\",\n- \"magento/module-customer\": \"^101.0\",\n- \"magento/module-checkout\": \"100.2.*\",\n- \"magento/module-backend\": \"100.2.*\",\n- \"magento/module-payment\": \"100.2.*\",\n- \"magento/module-paypal\": \"100.2.*\",\n+ \"php\": \"php: ~7.1.3||~7.2.0\",\n+ \"magento/framework\": \"*\",\n+ \"magento/module-config\": \"*\",\n+ \"magento/module-store\": \"*\",\n+ \"magento/module-developer\": \"*\",\n+ \"magento/module-quote\": \"*\",\n+ \"magento/module-catalog\": \"*\",\n+ \"magento/module-customer\": \"*\",\n+ \"magento/module-checkout\": \"*\",\n+ \"magento/module-backend\": \"*\",\n+ \"magento/module-payment\": \"*\",\n+ \"magento/module-paypal\": \"*\",\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": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.1\",\n- \"magento/module-customer\": \"^101.0\",\n- \"magento/module-store\": \"^100.1\",\n- \"magento/module-eav\": \"101.0.*\",\n- \"magento/module-checkout\": \"100.2.*\",\n- \"magento/module-checkout-agreements\": \"100.2.*\"\n+ \"php\": \"php: ~7.1.3||~7.2.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n+ \"magento/module-customer\": \"*\",\n+ \"magento/module-store\": \"*\",\n+ \"magento/module-eav\": \"*\",\n+ \"magento/module-checkout\": \"*\",\n+ \"magento/module-checkout-agreements\": \"*\"\n},\n\"suggest\": {\n- \"magento/module-sales\": \"101.0.*\"\n+ \"magento/module-sales\": \"*\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\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- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.1\",\n- \"amzn/login-with-amazon-module\": \"^2.1.1\",\n- \"magento/module-eav\": \"101.0.*\",\n- \"magento/module-sales\": \"101.0.*\",\n- \"magento/module-quote\": \"101.0.*\",\n- \"magento/module-payment\": \"100.2.*\",\n- \"magento/module-backend\": \"100.2.*\",\n- \"magento/module-store\": \"^100.1\",\n- \"magento/module-checkout\": \"100.2.*\",\n- \"magento/module-catalog\": \"102.0.*\",\n- \"magento/module-paypal\": \"100.2.*\",\n- \"magento/module-directory\": \"100.2.*\"\n+ \"php\": \"php: ~7.1.3||~7.2.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n+ \"amzn/login-with-amazon-module\": \"^2.1.0\",\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/module-paypal\": \"*\",\n+ \"magento/module-directory\": \"*\"\n},\n\"suggest\": {\n- \"magento/module-customer\": \"^101.0\",\n- \"magento/module-scalable-checkout\": \"100.2.*\",\n- \"magento/module-scalable-oms\": \"100.2.*\"\n+ \"magento/module-customer\": \"*\",\n+ \"magento/module-scalable-checkout\": \"*\",\n+ \"magento/module-scalable-oms\": \"*\"\n},\n\"autoload\": {\n\"files\": [\"registration.php\"],\n" } ]

[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"ciaranmcnulty/behat-stepthroughextension\": \"dev-master\"\n},\n\"require\": {\n- \"php\": \"php: ~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"magento/framework\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-checkout\": \"*\",\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\": \"php: ~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"magento/framework\": \"*\",\n\"magento/module-config\": \"*\",\n\"magento/module-store\": \"*\",\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\": \"php: ~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\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\": \"php: ~7.1.3||~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"amzn/login-with-amazon-module\": \"^2.1.0\",\n\"magento/module-eav\": \"*\",\n" } ]

[ { "change_type": "DELETE", "old_path": "src/Core/Setup/UpgradeSchema.php", "new_path": null, "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\\Core\\Setup;\n-\n-use Magento\\Framework\\Setup\\ModuleContextInterface;\n-use Magento\\Framework\\Setup\\SchemaSetupInterface;\n-use Magento\\Framework\\Setup\\UpgradeSchemaInterface;\n-\n-class UpgradeSchema implements UpgradeSchemaInterface\n-{\n-\n- public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)\n- {\n- $setup->startSetup();\n-\n- if (version_compare($context->getVersion(), '1.0.0', '<=')) {\n- $setup->getConnection()->addColumn(\n- $setup->getTable('quote_item'),\n- 'is_excluded_product',\n- [\n- 'type' => \\Magento\\Framework\\DB\\Ddl\\Table::TYPE_SMALLINT,\n- 'visible' => false,\n- 'required' => false,\n- 'default' => 0,\n- 'nullable' => false,\n- 'unsigned' => true,\n- 'comment' => 'Flags whether or not product is excluded from Amazon Pay'\n- ]\n- );\n- }\n-\n- $setup->endSetup();\n- }\n-}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Core/etc/db_schema.xml", "diff": "+<schema xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd\">\n+ <table name=\"amazon_quote\" resource=\"checkout\" engine=\"innodb\" comment=\"amazon_quote\">\n+ <column xsi:type=\"int\" name=\"entity_id\" padding=\"10\" unsigned=\"true\" nullable=\"false\" identity=\"true\"\n+ comment=\"Entity ID\"/>\n+ <column xsi:type=\"int\" name=\"quote_id\" padding=\"10\" unsigned=\"true\" nullable=\"false\" identity=\"false\"\n+ comment=\"Quote ID\"/>\n+ <column xsi:type=\"varchar\" name=\"amazon_order_reference_id\" nullable=\"false\" length=\"255\" comment=\"Amazon Order Reference ID\"/>\n+ <column xsi:type=\"varchar\" name=\"sandbox_simulation_reference\" nullable=\"true\" length=\"255\" comment=\"Sandbox simulation reference\"/>\n+ <column xsi:type=\"smallint\" name=\"confirmed\" padding=\"5\" unsigned=\"true\" nullable=\"false\"\n+ identity=\"false\" default=\"0\" comment=\"Quote confirmed with Amazon\"/>\n+ <constraint xsi:type=\"primary\" name=\"PRIMARY\">\n+ <column name=\"entity_id\"/>\n+ </constraint>\n+ <constraint xsi:type=\"foreign\" name=\"AMAZON_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID\" table=\"amazon_quote\"\n+ column=\"quote_id\" referenceTable=\"quote\" referenceColumn=\"entity_id\" onDelete=\"CASCADE\"/>\n+ <index name=\"AMAZON_QUOTE_QUOTE_ID\" indexType=\"btree\">\n+ <column name=\"quote_id\"/>\n+ </index>\n+ </table>\n+ <table name=\"amazon_sales_order\" resource=\"sales\" engine=\"innodb\" comment=\"amazon_sales_order\">\n+ <column xsi:type=\"int\" name=\"entity_id\" padding=\"10\" unsigned=\"true\" nullable=\"false\" identity=\"true\"\n+ comment=\"Entity ID\"/>\n+ <column xsi:type=\"int\" name=\"order_id\" padding=\"10\" unsigned=\"true\" nullable=\"false\" identity=\"false\"\n+ comment=\"Order ID\"/>\n+ <column xsi:type=\"varchar\" name=\"amazon_order_reference_id\" nullable=\"false\" length=\"255\" comment=\"Amazon Order Reference ID\"/>\n+ <constraint xsi:type=\"primary\" name=\"PRIMARY\">\n+ <column name=\"entity_id\"/>\n+ </constraint>\n+ <constraint xsi:type=\"foreign\" name=\"AMAZON_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID\" table=\"amazon_sales_order\"\n+ column=\"order_id\" referenceTable=\"sales_order\" referenceColumn=\"entity_id\" onDelete=\"CASCADE\"/>\n+ <index name=\"AMAZON_SALES_ORDER_ORDER_ID\" indexType=\"btree\">\n+ <column name=\"order_id\"/>\n+ </index>\n+ </table>\n+</schema>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Setup/UpgradeSchema.php", "new_path": "src/Payment/Setup/UpgradeSchema.php", "diff": "@@ -44,84 +44,7 @@ class UpgradeSchema implements UpgradeSchemaInterface\n*/\npublic function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)\n{\n- if (version_compare($context->getVersion(), '1.1.0', '<')) {\n- $linkTables = [\n- 'quote_id' => QuoteLink::TABLE_NAME,\n- 'order_id' => OrderLink::TABLE_NAME\n- ];\n-\n- foreach ($linkTables as $fieldName => $tableName) {\n- $table = $setup->getConnection()->newTable($setup->getTable($tableName));\n-\n- $table\n- ->addColumn(\n- 'entity_id',\n- Table::TYPE_INTEGER,\n- null,\n- [\n- 'identity' => true,\n- 'unsigned' => true,\n- 'primary' => true,\n- 'nullable' => false\n- ]\n- )\n- ->addColumn(\n- $fieldName,\n- Table::TYPE_INTEGER,\n- null,\n- [\n- 'unsigned' => true,\n- 'nullable' => false\n- ]\n- )\n- ->addColumn(\n- 'amazon_order_reference_id',\n- Table::TYPE_TEXT,\n- 255,\n- [\n- 'nullable' => false\n- ]\n- )\n- ->addIndex(\n- $setup->getIdxName(\n- $tableName,\n- [$fieldName],\n- AdapterInterface::INDEX_TYPE_UNIQUE\n- ),\n- [$fieldName],\n- ['type' => AdapterInterface::INDEX_TYPE_UNIQUE]\n- );\n-\n- $setup->getConnection()->createTable($table);\n- }\n- }\n- if (version_compare($context->getVersion(), '1.2.0', '<')) {\n- $setup->getConnection()->addColumn(\n- $setup->getTable(QuoteLink::TABLE_NAME),\n- 'sandbox_simulation_reference',\n- [\n- 'type' => Table::TYPE_TEXT,\n- 'length' => 255,\n- 'nullable' => true,\n- 'comment' => 'Sandbox simulation reference'\n- ]\n- );\n- }\n-\n- if (version_compare($context->getVersion(), '1.3.0', '<')) {\n- $setup->getConnection()->addColumn(\n- $setup->getTable(QuoteLink::TABLE_NAME),\n- 'confirmed',\n- [\n- 'unsigned' => true,\n- 'nullable' => false,\n- 'default' => 0,\n- 'type' => Table::TYPE_SMALLINT,\n- 'comment' => 'Quote confirmed with Amazon'\n- ]\n- );\n- }\nif (version_compare($context->getVersion(), '1.4.0', '<')) {\n$table = $setup->getConnection()->newTable($setup->getTable(PendingCapture::TABLE_NAME));\n@@ -167,25 +90,6 @@ class UpgradeSchema implements UpgradeSchemaInterface\n$setup->getConnection()->createTable($table);\n}\n- if (version_compare($context->getVersion(), '1.6.0', '<')) {\n- $setup->getConnection()->addForeignKey(\n- $setup->getFkName(QuoteLink::TABLE_NAME, 'quote_id', $setup->getTable('quote'), 'entity_id'),\n- $setup->getTable(QuoteLink::TABLE_NAME),\n- 'quote_id',\n- $setup->getTable('quote'),\n- 'entity_id',\n- AdapterInterface::FK_ACTION_CASCADE\n- );\n-\n- $setup->getConnection()->addForeignKey(\n- $setup->getFkName(OrderLink::TABLE_NAME, 'order_id', $setup->getTable('sales_order'), 'entity_id'),\n- $setup->getTable(OrderLink::TABLE_NAME),\n- 'order_id',\n- $setup->getTable('sales_order'),\n- 'entity_id',\n- AdapterInterface::FK_ACTION_CASCADE\n- );\n- }\nif (version_compare($context->getVersion(), '1.7.0', '<')) {\n$this->addColumnsToPendingCaptureQueue($setup);\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/extension_attributes.xml", "new_path": "src/Payment/etc/extension_attributes.xml", "diff": "<?xml version=\"1.0\"?>\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Api/etc/extension_attributes.xsd\">\n<extension_attributes for=\"Magento\\Quote\\Api\\Data\\CartInterface\">\n- <attribute code=\"amazon_order_reference_id\" type=\"string\">\n+ <attribute code=\"amazon_order_reference_id\" type=\"Amazon\\Payment\\Api\\Data\\QuoteLinkInterface\">\n<join reference_table=\"amazon_quote\" reference_field=\"quote_id\" join_on_field=\"entity_id\">\n<field>amazon_order_reference_id</field>\n+ <field>quote_id</field>\n+ <field>sandbox_simulation_reference</field>\n+ <field>confirmed</field>\n</join>\n</attribute>\n</extension_attributes>\n<extension_attributes for=\"Magento\\Sales\\Api\\Data\\OrderInterface\">\n- <attribute code=\"amazon_order_reference_id\" type=\"string\">\n+ <attribute code=\"amazon_order_reference_id\" type=\"Amazon\\Payment\\Api\\Data\\OrderLinkInterface\">\n<join reference_table=\"amazon_sales_order\" reference_field=\"order_id\" join_on_field=\"entity_id\">\n<field>amazon_order_reference_id</field>\n+ <field>order_id</field>\n</join>\n</attribute>\n</extension_attributes>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/adminhtml/system.xml", "new_path": "src/Core/etc/adminhtml/system.xml", "diff": "<config_path>payment/amazon_payment/button_size</config_path>\n</field>\n<field id=\"pwa_pp_button_is_visible\" translate=\"label\" type=\"select\" sortOrder=\"70\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Amazon Pay button on Product Page</label>\n+ <label>Show Amazon Pay button on product page</label>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n<config_path>payment/amazon_payment/pwa_pp_button_is_visible</config_path>\n</field>\n<field id=\"minicart_button_is_visible\" translate=\"label comment\" type=\"select\" sortOrder=\"80\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Amazon Pay button in minicart</label>\n+ <label>Show Amazon Pay button in minicart</label>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n<config_path>payment/amazon_payment/minicart_button_is_visible</config_path>\n</field>\n<field id=\"amazonloggin\" translate=\"label comment\" type=\"select\" sortOrder=\"80\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Display Amazon Pay Method</label>\n+ <label>Show Amazon Pay Method</label>\n<comment><![CDATA[If enabled, Amazon Pay is presented as an option in the list of available payment methods during the final step of checkout.]]></comment>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n<config_path>payment/amazonlogin/active</config_path>\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/adminhtml/system.xml", "new_path": "src/Login/etc/adminhtml/system.xml", "diff": "<group id=\"advanced\">\n<group id=\"frontend\">\n<field id=\"amazon_login_in_popup\" translate=\"label comment\" type=\"select\" sortOrder=\"60\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Login with Amazon available in authentication popup</label>\n+ <label>Show Login with Amazon in authentication popup</label>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n<config_path>payment/amazon_payment/amazon_login_in_popup</config_path>\n+ <comment><![CDATA[Displays Login with Amazon Pay option in Magento's account login popup.]]></comment>\n</field>\n</group>\n</group>\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.0.13|~7.1.0|~7.2.0\",\n\"magento/framework\": \"*\",\n\"magento/module-config\": \"*\",\n\"magento/module-store\": \"*\",\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.0.13|~7.1.0|~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.0\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/composer.json", "new_path": "src/Payment/Test/Mftf/composer.json", "diff": "\"Apache-2.0\"\n],\n\"require\": {\n- \"php\": \"~7.1.3||~7.2.0\",\n+ \"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n\"magento/module-customer\": \"^101.0\",\n\"magento/module-store\": \"^100.1\",\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.0.13|~7.1.0|~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.0\",\n\"amzn/login-with-amazon-module\": \"^2.2.0\",\n\"magento/module-eav\": \"*\",\n" } ]

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

[ { "change_type": "ADD", "old_path": null, "new_path": "src/Core/etc/db_schema_whitelist.json", "diff": "+{\n+ \"amazon_quote\": {\n+ \"column\": {\n+ \"entity_id\": true,\n+ \"quote_id\": true,\n+ \"amazon_order_reference_id\": true,\n+ \"sandbox_simulation_reference\": true,\n+ \"confirmed\": true\n+ },\n+ \"index\": {\n+ \"AMAZON_QUOTE_QUOTE_ID\": true\n+ },\n+ \"constraint\": {\n+ \"PRIMARY\": true,\n+ \"AMAZON_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID\": true\n+ }\n+ },\n+ \"amazon_sales_order\": {\n+ \"column\": {\n+ \"entity_id\": true,\n+ \"order_id\": true,\n+ \"amazon_order_reference_id\": true\n+ },\n+ \"index\": {\n+ \"AMAZON_SALES_ORDER_ORDER_ID\": true\n+ },\n+ \"constraint\": {\n+ \"PRIMARY\": true,\n+ \"AMAZON_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID\": true\n+ }\n+ }\n+}\n\\ No newline at end of file\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "</type>\n<type name=\"Amazon\\Payment\\Model\\QueuedRefundUpdater\">\n<arguments>\n- <argument name=\"adminNotifier\" xsi:type=\"object\">Magento\\Framework\\Notification\\NotifierInterface\\Proxy\n- </argument>\n+ <argument name=\"adminNotifier\"\n+ xsi:type=\"object\">Magento\\Framework\\Notification\\NotifierInterface\\Proxy</argument>\n</arguments>\n</type>\n<type name=\"Amazon\\Payment\\Api\\Ipn\\CompositeProcessorInterface\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\"\ntype=\"Magento\\Payment\\Gateway\\ErrorMapper\\ErrorMessageMapper\">\n<arguments>\n- <argument name=\"messageMapping\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData\n- </argument>\n+ <argument name=\"messageMapping\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData</argument>\n</arguments>\n</virtualType>\n<!-- Authorize command -->\n<virtualType name=\"AmazonAuthorizeCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder\n- </argument>\n+ <argument name=\"requestBuilder\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\CompleteAuthHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\AuthorizeClient</argument>\n<argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\n- </argument>\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<!-- Authorize and Capture command -->\n<virtualType name=\"AmazonSaleCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder\n- </argument>\n+ <argument name=\"requestBuilder\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\CompleteSaleHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\CaptureClient</argument>\n<argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\n- </argument>\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<!-- Capture settlement command -->\n<virtualType name=\"AmazonSettlementCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\SettlementRequestBuilder\n- </argument>\n+ <argument name=\"requestBuilder\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\SettlementRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\SettlementHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\SettlementClient</argument>\n<argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\n- </argument>\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\RefundRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\RefundHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n- <argument name=\"validator\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator\n- </argument>\n+ <argument name=\"validator\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\RefundClient</argument>\n<argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\n- </argument>\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\VoidRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\VoidHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n- <argument name=\"validator\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator\n- </argument>\n+ <argument name=\"validator\"\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\VoidClient</argument>\n<argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\n- </argument>\n+ xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<argument name=\"processors\" xsi:type=\"array\">\n<item name=\"captureprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\CaptureProcessor\\Proxy</item>\n<item name=\"authorizationprocessor\"\n- xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\AuthorizationProcessor\\Proxy\n- </item>\n+ xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\AuthorizationProcessor\\Proxy</item>\n<item name=\"orderprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\OrderProcessor\\Proxy</item>\n<item name=\"refundprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\RefundProcessor\\Proxy</item>\n</argument>\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\": \"2.2.0\",\n+ \"version\": \"2.2.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Test/Mftf/composer.json", "new_path": "src/Payment/Test/Mftf/composer.json", "diff": "\"name\": \"amzn/login-with-amazon-module\",\n\"description\": \"Login with Amazon module\",\n\"type\": \"magento2-module\",\n- \"version\": \"2.1.0\",\n+ \"version\": \"2.2.2\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.1.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.2\",\n\"magento/module-customer\": \"^101.0\",\n\"magento/module-store\": \"^100.1\",\n\"magento/module-eav\": \"101.0.*\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/adminhtml/system.xml", "new_path": "src/Core/etc/adminhtml/system.xml", "diff": "<config_path>payment/amazon_payment/minicart_button_is_visible</config_path>\n</field>\n<field id=\"amazonloggin\" translate=\"label comment\" type=\"select\" sortOrder=\"80\" showInDefault=\"1\" showInWebsite=\"1\" showInStore=\"1\">\n- <label>Show Amazon Pay Method</label>\n+ <label>Show Amazon Pay in payment methods</label>\n<comment><![CDATA[If enabled, Amazon Pay is presented as an option in the list of available payment methods during the final step of checkout.]]></comment>\n<source_model>Magento\\Config\\Model\\Config\\Source\\Yesno</source_model>\n<config_path>payment/amazonlogin/active</config_path>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/etc/di.xml", "new_path": "src/Core/etc/di.xml", "diff": "<preference for=\"Amazon\\Core\\Api\\Data\\AmazonNameInterface\" type=\"Amazon\\Core\\Domain\\AmazonName\" />\n<preference for=\"Amazon\\Core\\Api\\Data\\AmazonCustomerInterface\" type=\"Amazon\\Core\\Domain\\AmazonCustomer\" />\n<preference for=\"Amazon\\Core\\Api\\Data\\AmazonAddressInterface\" type=\"Amazon\\Core\\Domain\\AmazonAddress\" />\n-\n<preference for=\"AmazonPay\\ClientInterface\" type=\"Amazon\\Core\\Client\\Client\" />\n<type name=\"Amazon\\Core\\Client\\Client\">\n<arguments>\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/QuoteLinkManagement.php", "new_path": "src/Payment/Model/QuoteLinkManagement.php", "diff": "@@ -55,7 +55,7 @@ class QuoteLinkManagement implements QuoteLinkManagementInterface\n$amazonQuote->load($cart->getId(), 'quote_id');\nif ($amazonQuote->getId()) {\n- $cartExtension->setAmazonOrderReferenceId($amazonQuote->getAmazonOrderReferenceId());\n+ $cartExtension->setAmazonOrderReferenceId($amazonQuote);\n}\n$cart->setExtensionAttributes($cartExtension);\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Observer/LoadOrder.php", "new_path": "src/Payment/Observer/LoadOrder.php", "diff": "@@ -66,7 +66,7 @@ class LoadOrder implements ObserverInterface\n$amazonOrder->load($order->getId(), 'order_id');\nif ($amazonOrder->getId()) {\n- $orderExtension->setAmazonOrderReferenceId($amazonOrder->getAmazonOrderReferenceId());\n+ $orderExtension->setAmazonOrderReferenceId($amazonOrder);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/di.xml", "new_path": "src/Payment/etc/di.xml", "diff": "<?xml version=\"1.0\"?>\n-<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n- xsi:noNamespaceSchemaLocation=\"urn:magento:framework:ObjectManager/etc/config.xsd\">\n- <!-- Begin gateway config -->\n+<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:ObjectManager/etc/config.xsd\">\n<!-- Payment Method Facade configuration -->\n<virtualType name=\"AmazonFacade\" type=\"Magento\\Payment\\Model\\Method\\Adapter\">\n<arguments>\n</arguments>\n</virtualType>\n-\n<!-- Amazon validators infrastructure -->\n<virtualType name=\"AmazonCountryValidator\" type=\"Magento\\Payment\\Gateway\\Validator\\CountryValidator\">\n<arguments>\n</argument>\n</arguments>\n</virtualType>\n- <!-- Amazon validators infrastructure -->\n-\n<!-- Amazon error code mapper -->\n-\n- <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualConfigReader\"\n- type=\"Magento\\Payment\\Gateway\\ErrorMapper\\VirtualConfigReader\">\n+ <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualConfigReader\" type=\"Magento\\Payment\\Gateway\\ErrorMapper\\VirtualConfigReader\">\n<arguments>\n<argument name=\"fileName\" xsi:type=\"string\">amazon_error_mapping.xml</argument>\n</arguments>\n</virtualType>\n- <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData\"\n- type=\"Magento\\Payment\\Gateway\\ErrorMapper\\MappingData\">\n+ <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData\" type=\"Magento\\Payment\\Gateway\\ErrorMapper\\MappingData\">\n<arguments>\n<argument name=\"reader\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualConfigReader</argument>\n<argument name=\"cacheId\" xsi:type=\"string\">amazon_error_mapper</argument>\n</arguments>\n</virtualType>\n- <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\"\n- type=\"Magento\\Payment\\Gateway\\ErrorMapper\\ErrorMessageMapper\">\n+ <virtualType name=\"Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper\" type=\"Magento\\Payment\\Gateway\\ErrorMapper\\ErrorMessageMapper\">\n<arguments>\n- <argument name=\"messageMapping\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData</argument>\n+ <argument name=\"messageMapping\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualMappingData</argument>\n</arguments>\n</virtualType>\n<!-- Authorize command -->\n<virtualType name=\"AmazonAuthorizeCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n+ <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\CompleteAuthHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\AuthorizeClient</argument>\n- <argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n+ <argument name=\"errorMessageMapper\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<!-- Authorize and Capture command -->\n<virtualType name=\"AmazonSaleCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n+ <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\AuthorizationRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\CompleteSaleHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\CaptureClient</argument>\n- <argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n+ <argument name=\"errorMessageMapper\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<!-- Capture settlement command -->\n<virtualType name=\"AmazonSettlementCommand\" type=\"Amazon\\Payment\\Gateway\\Command\\AmazonAuthCommand\">\n<arguments>\n- <argument name=\"requestBuilder\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\SettlementRequestBuilder</argument>\n+ <argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\SettlementRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\SettlementHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n<argument name=\"validator\" xsi:type=\"object\">AmazonAuthorizationValidators</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\SettlementClient</argument>\n- <argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n+ <argument name=\"errorMessageMapper\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\RefundRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\RefundHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n- <argument name=\"validator\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n+ <argument name=\"validator\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\RefundClient</argument>\n- <argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n+ <argument name=\"errorMessageMapper\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<argument name=\"requestBuilder\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Request\\VoidRequestBuilder</argument>\n<argument name=\"handler\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Response\\VoidHandler</argument>\n<argument name=\"transferFactory\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\TransferFactory</argument>\n- <argument name=\"validator\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n+ <argument name=\"validator\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Validator\\AuthorizationValidator</argument>\n<argument name=\"client\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\Http\\Client\\VoidClient</argument>\n- <argument name=\"errorMessageMapper\"\n- xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n+ <argument name=\"errorMessageMapper\" xsi:type=\"object\">Amazon\\Payment\\Gateway\\ErrorMapper\\VirtualErrorMessageMapper</argument>\n</arguments>\n</virtualType>\n<!-- end gateway config -->\n- <preference for=\"Amazon\\Payment\\Api\\OrderInformationManagementInterface\"\n- type=\"Amazon\\Payment\\Model\\OrderInformationManagement\"/>\n+ <preference for=\"Amazon\\Payment\\Api\\OrderInformationManagementInterface\" type=\"Amazon\\Payment\\Model\\OrderInformationManagement\"/>\n<preference for=\"Amazon\\Payment\\Api\\AddressManagementInterface\" type=\"Amazon\\Payment\\Model\\AddressManagement\"/>\n<preference for=\"Amazon\\Payment\\Api\\QuoteLinkManagementInterface\" type=\"Amazon\\Payment\\Model\\QuoteLinkManagement\"/>\n<preference for=\"Amazon\\Payment\\Api\\Data\\QuoteLinkInterface\" type=\"Amazon\\Payment\\Model\\QuoteLink\"/>\n<preference for=\"Amazon\\Payment\\Api\\Data\\OrderLinkInterface\" type=\"Amazon\\Payment\\Model\\OrderLink\"/>\n<preference for=\"Amazon\\Payment\\Api\\Data\\PendingCaptureInterface\" type=\"Amazon\\Payment\\Model\\PendingCapture\"/>\n- <preference for=\"Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterface\"\n- type=\"Amazon\\Payment\\Model\\PendingAuthorization\"/>\n+ <preference for=\"Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterface\" type=\"Amazon\\Payment\\Model\\PendingAuthorization\"/>\n<preference for=\"Amazon\\Payment\\Api\\Data\\PendingRefundInterface\" type=\"Amazon\\Payment\\Model\\PendingRefund\"/>\n<preference for=\"Amazon\\Payment\\Ipn\\IpnHandlerFactoryInterface\" type=\"Amazon\\Payment\\Ipn\\IpnHandlerFactory\"/>\n<preference for=\"AmazonPay\\IpnHandlerInterface\" type=\"Amazon\\Payment\\Ipn\\IpnHandler\"/>\n- <preference for=\"Amazon\\Payment\\Api\\Ipn\\CompositeProcessorInterface\"\n- type=\"Amazon\\Payment\\Model\\Ipn\\CompositeProcessor\"/>\n+ <preference for=\"Amazon\\Payment\\Api\\Ipn\\CompositeProcessorInterface\" type=\"Amazon\\Payment\\Model\\Ipn\\CompositeProcessor\"/>\n<type name=\"Magento\\Quote\\Api\\CartRepositoryInterface\">\n<plugin name=\"amazon_payment_quote_repository\" type=\"Amazon\\Payment\\Plugin\\QuoteRepository\" sortOrder=\"1\"/>\n</type>\n<type name=\"Magento\\Checkout\\Api\\ShippingInformationManagementInterface\">\n- <plugin name=\"amazon_payment_shipping_information_management\"\n- type=\"Amazon\\Payment\\Plugin\\ShippingInformationManagement\" sortOrder=\"1\"/>\n+ <plugin name=\"amazon_payment_shipping_information_management\" type=\"Amazon\\Payment\\Plugin\\ShippingInformationManagement\" sortOrder=\"1\"/>\n</type>\n<type name=\"Magento\\Quote\\Api\\Data\\PaymentInterface\">\n<plugin name=\"amazon_payment_additional_information\" type=\"Amazon\\Payment\\Plugin\\AdditionalInformation\"/>\n</type>\n<type name=\"Amazon\\Payment\\Model\\Method\\AmazonLoginMethod\">\n- <plugin name=\"disable_amazon_payment_method\"\n- type=\"Amazon\\Payment\\Plugin\\DisableAmazonPaymentMethod\"\n- sortOrder=\"10\"\n- disabled=\"false\"/>\n+ <plugin name=\"disable_amazon_payment_method\" type=\"Amazon\\Payment\\Plugin\\DisableAmazonPaymentMethod\" sortOrder=\"10\" disabled=\"false\"/>\n</type>\n<type name=\"Amazon\\Payment\\Cron\\ProcessAmazonRefunds\">\n</type>\n<type name=\"Amazon\\Payment\\Model\\QueuedRefundUpdater\">\n<arguments>\n- <argument name=\"adminNotifier\"\n- xsi:type=\"object\">Magento\\Framework\\Notification\\NotifierInterface\\Proxy</argument>\n+ <argument name=\"adminNotifier\" xsi:type=\"object\">Magento\\Framework\\Notification\\NotifierInterface\\Proxy</argument>\n</arguments>\n</type>\n<type name=\"Amazon\\Payment\\Api\\Ipn\\CompositeProcessorInterface\">\n<arguments>\n<argument name=\"processors\" xsi:type=\"array\">\n<item name=\"captureprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\CaptureProcessor\\Proxy</item>\n- <item name=\"authorizationprocessor\"\n- xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\AuthorizationProcessor\\Proxy</item>\n+ <item name=\"authorizationprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\AuthorizationProcessor\\Proxy</item>\n<item name=\"orderprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\OrderProcessor\\Proxy</item>\n<item name=\"refundprocessor\" xsi:type=\"object\">Amazon\\Payment\\Model\\Ipn\\RefundProcessor\\Proxy</item>\n</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\"\n- sortOrder=\"1\"/>\n+ <plugin name=\"amazon_payment_webapi_error_processor\" type=\"Amazon\\Payment\\Plugin\\WebapiErrorProcessor\" sortOrder=\"1\"/>\n</type>\n<type name=\"Amazon\\Payment\\Gateway\\Config\\Config\">\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Domain/AmazonAuthorizationStatus.php", "new_path": "src/Payment/Domain/AmazonAuthorizationStatus.php", "diff": "@@ -29,7 +29,4 @@ class AmazonAuthorizationStatus extends AbstractAmazonStatus\nconst REASON_MAX_CAPTURES_PROCESSED = 'MaxCapturesProcessed';\nconst REASON_SELLER_CLOSED = 'SellerClosed';\nconst REASON_EXPIRED_UNUSED = 'ExpiredUnused';\n-\n- const CODE_HARD_DECLINE = 4273;\n- const CODE_SOFT_DECLINE = 7638;\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\": \"2.2.2\",\n+ \"version\": \"2.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'2.2.2'\n+version = u'2.2.3'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.2'\n+release = u'2.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:^2.2.2`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.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:^2.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:^2.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\": \"2.2.2\",\n+ \"version\": \"2.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.2\",\n- \"amzn/login-with-amazon-module\": \"2.2.2\",\n- \"amzn/amazon-pay-module\": \"2.2.2\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.3\",\n+ \"amzn/login-with-amazon-module\": \"2.2.3\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.2\",\n+ \"version\": \"2.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": "<?xml version=\"1.0\"?>\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=\"2.2.2\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.2\",\n+ \"version\": \"2.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.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": "<?xml version=\"1.0\"?>\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=\"2.1.1\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.2\",\n+ \"version\": \"2.2.3\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.2\",\n- \"amzn/login-with-amazon-module\": \"^2.2.2\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.3\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.3\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"2.2.2\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.3\" >\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\": \"2.2.3\",\n+ \"version\": \"2.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\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\": \"2.2.3\",\n+ \"version\": \"2.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.3\",\n- \"amzn/login-with-amazon-module\": \"2.2.3\",\n- \"amzn/amazon-pay-module\": \"2.2.3\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.4\",\n+ \"amzn/login-with-amazon-module\": \"2.2.4\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.3\",\n+ \"version\": \"2.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/db_schema.xml", "new_path": "src/Core/etc/db_schema.xml", "diff": "<column xsi:type=\"varchar\" name=\"sandbox_simulation_reference\" nullable=\"true\" length=\"255\" comment=\"Sandbox simulation reference\"/>\n<column xsi:type=\"smallint\" name=\"confirmed\" padding=\"5\" unsigned=\"true\" nullable=\"false\"\nidentity=\"false\" default=\"0\" comment=\"Quote confirmed with Amazon\"/>\n- <constraint xsi:type=\"primary\" name=\"PRIMARY\">\n+ <constraint xsi:type=\"primary\" referenceId=\"PRIMARY\">\n<column name=\"entity_id\"/>\n</constraint>\n- <constraint xsi:type=\"foreign\" name=\"AMAZON_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID\" table=\"amazon_quote\"\n+ <constraint xsi:type=\"foreign\" referenceId=\"AMAZON_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID\" table=\"amazon_quote\"\ncolumn=\"quote_id\" referenceTable=\"quote\" referenceColumn=\"entity_id\" onDelete=\"CASCADE\"/>\n- <index name=\"AMAZON_QUOTE_QUOTE_ID\" indexType=\"btree\">\n+ <index referenceId=\"AMAZON_QUOTE_QUOTE_ID\" indexType=\"btree\">\n<column name=\"quote_id\"/>\n</index>\n</table>\n<column xsi:type=\"int\" name=\"order_id\" padding=\"10\" unsigned=\"true\" nullable=\"false\" identity=\"false\"\ncomment=\"Order ID\"/>\n<column xsi:type=\"varchar\" name=\"amazon_order_reference_id\" nullable=\"false\" length=\"255\" comment=\"Amazon Order Reference ID\"/>\n- <constraint xsi:type=\"primary\" name=\"PRIMARY\">\n+ <constraint xsi:type=\"primary\" referenceId=\"PRIMARY\">\n<column name=\"entity_id\"/>\n</constraint>\n- <constraint xsi:type=\"foreign\" name=\"AMAZON_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID\" table=\"amazon_sales_order\"\n+ <constraint xsi:type=\"foreign\" referenceId=\"AMAZON_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID\" table=\"amazon_sales_order\"\ncolumn=\"order_id\" referenceTable=\"sales_order\" referenceColumn=\"entity_id\" onDelete=\"CASCADE\"/>\n- <index name=\"AMAZON_SALES_ORDER_ORDER_ID\" indexType=\"btree\">\n+ <index referenceId=\"AMAZON_SALES_ORDER_ORDER_ID\" indexType=\"btree\">\n<column name=\"order_id\"/>\n</index>\n</table>\n" }, { "change_type": "MODIFY", "old_path": "src/Core/etc/module.xml", "new_path": "src/Core/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"2.2.3\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.3\",\n+ \"version\": \"2.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.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": "<?xml version=\"1.0\"?>\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=\"2.2.3\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.3\",\n+ \"version\": \"2.2.4\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.3\",\n- \"amzn/login-with-amazon-module\": \"^2.2.3\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.4\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.4\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"2.2.3\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.4\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/OrderInformationManagement.php", "new_path": "src/Payment/Model/OrderInformationManagement.php", "diff": "@@ -260,8 +260,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n{\n$quote = $this->session->getQuote();\n- $quote->getExtensionAttributes()->setAmazonOrderReferenceId(null);\n-\nif ($quote->getId()) {\n$quoteLink = $this->quoteLinkFactory->create()->load($quote->getId(), 'quote_id');\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\": \"2.2.4\",\n+ \"version\": \"2.2.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'2.2.3'\n+version = u'2.2.5'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.3'\n+release = u'2.2.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:^2.2.3`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.2.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:^2.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:^2.2.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\": \"2.2.4\",\n+ \"version\": \"2.2.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.4\",\n- \"amzn/login-with-amazon-module\": \"2.2.4\",\n- \"amzn/amazon-pay-module\": \"2.2.4\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.5\",\n+ \"amzn/login-with-amazon-module\": \"2.2.5\",\n+ \"amzn/amazon-pay-module\": \"2.2.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\": \"2.2.4\",\n+ \"version\": \"2.2.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": "<?xml version=\"1.0\"?>\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=\"2.2.4\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.2.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\": \"2.2.4\",\n+ \"version\": \"2.2.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.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": "<?xml version=\"1.0\"?>\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=\"2.2.4\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.2.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\": \"2.2.4\",\n+ \"version\": \"2.2.5\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.4\",\n- \"amzn/login-with-amazon-module\": \"^2.2.4\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.5\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.5\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"2.2.4\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.5\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Http/Client/SettlementClient.php", "new_path": "src/Payment/Gateway/Http/Client/SettlementClient.php", "diff": "@@ -47,7 +47,6 @@ class SettlementClient extends AbstractClient\n'amazon_order_reference_id' => $data['amazon_order_reference_id'],\n'amount' => $data['capture_amount'],\n'currency_code' => $data['currency_code'],\n- 'seller_order_id' => $data['seller_order_id'],\n'store_name' => $data['store_name'],\n'custom_information' => $data['custom_information'],\n'platform_id' => $data['platform_id']\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Request/AuthorizationRequestBuilder.php", "new_path": "src/Payment/Gateway/Request/AuthorizationRequestBuilder.php", "diff": "@@ -120,7 +120,6 @@ class AuthorizationRequestBuilder implements BuilderInterface\n'amazon_order_reference_id' => $amazonId,\n'amount' => $buildSubject['amount'],\n'currency_code' => $order->getCurrencyCode(),\n- 'seller_order_id' => $order->getOrderIncrementId(),\n'store_name' => $quote->getStore()->getName(),\n'custom_information' =>\n'Magento Version : ' . $this->productMetaData->getVersion() . ' ' .\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Request/CaptureRequestBuilder.php", "new_path": "src/Payment/Gateway/Request/CaptureRequestBuilder.php", "diff": "@@ -107,7 +107,6 @@ class CaptureRequestBuilder implements BuilderInterface\n'amazon_order_reference_id' => $amazonId,\n'amount' => $order->getGrandTotalAmount(),\n'currency_code' => $order->getCurrencyCode(),\n- 'seller_order_id' => $order->getOrderIncrementId(),\n'store_name' => $quote->getStore()->getName(),\n'custom_information' =>\n'Magento Version : ' . $this->productMetaData->getVersion() . ' ' .\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Request/SettlementRequestBuilder.php", "new_path": "src/Payment/Gateway/Request/SettlementRequestBuilder.php", "diff": "@@ -119,7 +119,6 @@ class SettlementRequestBuilder implements BuilderInterface\n'amazon_order_reference_id' => $quoteLink->getAmazonOrderReferenceId(),\n'store_id' => $quote->getStoreId(),\n'store_name' => $quote->getStore()->getName(),\n- 'seller_order_id' => $order->getIncrementId(),\n'custom_information' =>\n'Magento Version : ' . $this->productMetaData->getVersion() . ' ' .\n'Plugin Version : ' . $this->coreHelper->getVersion(),\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/CompleteAuthHandler.php", "new_path": "src/Payment/Gateway/Response/CompleteAuthHandler.php", "diff": "@@ -20,7 +20,6 @@ use Magento\\Payment\\Gateway\\Response\\HandlerInterface;\nuse Magento\\Payment\\Model\\Method\\Logger;\nuse Amazon\\Payment\\Gateway\\Helper\\SubjectReader;\nuse Amazon\\Core\\Helper\\Data;\n-use Magento\\Payment\\Gateway\\Data\\PaymentDataObjectInterface;\nuse Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterfaceFactory;\nclass CompleteAuthHandler implements HandlerInterface\n@@ -76,7 +75,6 @@ class CompleteAuthHandler implements HandlerInterface\n{\n$paymentDO = $this->subjectReader->readPayment($handlingSubject);\n- $amazonId = $this->subjectReader->getAmazonId();\n$payment = $paymentDO->getPayment();\n$order = $this->subjectReader->getOrder();\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/CompleteSaleHandler.php", "new_path": "src/Payment/Gateway/Response/CompleteSaleHandler.php", "diff": "@@ -20,7 +20,6 @@ use Magento\\Payment\\Gateway\\Response\\HandlerInterface;\nuse Magento\\Payment\\Model\\Method\\Logger;\nuse Amazon\\Payment\\Gateway\\Helper\\SubjectReader;\nuse Amazon\\Core\\Helper\\Data;\n-use Magento\\Payment\\Gateway\\Data\\PaymentDataObjectInterface;\nuse Amazon\\Payment\\Api\\Data\\PendingAuthorizationInterfaceFactory;\nclass CompleteSaleHandler implements HandlerInterface\n@@ -75,11 +74,7 @@ class CompleteSaleHandler implements HandlerInterface\n{\n$paymentDO = $this->subjectReader->readPayment($handlingSubject);\n-\n- $amazonId = $this->subjectReader->getAmazonId();\n-\n$payment = $paymentDO->getPayment();\n-\n$order = $this->subjectReader->getOrder();\nif ($response['status']) {\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Gateway/Response/SettlementHandler.php", "new_path": "src/Payment/Gateway/Response/SettlementHandler.php", "diff": "@@ -20,7 +20,6 @@ use Magento\\Payment\\Gateway\\Response\\HandlerInterface;\nuse Magento\\Payment\\Model\\Method\\Logger;\nuse Amazon\\Payment\\Gateway\\Helper\\SubjectReader;\nuse Amazon\\Core\\Helper\\Data;\n-use Magento\\Payment\\Gateway\\Data\\PaymentDataObjectInterface;\nuse Magento\\Sales\\Api\\OrderRepositoryInterface;\nuse Magento\\Quote\\Api\\CartRepositoryInterface;\n@@ -82,7 +81,6 @@ class SettlementHandler implements HandlerInterface\npublic function handle(array $handlingSubject, array $response)\n{\n$paymentDO = $this->subjectReader->readPayment($handlingSubject);\n-\n$payment = $paymentDO->getPayment();\n// if reauthorized, treat as end of auth + capture process\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "new_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "diff": "@@ -338,6 +338,20 @@ class AmazonPaymentAdapter\nreturn $response;\n}\n+ /**\n+ * @param $storeId\n+ * @param $amazonId\n+ * @param $orderId\n+ */\n+ public function setOrderAttributes($storeId, $amazonId, $orderId) {\n+ $orderAttributes = [\n+ 'amazon_order_reference_id' => $amazonId,\n+ 'seller_order_id' => $orderId\n+ ];\n+\n+ $this->clientFactory->create($storeId)->setOrderAttributes($orderAttributes);\n+ }\n+\n/**\n* @param $data\n* @return bool\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Model/OrderInformationManagement.php", "new_path": "src/Payment/Model/OrderInformationManagement.php", "diff": "@@ -131,7 +131,6 @@ class OrderInformationManagement implements OrderInformationManagementInterface\n'amazon_order_reference_id' => $amazonOrderReferenceId,\n'amount' => $quote->getGrandTotal(),\n'currency_code' => $quote->getQuoteCurrencyCode(),\n- 'seller_order_id' => $quote->getReservedOrderId(),\n'store_name' => $storeName,\n'custom_information' =>\n'Magento Version : ' . $this->productMetadata->getVersion() . ' ' .\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Observer/LoadOrder.php", "new_path": "src/Payment/Observer/LoadOrder.php", "diff": "@@ -21,6 +21,8 @@ use Magento\\Framework\\Event\\Observer;\nuse Magento\\Framework\\Event\\ObserverInterface;\nuse Magento\\Sales\\Api\\Data\\OrderExtensionFactory;\nuse Magento\\Sales\\Api\\Data\\OrderInterface;\n+use Amazon\\Payment\\Api\\Data\\QuoteLinkInterfaceFactory;\n+use Amazon\\Payment\\Model\\Adapter\\AmazonPaymentAdapter;\nclass LoadOrder implements ObserverInterface\n{\n@@ -39,14 +41,22 @@ class LoadOrder implements ObserverInterface\n*/\nprivate $coreHelper;\n+ private $quoteLinkFactory;\n+\n+ private $adapter;\n+\npublic function __construct(\nOrderExtensionFactory $orderExtensionFactory,\nOrderLinkInterfaceFactory $orderLinkFactory,\n- Data $coreHelper\n+ Data $coreHelper,\n+ QuoteLinkInterfaceFactory $quoteLinkFactory,\n+ AmazonPaymentAdapter $adapter\n) {\n$this->orderExtensionFactory = $orderExtensionFactory;\n$this->orderLinkFactory = $orderLinkFactory;\n$this->coreHelper = $coreHelper;\n+ $this->quoteLinkFactory = $quoteLinkFactory;\n+ $this->adapter = $adapter;\n}\npublic function execute(Observer $observer)\n@@ -62,12 +72,27 @@ class LoadOrder implements ObserverInterface\n$orderExtension = ($order->getExtensionAttributes()) ?: $this->orderExtensionFactory->create();\nif ($order->getId()) {\n+\n$amazonOrder = $this->orderLinkFactory->create();\n$amazonOrder->load($order->getId(), 'order_id');\nif ($amazonOrder->getId()) {\n$orderExtension->setAmazonOrderReferenceId($amazonOrder);\n}\n+ else {\n+ if ($order->getQuoteId()) {\n+ $quoteLink = $this->quoteLinkFactory->create();\n+ $quoteLink->load($order->getQuoteId(), 'quote_id');\n+\n+ if ($quoteLink->getAmazonOrderReferenceId()) {\n+ $amazonOrder->setAmazonOrderReferenceId($quoteLink->getAmazonOrderReferenceId())\n+ ->setOrderId($order->getId())\n+ ->save();\n+\n+ $this->adapter->setOrderAttributes($order->getStoreId(), $quoteLink->getAmazonOrderReferenceId(), $order->getIncrementId());\n+ }\n+ }\n+ }\n}\n$order->setExtensionAttributes($orderExtension);\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "new_path": "src/Payment/Model/Adapter/AmazonPaymentAdapter.php", "diff": "@@ -256,6 +256,13 @@ class AmazonPaymentAdapter\n$response['response_code'] = 'TransactionTimedOut';\n} elseif (!in_array($authorizeResponse->getStatus()->getState(), self::SUCCESS_CODES)) {\n$response['response_code'] = $authorizeResponse->getStatus()->getReasonCode();\n+ if ($authMode == 'synchronous' && $authorizeResponse->getStatus()->getReasonCode() == 'TransactionTimedOut') {\n+ $cancelData = [\n+ 'store_id' => $storeId,\n+ 'amazon_order_reference_id' => $data['amazon_order_reference_id']\n+ ];\n+ $this->clientFactory->create($storeId)->cancelOrderReference($cancelData);\n+ }\n} else {\n$response['status'] = true;\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/layout/customer_account_edit.xml", "new_path": "src/Payment/view/frontend/layout/customer_account_edit.xml", "diff": "<page xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:View/Layout/etc/page_configuration.xsd\">\n<update handle=\"customer_account\"/>\n<body>\n- <referenceBlock name=\"head.components\">\n- <block class=\"Magento\\Framework\\View\\Element\\Js\\Components\" name=\"customer_account_edit_head_components\" template=\"Magento_Customer::js/components.phtml\"/>\n- </referenceBlock>\n- <referenceBlock name=\"page.main.title\">\n- <action method=\"setPageTitle\">\n- <argument translate=\"true\" name=\"title\" xsi:type=\"string\">Edit Account Information</argument>\n- </action>\n- </referenceBlock>\n- <referenceContainer name=\"content\">\n- <block class=\"Magento\\Customer\\Block\\Form\\Edit\" name=\"customer_edit\" template=\"Amazon_Payment::form/edit.phtml\" cacheable=\"false\">\n- <container name=\"form.additional.info\" as=\"form_additional_info\"/>\n- </block>\n+ <referenceContainer name=\"form.additional.info\">\n+ <block class=\"Amazon\\Payment\\Block\\Widget\\ResetPassword\" name=\"amazon.pay.password.reset\" before=\"-\" template=\"Amazon_Payment::widget/resetpassword.phtml\" cacheable=\"false\" />\n</referenceContainer>\n</body>\n</page>\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\": \"2.2.5\",\n+ \"version\": \"2.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'2.2.5'\n+version = u'2.2.6'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.5'\n+release = u'2.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:^2.2.5`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.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:^2.2.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:^2.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\": \"2.2.5\",\n+ \"version\": \"2.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.5\",\n- \"amzn/login-with-amazon-module\": \"2.2.5\",\n- \"amzn/amazon-pay-module\": \"2.2.5\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.6\",\n+ \"amzn/login-with-amazon-module\": \"2.2.6\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.5\",\n+ \"version\": \"2.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": "<?xml version=\"1.0\"?>\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=\"2.2.5\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.5\",\n+ \"version\": \"2.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.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": "<?xml version=\"1.0\"?>\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=\"2.2.5\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.5\",\n+ \"version\": \"2.2.6\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.5\",\n- \"amzn/login-with-amazon-module\": \"^2.2.5\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.6\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.6\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/module.xml", "new_path": "src/Payment/etc/module.xml", "diff": "<?xml version=\"1.0\"?>\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=\"2.2.5\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.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\": \"2.2.6\",\n+ \"version\": \"2.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'2.2.6'\n+version = u'2.2.7'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.6'\n+release = u'2.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:^2.2.6`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.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:^2.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:^2.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\": \"2.2.6\",\n+ \"version\": \"2.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.6\",\n- \"amzn/login-with-amazon-module\": \"2.2.6\",\n- \"amzn/amazon-pay-module\": \"2.2.6\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.7\",\n+ \"amzn/login-with-amazon-module\": \"2.2.7\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.6\",\n+ \"version\": \"2.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=\"2.2.6\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.6\",\n+ \"version\": \"2.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.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=\"2.2.6\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.6\",\n+ \"version\": \"2.2.7\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n\"php\": \"~7.0.13|~7.1.0|~7.2.0\",\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.6\",\n- \"amzn/login-with-amazon-module\": \"^2.2.6\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.7\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.7\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\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=\"2.2.6\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.7\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/Block/Config.php", "new_path": "src/Core/Block/Config.php", "diff": "@@ -23,6 +23,9 @@ use Magento\\Framework\\View\\Element\\Template\\Context;\n/**\n* Config\n+ *\n+ * @api\n+ *\n* Provides a block that displays links to available custom error logs in Amazon Pay admin/config section.\n*/\nclass Config extends Template\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.0.13|~7.1.0|~7.2.0\",\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/module-developer\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/adminhtml/templates/system/config/logs.phtml", "new_path": "src/Core/view/adminhtml/templates/system/config/logs.phtml", "diff": "*/\n?>\n-<div id=\"amazon-payment-log-list\"><?php echo $block->getLinks(); ?></div>\n\\ No newline at end of file\n+<div id=\"amazon-payment-log-list\"><?php echo /* @noEscape */ $block->getLinks(); ?></div>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Core/view/adminhtml/web/js/simplepath.js", "new_path": "src/Core/view/adminhtml/web/js/simplepath.js", "diff": "@@ -45,6 +45,7 @@ define(\n*/\ninitObservable: function () {\nvar self = this;\n+\nself.$amazonSimplepath = $('#amazon_simplepath');\nself.$amazonFields = $('#payment_' + self.getCountry() + '_' + self.selector + ' .form-list');\nself.$amazonCredentialsHeader = $('#payment_' + self.getCountry() + '_' + self.selector\n@@ -79,6 +80,7 @@ define(\n*/\ninitEventHandlers: function () {\nvar self = this;\n+\nself.$amazonSpBack.click(function () {\nself.showAmazonConfig();\nreturn false;\n@@ -93,20 +95,20 @@ define(\nself.setupWindowLaunch();\n});\n- self.$amazonCredentialJson.on('input', function (e) {\n+ self.$amazonCredentialJson.on('input', function () {\nself.updateCredentials(self);\n});\n},\n/**\n- * Detects when a properly formatted JSON block is pasted into the Credentials JSON field and auto populates\n- * specified fields.\n+ * Detects when a properly formatted JSON block is pasted into the Credentials JSON field\n+ * and auto populates specified fields.\n*\n* @param self\n*/\nupdateCredentials: function (self) {\n- var elJson = self.$amazonCredentialJson.val();\n- var obj = null;\n+ var elJson = self.$amazonCredentialJson.val(), obj = null;\n+\ntry {\nobj = $.parseJSON($.trim(elJson));\n}\n@@ -120,8 +122,12 @@ define(\nif (obj && typeof obj === 'object') {\nvar success = true;\n+\nfor (var prop in obj) {\n- var item = $('#payment_' + self.getCountry() + '_amazon_payment_credentials_' + $.trim(prop));\n+ if ($.trim(prop)) {\n+ var item = $('#payment_' + self.getCountry() + '_amazon_payment_credentials_'\n+ + $.trim(prop));\n+\nif (item && item.length) {\n$('#payment_' + self.getCountry() + '_amazon_payment_credentials_'\n+ $.trim(prop)).val($.trim(obj[prop]));\n@@ -130,6 +136,7 @@ define(\nsuccess = false;\n}\n}\n+ }\nif (success) {\nself.$amazonCredentialJson.val('').attr(\n@@ -141,7 +148,8 @@ define(\nelse {\nself.$amazonCredentialJson.val('').attr(\n'placeholder',\n- $t('One or more of your credential fields did not parse correctly. Please review your entry and try again.')\n+ $t('One or more of your credential fields did not parse correctly. ' +\n+ 'Please review your entry and try again.')\n).focus();\n}\n}\n@@ -151,12 +159,19 @@ define(\n* Sets up Amazon merchant key popup and polls for data update upon user completion.\n*/\nsetupWindowLaunch: function () {\n- var self = this;\n- var heights = [660, 720, 810, 900];\n- var popupWidth = this.getCountry() !== 'us' ? 768 : 1050;\n- var popupHeight = heights[0];\n+ var self = this,\n+ heights = [660, 720, 810, 900],\n+ popupWidth = this.getCountry() !== 'us' ? 768 : 1050, popupHeight = heights[0],\n+ region = self.region,\n+ elCheckDefault = $('#payment_' + self.getCountry()\n+ + '_amazon_payment_credentials_payment_region_inherit:checked'),\n+ elRegion = $('payment_' + self.getCountry() + '_amazon_payment_credentials_payment_region'),\n+ elJson = self.$amazonCredentialJson.val();\n+\nfor (var i in heights) {\n- popupHeight = (window.innerHeight >= heights[i]) ? heights[i] : popupHeight;\n+ if (heights.hasOwnProperty(i)) {\n+ popupHeight = window.innerHeight >= heights[i] ? heights[i] : popupHeight;\n+ }\n}\nself.launchPopup(self.amazonUrl, popupWidth, popupHeight);\n@@ -171,6 +186,7 @@ define(\n$('#save-json').click(function (e) {\ne.stop();\nvar json = $('#json-import').value;\n+\nif (!json || !json.isJSON()) {\nreturn;\n}\n@@ -179,16 +195,14 @@ define(\n});\n// Autoset payment region (for EU/UK)\n- var region = self.region;\n- if (self.region.indexOf('eu') != -1) {\n+ if (self.region.indexOf('eu') !== -1) {\nregion = 'de';\n}\n- var elCheckDefault = $('#payment_' + self.getCountry()\n- + '_amazon_payment_credentials_payment_region_inherit:checked');\n+\nif (elCheckDefault && elCheckDefault.length) {\nelCheckDefault[0].click();\n}\n- var elRegion = $('payment_' + self.getCountry() + '_amazon_payment_credentials_payment_region');\n+\nif (elRegion) {\nelRegion.value = region;\n}\n@@ -231,6 +245,8 @@ define(\n* Sets up dynamic form for capturing popup/form input for simple path setup.\n*/\ngenerateSimplePathForm: function () {\n+ var spElement = null;\n+\nthis.$form = new Element('form', {\nmethod: 'post',\naction: this.amazonUrl,\n@@ -243,26 +259,28 @@ define(\n// Convert formParams JSON to hidden inputs\nfor (var key in this.formParams) {\n- if (typeof this.formParams[key] === 'object' || typeof this.formParams[key] === 'array') {\n+ if (typeof this.formParams[key] == 'object' || typeof this.formParams[key] === 'array') {\nfor (var i in this.formParams[key]) {\nif (typeof this.formParams[key][i] !== 'function') {\n- var element = new Element('input', {\n+ spElement = new Element('input', {\ntype: 'hidden',\nname: key,\nvalue: this.formParams[key][i],\nnovalidate: 'novalidate'\n});\n- $(element).appendTo($(\"#simplepath_form\"));\n+\n+ $(spElement).appendTo($(\"#simplepath_form\"));\n}\n}\n} else {\n- var element = new Element('input', {\n+ spElement = new Element('input', {\ntype: 'hidden',\nname: key,\nnovalidate: 'novalidate',\nvalue: this.formParams[key]\n});\n- $(element).appendTo($(\"#simplepath_form\"));\n+\n+ $(spElement).appendTo($(\"#simplepath_form\"));\n}\n}\n@@ -307,11 +325,10 @@ define(\n* @param requestedHeight\n*/\nlaunchPopup: function (url, requestedWidth, requestedHeight) {\n- var self = this;\nvar leftOffset = this.getLeftOffset(requestedWidth),\ntopOffset = this.getTopOffset(requestedHeight),\n- newWindow = window.open(url, 'simplepath', 'scrollbars=yes, width=' + requestedWidth + ', height=' +\n- requestedHeight + ', top=' + topOffset + ', left=' + leftOffset);\n+ newWindow = window.open(url, 'simplepath', 'scrollbars=yes, width=' + requestedWidth\n+ + ', height=' + requestedHeight + ', top=' + topOffset + ', left=' + leftOffset);\nif (window.focus) {\nnewWindow.focus();\n@@ -333,7 +350,8 @@ define(\n*/\ngetLeftOffset: function (requestedWidth) {\nvar dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left;\n- return ((this.windowWidth() / 2) - (requestedWidth / 2)) + dualScreenLeft;\n+\n+ return (this.windowWidth() / 2) - (requestedWidth / 2) + dualScreenLeft;\n},\n/**\n@@ -343,7 +361,8 @@ define(\n*/\ngetTopOffset: function (requestedHeight) {\nvar dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top;\n- return ((this.windowHeight() / 2) - (requestedHeight / 2)) + dualScreenTop;\n+\n+ return (this.windowHeight() / 2) - (requestedHeight / 2) + dualScreenTop;\n},\n/**\n@@ -355,9 +374,9 @@ define(\nreturn window.innerWidth;\n} else if (document.documentElement.clientWidth) {\nreturn document.documentElement.clientWidth;\n- } else {\n- return screen.width;\n}\n+\n+ return screen.width;\n},\n/**\n@@ -369,9 +388,9 @@ define(\nreturn window.innerHeight;\n} else if (document.documentElement.clientHeight) {\nreturn document.documentElement.clientHeight;\n- } else {\n- return screen.height;\n}\n+\n+ return screen.height;\n}\n}\n);\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.0.13|~7.1.0|~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.7\",\n\"magento/module-customer\": \"*\",\n\"magento/module-store\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Block/Widget/ResetPassword.php", "new_path": "src/Payment/Block/Widget/ResetPassword.php", "diff": "@@ -14,6 +14,9 @@ use Magento\\Framework\\UrlFactory;\nuse Magento\\Customer\\Model\\Session;\nuse Amazon\\Login\\Api\\CustomerLinkRepositoryInterface;\n+/**\n+ * @api\n+ */\nclass ResetPassword extends Template\n{\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.0.13|~7.1.0|~7.2.0\",\n+ \"php\": \"~7.1.3||~7.2.0\",\n\"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.7\",\n\"amzn/login-with-amazon-module\": \"^2.2.7\",\n+ \"magento/module-customer\": \"*\",\n\"magento/module-eav\": \"*\",\n\"magento/module-sales\": \"*\",\n\"magento/module-quote\": \"*\",\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/templates/widget/resetpassword.phtml", "new_path": "src/Payment/view/frontend/templates/widget/resetpassword.phtml", "diff": "?>\n<div class=\"field password-info\">\n<p><?= $block->escapeHtml(__('If you created this account using Amazon Pay, you might not know your site password.')) ?>\n- <a href=\"<?php echo $block->getLink(); ?>\"><?= $block->escapeHtml(__('Request a password to change your account password.')); ?></a></p>\n+ <a href=\"<?= $block->escapeHtml($block->getLink()); ?>\"><?= $block->escapeHtml(__('Request a password to change your account password.')); ?></a></p>\n</div>\n\\ No newline at end of file\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": "@@ -28,8 +28,7 @@ define(\n'use strict';\nreturn function (paymentData, redirectOnSuccess) {\n- var serviceUrl,\n- payload;\n+ var serviceUrl, payload;\nredirectOnSuccess = redirectOnSuccess !== false;\n@@ -69,11 +68,12 @@ define(\nerrorProcessor.process(response);\namazonStorage.amazonDeclineCode(response.responseJSON.code);\nfullScreenLoader.stopLoader(true);\n- if (response.responseJSON.code == 4273) {\n+ if (response.responseJSON.code === 4273) {\nvar intervalId = setInterval(function () {\nclearInterval(intervalId);\nwindow.location.replace(url.build('checkout/cart/'));\n}, 5000);\n+\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": "@@ -21,11 +21,11 @@ define([\n'modernizr/modernizr',\n'amazonCore',\n'jquery/ui',\n- 'uiRegistry',\n+ 'uiRegistry'\n], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf) {\n'use strict';\n- var _this,\n- $button;\n+ var _this, $button;\n+\nif (amazonPaymentConfig.isDefined()) {\n$.widget('amazon.AmazonButton', {\noptions: {\n@@ -97,7 +97,8 @@ define([\n* @return {String}\n*/\n_popupCallback: function () {\n- return _this.usePopUp() ? _this.secureHttpsCallback : amazonPaymentConfig.getValue('oAuthHashRedirectUrl');\n+ return _this.usePopUp() ? _this.secureHttpsCallback :\n+ amazonPaymentConfig.getValue('oAuthHashRedirectUrl');\n},\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "new_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "diff": "var registry = require('uiRegistry');\nif (registry.get('amazonPayment') !== undefined) {\n-\nvar amazonPayment = registry.get('amazonPayment');\ndefine([amazonPayment.widgetUrl], function () {\n'use strict';\n//after amazon widgets file as loaded\n+\n});\n}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/payment/amazonlogin.js", "new_path": "src/Payment/view/frontend/web/js/view/payment/amazonlogin.js", "diff": "define(\n[\n'uiComponent',\n- 'Magento_Checkout/js/model/payment/renderer-list',\n+ 'Magento_Checkout/js/model/payment/renderer-list'\n],\nfunction (\nComponent,\n@@ -14,10 +14,9 @@ define(\ncomponent: 'Amazon_Payment/js/view/payment/method-renderer/amazonlogin'\n}\n);\n- /**\n- *\n- * Add view logic here if needed\n- */\n+\n+ // Add view logic here if needed\n+\nreturn Component.extend({});\n}\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": "@@ -154,16 +154,17 @@ define(\nJSON.stringify(payload)\n).done(\nfunction (data) {\n- var amazonAddress = data.shift(),\n- addressData;\n+ var amazonAddress = data.shift(), addressData;\naddressData = addressConverter.formAddressDataToQuoteAddress(amazonAddress);\naddressData.telephone = !addressData.telephone ? '0000000000' : addressData.telephone;\nselectBillingAddress(addressData);\namazonStorage.isPlaceOrderDisabled(false);\n+\nif(window.checkoutConfig.amazonLogin.amazon_customer_email) {\nvar customerField = $('#customer-email').val();\n+\nif (!customerField) {\n$('#customer-email').val(window.checkoutConfig.amazonLogin.amazon_customer_email);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazonlogin.js", "new_path": "src/Payment/view/frontend/web/js/view/payment/method-renderer/amazonlogin.js", "diff": "@@ -7,16 +7,17 @@ define(\n'mage/storage',\n'amazonPaymentConfig',\n'uiRegistry',\n- 'Amazon_Login/js/view/login-button',\n+ 'Amazon_Login/js/view/login-button'\n],\n- function ($,\n+ function (\n+ $,\nComponent,\nko,\namazonStorage,\nstorage,\namazonPaymentConfig,\nregistry,\n- loginButton,\n+ loginButton\n) {\n'use strict';\n@@ -27,17 +28,15 @@ define(\ndefaults: {\ntemplate: 'Amazon_Payment/payment/amazonlogin'\n},\n-\ngetCode: function () {\nreturn 'amazonlogin';\n},\nisActive: function () {\nreturn true;\n},\n-\nisPwaVisible: function () {\nreturn amazonStorage.isPwaVisible && amazonStorage.isAmazonEnabled;\n- },\n+ }\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\": \"2.2.7\",\n+ \"version\": \"2.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'2.2.7'\n+version = u'2.2.8'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.7'\n+release = u'2.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:^2.2.7`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.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:^2.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:^2.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\": \"2.2.7\",\n+ \"version\": \"2.2.8\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.7\",\n- \"amzn/login-with-amazon-module\": \"2.2.7\",\n- \"amzn/amazon-pay-module\": \"2.2.7\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.8\",\n+ \"amzn/login-with-amazon-module\": \"2.2.8\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.7\",\n+ \"version\": \"2.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=\"2.2.7\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.7\",\n+ \"version\": \"2.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\": \"^2.2.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.8\",\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=\"2.2.7\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.7\",\n+ \"version\": \"2.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\": \"^2.2.7\",\n- \"amzn/login-with-amazon-module\": \"^2.2.7\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.8\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.8\",\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=\"2.2.7\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.8\" >\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\": \"2.2.8\",\n+ \"version\": \"2.2.9\",\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'2.2.8'\n+version = u'2.2.9'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.8'\n+release = u'2.2.9'\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:^2.2.8`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.2.9`\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:^2.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 `^`\n+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^2.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 `^`\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\": \"2.2.8\",\n+ \"version\": \"2.2.9\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.8\",\n- \"amzn/login-with-amazon-module\": \"2.2.8\",\n- \"amzn/amazon-pay-module\": \"2.2.8\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.9\",\n+ \"amzn/login-with-amazon-module\": \"2.2.9\",\n+ \"amzn/amazon-pay-module\": \"2.2.9\"\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\": \"2.2.8\",\n+ \"version\": \"2.2.9\",\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=\"2.2.8\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.2.9\">\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\": \"2.2.8\",\n+ \"version\": \"2.2.9\",\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\": \"^2.2.8\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.9\",\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=\"2.2.8\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.2.9\">\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\": \"2.2.8\",\n+ \"version\": \"2.2.9\",\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\": \"^2.2.8\",\n- \"amzn/login-with-amazon-module\": \"^2.2.8\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.9\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.9\",\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=\"2.2.8\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.9\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Core/view/adminhtml/web/js/simplepath.js", "new_path": "src/Core/view/adminhtml/web/js/simplepath.js", "diff": "@@ -244,7 +244,6 @@ define(\n* Sets up dynamic form for capturing popup/form input for simple path setup.\n*/\ngenerateSimplePathForm: function () {\n- var spElement = null;\nthis.$form = new Element('form', {\nmethod: 'post',\n@@ -258,28 +257,24 @@ define(\n// Convert formParams JSON to hidden inputs\nfor (var key in this.formParams) {\n- if (typeof this.formParams[key] == 'object' || typeof this.formParams[key] === 'array') {\n+ if ( $.isPlainObject(this.formParams[key]) || $.isArray(this.formParams[key])) {\nfor (var i in this.formParams[key]) {\nif (typeof this.formParams[key][i] !== 'function') {\n- spElement = new Element('input', {\n+ $(new Element('input', {\ntype: 'hidden',\nname: key,\nvalue: this.formParams[key][i],\nnovalidate: 'novalidate'\n- });\n-\n- $(spElement).appendTo($(\"#simplepath_form\"));\n+ })).appendTo($(\"#simplepath_form\"));\n}\n}\n} else {\n- spElement = new Element('input', {\n+ $(new Element('input', {\ntype: 'hidden',\nname: key,\nnovalidate: 'novalidate',\nvalue: this.formParams[key]\n- });\n-\n- $(spElement).appendTo($(\"#simplepath_form\"));\n+ })).appendTo($(\"#simplepath_form\"));\n}\n}\n@@ -369,13 +364,9 @@ define(\n* @returns {number}\n*/\nwindowWidth: function () {\n- if (window.innerWidth) {\n- return window.innerWidth;\n- } else if (document.documentElement.clientWidth) {\n- return document.documentElement.clientWidth;\n- }\n-\n- return screen.width;\n+ return window.innerWidth\n+ || document.documentElement.clientWidth\n+ || screen.width;\n},\n/**\n@@ -383,13 +374,9 @@ define(\n* @returns {number}\n*/\nwindowHeight: function () {\n- if (window.innerHeight) {\n- return window.innerHeight;\n- } else if (document.documentElement.clientHeight) {\n- return document.documentElement.clientHeight;\n- }\n-\n- return screen.height;\n+ return window.innerHeight\n+ || document.documentElement.clientHeight\n+ || screen.height;\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\": \"2.2.9\",\n+ \"version\": \"2.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'2.2.9'\n+version = u'2.2.10'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.9'\n+release = u'2.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": "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:^2.2.9`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^2.2.10`\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:^2.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+.. note:: `composer require amzn/amazon-payments-magento-2-plugin:^2.2.10` 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\": \"2.2.9\",\n+ \"version\": \"2.2.10\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.9\",\n- \"amzn/login-with-amazon-module\": \"2.2.9\",\n- \"amzn/amazon-pay-module\": \"2.2.9\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.10\",\n+ \"amzn/login-with-amazon-module\": \"2.2.10\",\n+ \"amzn/amazon-pay-module\": \"2.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\": \"2.2.9\",\n+ \"version\": \"2.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=\"2.2.9\">\n+ <module name=\"Amazon_Core\" setup_version=\"2.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\": \"2.2.9\",\n+ \"version\": \"2.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\": \"^2.2.9\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.10\",\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=\"2.2.9\">\n+ <module name=\"Amazon_Login\" setup_version=\"2.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\": \"2.2.9\",\n+ \"version\": \"2.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\": \"^2.2.9\",\n- \"amzn/login-with-amazon-module\": \"^2.2.9\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^2.2.10\",\n+ \"amzn/login-with-amazon-module\": \"^2.2.10\",\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=\"2.2.9\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"2.2.10\" >\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\": \"2.2.10\",\n+ \"version\": \"3.0.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'2.2.10'\n+version = u'3.0.0'\n# The full version, including alpha/beta/rc tags.\n-release = u'2.2.10'\n+release = u'3.0.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:^2.2.10`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.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:^2.2.10` 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.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\": \"2.2.10\",\n+ \"version\": \"3.0.0\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"2.2.10\",\n- \"amzn/login-with-amazon-module\": \"2.2.10\",\n- \"amzn/amazon-pay-module\": \"2.2.10\"\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.0\",\n+ \"amzn/login-with-amazon-module\": \"3.0.0\",\n+ \"amzn/amazon-pay-module\": \"3.0.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\": \"2.2.10\",\n+ \"version\": \"3.0.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=\"2.2.10\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.0.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\": \"2.2.10\",\n+ \"version\": \"3.0.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\": \"^2.2.10\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.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=\"2.2.10\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.0.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\": \"2.2.10\",\n+ \"version\": \"3.0.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\": \"^2.2.10\",\n- \"amzn/login-with-amazon-module\": \"^2.2.10\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.0\",\n+ \"amzn/login-with-amazon-module\": \"^3.0.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=\"2.2.10\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.0.0\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/Payment/Observer/KlarnaKcoOverride.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\\Observer;\n+\n+use Magento\\Framework\\Event\\ObserverInterface;\n+use Magento\\Framework\\Event\\Observer;\n+use Amazon\\Core\\Helper\\Data;\n+use Magento\\Customer\\Model\\Session;\n+\n+class KlarnaKcoOverride implements ObserverInterface\n+{\n+ /**\n+ * @var Data\n+ */\n+ private $coreHelper;\n+\n+ /**\n+ * @var Session\n+ */\n+ private $session;\n+\n+ /**\n+ * @param Data $coreHelper\n+ * @param Session $session\n+ */\n+ public function __construct(\n+ Data $coreHelper,\n+ Session $session\n+ ) {\n+ $this->coreHelper = $coreHelper;\n+ $this->session = $session;\n+ }\n+\n+ public function execute(Observer $observer)\n+ {\n+ if ($this->coreHelper->isPwaEnabled() && $this->session->getAfterAmazonAuthUrl()) {\n+ // Force customer to use default (Amazon) checkout\n+ $observer->getOverrideObject()->setForceDisabled(true);\n+ }\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/etc/frontend/events.xml", "new_path": "src/Payment/etc/frontend/events.xml", "diff": "<event name=\"shortcut_buttons_container\">\n<observer name=\"amazon_buttons\" instance=\"Amazon\\Payment\\Observer\\AddAmazonButton\"/>\n</event>\n+ <event name=\"kco_override_load_checkout\">\n+ <observer name=\"amazon_core_klarna_kco_override\" instance=\"Amazon\\Payment\\Observer\\KlarnaKcoOverride\" />\n+ </event>\n</config>\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": "@@ -26,7 +26,9 @@ define([\nvar clientId = amazonPaymentConfig.getValue('clientId'),\namazonDefined = ko.observable(false),\namazonLoginError = ko.observable(false),\n- accessToken = ko.observable(null);\n+ accessToken = ko.observable(null),\n+ // Match region config to amazon.Login.Region\n+ regions = {'us': 'NA', 'de': 'EU', 'uk': 'EU', 'jp': 'APAC'};\nif (typeof amazon === 'undefined') {\n/**\n@@ -35,6 +37,12 @@ define([\nwindow.onAmazonLoginReady = function () {\nsetClientId(clientId); //eslint-disable-line no-use-before-define\ndoLogoutOnFlagCookie(); //eslint-disable-line no-use-before-define\n+\n+ var sandboxMode = amazonPaymentConfig.getValue('isSandboxEnabled', false);\n+ amazon.Login.setSandboxMode(sandboxMode); //eslint-disable-line no-undef\n+\n+ var region = regions[amazonPaymentConfig.getValue('region')];\n+ amazon.Login.setRegion(region); //eslint-disable-line no-undef\n};\n} else {\nsetClientId(clientId); //eslint-disable-line no-use-before-define\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": "@@ -18,10 +18,11 @@ define([\n'amazonCore',\n'amazonPaymentConfig',\n'amazonCsrf',\n+ 'Magento_Customer/js/customer-data',\n'mage/loader',\n'jquery/ui',\n'mage/cookies'\n-], function ($, amazonCore, amazonPaymentConfig, amazonCsrf) {\n+], function ($, amazonCore, amazonPaymentConfig, amazonCsrf, customerData) {\n'use strict';\nvar self;\n@@ -49,8 +50,18 @@ define([\namazonCore.verifyAmazonLoggedIn().then(function (loggedIn) {\nif (loggedIn) {\nself.redirect();\n+ } else {\n+ window.location = amazonPaymentConfig.getValue('customerLoginPageUrl');\n}\n- }, 0);\n+ }, function(error) {\n+ $('body').trigger('processStop');\n+ customerData.set('messages', {\n+ messages: [{\n+ type: 'error',\n+ text: error\n+ }]\n+ });\n+ });\n}, this);\n},\n" } ]

[ { "change_type": "ADD", "old_path": null, "new_path": "src/Login/Controller/Logout/Index.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\\Login\\Controller\\Logout;\n+\n+use Magento\\Framework\\App\\Action\\Context;\n+use Magento\\Framework\\Controller\\Result\\JsonFactory;\n+use Amazon\\Login\\Helper\\Session;\n+\n+class Index extends \\Magento\\Framework\\App\\Action\\Action\n+{\n+ /**\n+ * @var JsonFactory\n+ */\n+ private $jsonFactory;\n+\n+ /**\n+ * @var Session\n+ */\n+ private $sessionHelper;\n+\n+ /**\n+ * @param Context $context\n+ * @param JsonFactory $jsonFactory\n+ * @param Session $sessionHelper\n+ */\n+ public function __construct(Context $context, JsonFactory $jsonFactory, Session $sessionHelper)\n+ {\n+ parent::__construct($context);\n+ $this->jsonFactory = $jsonFactory;\n+ $this->sessionHelper = $sessionHelper;\n+ }\n+\n+ public function execute()\n+ {\n+ $this->sessionHelper->setIsAmazonLoggedIn(false);\n+ return $this->jsonFactory->create();\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Login/Helper/Session.php", "new_path": "src/Login/Helper/Session.php", "diff": "@@ -62,8 +62,9 @@ class Session\n*/\npublic function login(CustomerInterface $customerData)\n{\n- if ($customerData->getId() != $this->session->getId() || !$this->session->isLoggedIn()) {\n$this->dispatchAuthenticationEvent();\n+\n+ if ($customerData->getId() != $this->session->getId() || !$this->session->isLoggedIn()) {\n$this->session->setCustomerDataAsLoggedIn($customerData);\n$this->session->regenerateId();\n$this->checkoutSession->loadCustomerQuote();\n@@ -123,6 +124,28 @@ class Session\nreturn $this->session->isLoggedIn();\n}\n+ /**\n+ * Check if user is logged in to Amazon\n+ *\n+ * @return bool\n+ */\n+ public function isAmazonLoggedIn()\n+ {\n+ return $this->session->getIsAmazonLoggedIn();\n+ }\n+\n+ /**\n+ * @return void\n+ */\n+ public function setIsAmazonLoggedIn($isLoggedIn)\n+ {\n+ if ($isLoggedIn) {\n+ $this->session->setIsAmazonLoggedIn(true);\n+ } else {\n+ $this->session->unsIsAmazonLoggedIn();\n+ }\n+ }\n+\n/**\n* @param AmazonCustomerInterface $amazonCustomer\n* @return void\n" }, { "change_type": "RENAME", "old_path": "src/Login/Observer/ClearAmazonCustomer.php", "new_path": "src/Login/Observer/AmazonCustomerAuthenticated.php", "diff": "@@ -19,7 +19,7 @@ use Amazon\\Login\\Helper\\Session as SessionHelper;\nuse Magento\\Framework\\Event\\Observer;\nuse Magento\\Framework\\Event\\ObserverInterface;\n-class ClearAmazonCustomer implements ObserverInterface\n+class AmazonCustomerAuthenticated implements ObserverInterface\n{\n/**\n* @var SessionHelper\n@@ -39,6 +39,7 @@ class ClearAmazonCustomer implements ObserverInterface\n*/\npublic function execute(Observer $observer)\n{\n+ $this->sessionHelper->setIsAmazonLoggedIn(true);\n$this->sessionHelper->clearAmazonCustomer();\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Login/etc/events.xml", "new_path": "src/Login/etc/events.xml", "diff": "-->\n<config xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"urn:magento:framework:Event/etc/events.xsd\">\n<event name=\"amazon_customer_authenticated\">\n- <observer name=\"clear_amazon_customer\" instance=\"Amazon\\Login\\Observer\\ClearAmazonCustomer\" />\n+ <observer name=\"amazon_login_customer_authenticated\" instance=\"Amazon\\Login\\Observer\\AmazonCustomerAuthenticated\" />\n</event>\n<event name=\"amazon_login_authorize_error\">\n<observer name=\"amazon_login_set_cookie_on_authorize_error\" instance=\"Amazon\\Login\\Observer\\SetAuthorizeErrorCookie\" />\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/Observer/KlarnaKcoOverride.php", "new_path": "src/Payment/Observer/KlarnaKcoOverride.php", "diff": "@@ -18,7 +18,7 @@ namespace Amazon\\Payment\\Observer;\nuse Magento\\Framework\\Event\\ObserverInterface;\nuse Magento\\Framework\\Event\\Observer;\nuse Amazon\\Core\\Helper\\Data;\n-use Magento\\Customer\\Model\\Session;\n+use Amazon\\Login\\Helper\\Session;\nclass KlarnaKcoOverride implements ObserverInterface\n{\n@@ -30,23 +30,23 @@ class KlarnaKcoOverride implements ObserverInterface\n/**\n* @var Session\n*/\n- private $session;\n+ private $sessionHelper;\n/**\n* @param Data $coreHelper\n- * @param Session $session\n+ * @param Session $sessionHelper\n*/\npublic function __construct(\nData $coreHelper,\n- Session $session\n+ Session $sessionHelper\n) {\n$this->coreHelper = $coreHelper;\n- $this->session = $session;\n+ $this->sessionHelper = $sessionHelper;\n}\npublic function execute(Observer $observer)\n{\n- if ($this->coreHelper->isPwaEnabled() && $this->session->getAfterAmazonAuthUrl()) {\n+ if ($this->coreHelper->isPwaEnabled() && $this->sessionHelper->isAmazonLoggedIn()) {\n// Force customer to use default (Amazon) checkout\n$observer->getOverrideObject()->setForceDisabled(true);\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": "define([\n'jquery',\n'ko',\n+ 'mage/url',\n'amazonPaymentConfig',\n'amazonWidgetsLoader',\n'bluebird',\n'jquery/jquery-storageapi'\n-], function ($, ko, amazonPaymentConfig) {\n+], function ($, ko, url, amazonPaymentConfig) {\n'use strict';\nvar clientId = amazonPaymentConfig.getValue('clientId'),\n@@ -54,6 +55,10 @@ define([\n* Log user out of amazon\n*/\nfunction amazonLogout() {\n+ $.ajax({\n+ url: url.build('amazon/logout'),\n+ context: this\n+ }).always(function () {\nif (amazonDefined()) {\namazon.Login.logout(); //eslint-disable-line no-undef\n} else {\n@@ -64,6 +69,7 @@ define([\n}\n});\n}\n+ });\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": "@@ -67,7 +67,7 @@ define(\n*/\nfunction amazonLogOut() {\nif (amazonCore.amazonDefined()) {\n- amazon.Login.logout(); // eslint-disable-line no-undef\n+ amazonCore.AmazonLogout();\n}\nthis.isAmazonAccountLoggedIn(false);\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "new_path": "src/Login/view/frontend/web/js/view/login-button-wrapper.js", "diff": "* permissions and limitations under the License.\n*/\n-var registry = require('uiRegistry'),\n- amazonPayment = registry.get('amazonPayment');\n+define(['uiRegistry', 'Amazon_Login/js/view/login-button', 'uiComponent'], function(registry, login, component) {\n+ var amazonPayment = registry.get('amazonPayment');\nif (amazonPayment !== undefined && amazonPayment.allowAmLoginLoading === true) {\n- define(['require', 'Amazon_Login/js/view/login-button'], function (require) {\n- 'use strict';\n-\n- return require('Amazon_Login/js/view/login-button');\n- });\n+ return login;\n} else {\n- define(['require', 'uiComponent'], function (require) {\n- 'use strict';\n-\n- return require('uiComponent');\n- });\n+ return component;\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": "@@ -24,9 +24,10 @@ define([\n'uiRegistry'\n], function ($, customerData, sectionConfig, amazonPaymentConfig, amazonCsrf) {\n'use strict';\n- var _this, $button;\n+ var _this;\nif (amazonPaymentConfig.isDefined()) {\n+\n$.widget('amazon.AmazonButton', {\noptions: {\nmerchantId: null,\n@@ -42,9 +43,16 @@ define([\n*/\n_create: function () {\n_this = this;\n- $button = this.element;\n+ var __this = this;\nthis._verifyAmazonConfig();\n- _this._renderAmazonButton();\n+\n+ if (typeof OffAmazonPayments === 'undefined') {\n+ $(window).on('OffAmazonPayments', function() {\n+ __this._renderAmazonButton();\n+ });\n+ } else {\n+ this._renderAmazonButton();\n+ }\n},\n/**\n@@ -53,15 +61,15 @@ define([\n*/\n_verifyAmazonConfig: function () {\nif (amazonPaymentConfig.isDefined()) {\n- _this.options.merchantId = amazonPaymentConfig.getValue('merchantId');\n- _this.options.buttonType = _this.options.buttonType === 'LwA' ?\n+ this.options.merchantId = amazonPaymentConfig.getValue('merchantId');\n+ this.options.buttonType = this.options.buttonType === 'LwA' ?\namazonPaymentConfig.getValue('buttonTypeLwa') : amazonPaymentConfig.getValue('buttonTypePwa');\n- _this.options.buttonColor = amazonPaymentConfig.getValue('buttonColor');\n- _this.options.buttonSize = amazonPaymentConfig.getValue('buttonSize');\n- _this.options.redirectUrl = amazonPaymentConfig.getValue('redirectUrl');\n- _this.options.loginPostUrl = amazonPaymentConfig.getValue('loginPostUrl');\n- _this.options.loginScope = amazonPaymentConfig.getValue('loginScope');\n- _this.options.buttonLanguage = amazonPaymentConfig.getValue('displayLanguage');\n+ this.options.buttonColor = amazonPaymentConfig.getValue('buttonColor');\n+ this.options.buttonSize = amazonPaymentConfig.getValue('buttonSize');\n+ this.options.redirectUrl = amazonPaymentConfig.getValue('redirectUrl');\n+ this.options.loginPostUrl = amazonPaymentConfig.getValue('loginPostUrl');\n+ this.options.loginScope = amazonPaymentConfig.getValue('loginScope');\n+ this.options.buttonLanguage = amazonPaymentConfig.getValue('displayLanguage');\n}\n},\n@@ -123,7 +131,7 @@ define([\n*/\nusePopUp: function () {\nreturn window.location.protocol === 'https:' && !$('body').hasClass('catalog-product-view') &&\n- !_this._touchSupported();\n+ !this._touchSupported();\n},\n/**\n@@ -131,11 +139,11 @@ define([\n* @private\n*/\n_renderAmazonButton: function () {\n- OffAmazonPayments.Button($button.attr('id'), _this.options.merchantId, { //eslint-disable-line no-undef\n- type: _this.options.buttonType,\n- color: _this.options.buttonColor,\n- size: _this.options.buttonSize,\n- language: _this.options.buttonLanguage,\n+ OffAmazonPayments.Button(this.element[0].id, this.options.merchantId, { //eslint-disable-line no-undef\n+ type: this.options.buttonType,\n+ color: this.options.buttonColor,\n+ size: this.options.buttonSize,\n+ language: this.options.buttonLanguage,\n/**\n* Authorization callback\n@@ -155,8 +163,8 @@ define([\n*/\n_getLoginOptions: function () {\nreturn {\n- scope: _this.options.loginScope,\n- popup: _this.usePopUp(),\n+ scope: this.options.loginScope,\n+ popup: this.usePopUp(),\nstate: amazonCsrf.generateNewValue()\n};\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": "@@ -50,6 +50,11 @@ define([\ndoLogoutOnFlagCookie(); //eslint-disable-line no-use-before-define\n}\n+ // Widgets.js ready callback\n+ window.onAmazonPaymentsReady = function() {\n+ $(window).trigger('OffAmazonPayments');\n+ }\n+\n/**\n* Set Client ID\n* @param {String} cid\n" }, { "change_type": "MODIFY", "old_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "new_path": "src/Payment/view/frontend/web/js/amazon-widgets-loader.js", "diff": "* permissions and limitations under the License.\n*/\n-var registry = require('uiRegistry');\n+define(['uiRegistry'], function(registry) {\nif (registry.get('amazonPayment') !== undefined) {\nvar amazonPayment = registry.get('amazonPayment');\n- define([amazonPayment.widgetUrl], function () {\n- 'use strict';\n-\n- //after amazon widgets file as loaded\n-\n- });\n+ // Load external Widgets.js\n+ require([amazonPayment.widgetUrl]);\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.0\",\n+ \"version\": \"3.0.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.0.0'\n+version = u'3.0.1'\n# The full version, including alpha/beta/rc tags.\n-release = u'3.0.0'\n+release = u'3.0.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.0.0`\n+* Install the extension via composer: `composer require amzn/amazon-payments-magento-2-plugin:^3.0.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.0.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.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 `^`\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.0\",\n+ \"version\": \"3.0.1\",\n\"license\": [\n\"Apache-2.0\"\n],\n\"require\": {\n- \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"3.0.0\",\n- \"amzn/login-with-amazon-module\": \"3.0.0\",\n- \"amzn/amazon-pay-module\": \"3.0.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-module\": \"3.0.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.0.0\",\n+ \"version\": \"3.0.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.0.0\">\n+ <module name=\"Amazon_Core\" setup_version=\"3.0.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.0.0\",\n+ \"version\": \"3.0.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.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.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.0.0\">\n+ <module name=\"Amazon_Login\" setup_version=\"3.0.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.0.0\",\n+ \"version\": \"3.0.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.0.0\",\n- \"amzn/login-with-amazon-module\": \"^3.0.0\",\n+ \"amzn/amazon-pay-and-login-with-amazon-core-module\": \"^3.0.1\",\n+ \"amzn/login-with-amazon-module\": \"^3.0.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.0.0\" >\n+ <module name=\"Amazon_Payment\" setup_version=\"3.0.1\" >\n<sequence>\n<module name=\"Amazon_Core\"/>\n<module name=\"Amazon_Login\"/>\n" } ]