JetBrains-Research/commit-chronicle · Datasets at Fast360
{
// 获取包含Hugging Face文本的span元素
const spans = link.querySelectorAll('span.whitespace-nowrap, span.hidden.whitespace-nowrap');
spans.forEach(span => {
if (span.textContent && span.textContent.trim().match(/Hugging\s*Face/i)) {
span.textContent = 'AI快站';
}
});
});
// 替换logo图片的alt属性
document.querySelectorAll('img[alt*="Hugging"], img[alt*="Face"]').forEach(img => {
if (img.alt.match(/Hugging\s*Face/i)) {
img.alt = 'AI快站 logo';
}
});
}
// 替换导航栏中的链接
function replaceNavigationLinks() {
// 已替换标记,防止重复运行
if (window._navLinksReplaced) {
return;
}
// 已经替换过的链接集合,防止重复替换
const replacedLinks = new Set();
// 只在导航栏区域查找和替换链接
const headerArea = document.querySelector('header') || document.querySelector('nav');
if (!headerArea) {
return;
}
// 在导航区域内查找链接
const navLinks = headerArea.querySelectorAll('a');
navLinks.forEach(link => {
// 如果已经替换过,跳过
if (replacedLinks.has(link)) return;
const linkText = link.textContent.trim();
const linkHref = link.getAttribute('href') || '';
// 替换Spaces链接 - 仅替换一次
if (
(linkHref.includes('/spaces') || linkHref === '/spaces' ||
linkText === 'Spaces' || linkText.match(/^s*Spacess*$/i)) &&
linkText !== 'OCR模型免费转Markdown' &&
linkText !== 'OCR模型免费转Markdown'
) {
link.textContent = 'OCR模型免费转Markdown';
link.href = 'https://fast360.xyz';
link.setAttribute('target', '_blank');
link.setAttribute('rel', 'noopener noreferrer');
replacedLinks.add(link);
}
// 删除Posts链接
else if (
(linkHref.includes('/posts') || linkHref === '/posts' ||
linkText === 'Posts' || linkText.match(/^s*Postss*$/i))
) {
if (link.parentNode) {
link.parentNode.removeChild(link);
}
replacedLinks.add(link);
}
// 替换Docs链接 - 仅替换一次
else if (
(linkHref.includes('/docs') || linkHref === '/docs' ||
linkText === 'Docs' || linkText.match(/^s*Docss*$/i)) &&
linkText !== '模型下载攻略'
) {
link.textContent = '模型下载攻略';
link.href = '/';
replacedLinks.add(link);
}
// 删除Enterprise链接
else if (
(linkHref.includes('/enterprise') || linkHref === '/enterprise' ||
linkText === 'Enterprise' || linkText.match(/^s*Enterprises*$/i))
) {
if (link.parentNode) {
link.parentNode.removeChild(link);
}
replacedLinks.add(link);
}
});
// 查找可能嵌套的Spaces和Posts文本
const textNodes = [];
function findTextNodes(element) {
if (element.nodeType === Node.TEXT_NODE) {
const text = element.textContent.trim();
if (text === 'Spaces' || text === 'Posts' || text === 'Enterprise') {
textNodes.push(element);
}
} else {
for (const child of element.childNodes) {
findTextNodes(child);
}
}
}
// 只在导航区域内查找文本节点
findTextNodes(headerArea);
// 替换找到的文本节点
textNodes.forEach(node => {
const text = node.textContent.trim();
if (text === 'Spaces') {
node.textContent = node.textContent.replace(/Spaces/g, 'OCR模型免费转Markdown');
} else if (text === 'Posts') {
// 删除Posts文本节点
if (node.parentNode) {
node.parentNode.removeChild(node);
}
} else if (text === 'Enterprise') {
// 删除Enterprise文本节点
if (node.parentNode) {
node.parentNode.removeChild(node);
}
}
});
// 标记已替换完成
window._navLinksReplaced = true;
}
// 替换代码区域中的域名
function replaceCodeDomains() {
// 特别处理span.hljs-string和span.njs-string元素
document.querySelectorAll('span.hljs-string, span.njs-string, span[class*="hljs-string"], span[class*="njs-string"]').forEach(span => {
if (span.textContent && span.textContent.includes('huggingface.co')) {
span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 替换hljs-string类的span中的域名(移除多余的转义符号)
document.querySelectorAll('span.hljs-string, span[class*="hljs-string"]').forEach(span => {
if (span.textContent && span.textContent.includes('huggingface.co')) {
span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 替换pre和code标签中包含git clone命令的域名
document.querySelectorAll('pre, code').forEach(element => {
if (element.textContent && element.textContent.includes('git clone')) {
const text = element.innerHTML;
if (text.includes('huggingface.co')) {
element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
// 处理特定的命令行示例
document.querySelectorAll('pre, code').forEach(element => {
const text = element.innerHTML;
if (text.includes('huggingface.co')) {
// 针对git clone命令的专门处理
if (text.includes('git clone') || text.includes('GIT_LFS_SKIP_SMUDGE=1')) {
element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
// 特别处理模型下载页面上的代码片段
document.querySelectorAll('.flex.border-t, .svelte_hydrator, .inline-block').forEach(container => {
const content = container.innerHTML;
if (content && content.includes('huggingface.co')) {
container.innerHTML = content.replace(/huggingface.co/g, 'aifasthub.com');
}
});
// 特别处理模型仓库克隆对话框中的代码片段
try {
// 查找包含"Clone this model repository"标题的对话框
const cloneDialog = document.querySelector('.svelte_hydration_boundary, [data-target="MainHeader"]');
if (cloneDialog) {
// 查找对话框中所有的代码片段和命令示例
const codeElements = cloneDialog.querySelectorAll('pre, code, span');
codeElements.forEach(element => {
if (element.textContent && element.textContent.includes('huggingface.co')) {
if (element.innerHTML.includes('huggingface.co')) {
element.innerHTML = element.innerHTML.replace(/huggingface.co/g, 'aifasthub.com');
} else {
element.textContent = element.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
}
// 更精确地定位克隆命令中的域名
document.querySelectorAll('[data-target]').forEach(container => {
const codeBlocks = container.querySelectorAll('pre, code, span.hljs-string');
codeBlocks.forEach(block => {
if (block.textContent && block.textContent.includes('huggingface.co')) {
if (block.innerHTML.includes('huggingface.co')) {
block.innerHTML = block.innerHTML.replace(/huggingface.co/g, 'aifasthub.com');
} else {
block.textContent = block.textContent.replace(/huggingface.co/g, 'aifasthub.com');
}
}
});
});
} catch (e) {
// 错误处理但不打印日志
}
}
// 当DOM加载完成后执行替换
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', () => {
replaceHeaderBranding();
replaceNavigationLinks();
replaceCodeDomains();
// 只在必要时执行替换 - 3秒后再次检查
setTimeout(() => {
if (!window._navLinksReplaced) {
console.log('[Client] 3秒后重新检查导航链接');
replaceNavigationLinks();
}
}, 3000);
});
} else {
replaceHeaderBranding();
replaceNavigationLinks();
replaceCodeDomains();
// 只在必要时执行替换 - 3秒后再次检查
setTimeout(() => {
if (!window._navLinksReplaced) {
console.log('[Client] 3秒后重新检查导航链接');
replaceNavigationLinks();
}
}, 3000);
}
// 增加一个MutationObserver来处理可能的动态元素加载
const observer = new MutationObserver(mutations => {
// 检查是否导航区域有变化
const hasNavChanges = mutations.some(mutation => {
// 检查是否存在header或nav元素变化
return Array.from(mutation.addedNodes).some(node => {
if (node.nodeType === Node.ELEMENT_NODE) {
// 检查是否是导航元素或其子元素
if (node.tagName === 'HEADER' || node.tagName === 'NAV' ||
node.querySelector('header, nav')) {
return true;
}
// 检查是否在导航元素内部
let parent = node.parentElement;
while (parent) {
if (parent.tagName === 'HEADER' || parent.tagName === 'NAV') {
return true;
}
parent = parent.parentElement;
}
}
return false;
});
});
// 只在导航区域有变化时执行替换
if (hasNavChanges) {
// 重置替换状态,允许再次替换
window._navLinksReplaced = false;
replaceHeaderBranding();
replaceNavigationLinks();
}
});
// 开始观察document.body的变化,包括子节点
if (document.body) {
observer.observe(document.body, { childList: true, subtree: true });
} else {
document.addEventListener('DOMContentLoaded', () => {
observer.observe(document.body, { childList: true, subtree: true });
});
}
})();
\n\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/css/source/_module.less","new_path":"view/frontend/web/css/source/_module.less","diff":"top: 50%;\n}\n}\n+ .block-customer-login {\n+ .amazon-sign-in-button-container {\n+ .field-tooltip {\n+ .field-tooltip-content {\n+ top: 38px;\n+ left: -245px;\n+\n+ &:before {\n+ border: none;\n+ border-left: 10px solid transparent;\n+ border-right: 10px solid transparent;\n+ border-bottom: 10px solid #666666;\n+ top: -10px;\n+ left: 244px;\n+ }\n+ &:after {\n+ border: none;\n+ border-left: 10px solid transparent;\n+ border-right: 10px solid transparent;\n+ border-bottom: 10px solid #f4f4f4;\n+ top: -8px;\n+ left: 244px;\n+ }\n+ }\n+ }\n+ }\n+ }\n.cart-summary {\n.amazon-button-container {\n"},{"change_type":"ADD","old_path":null,"new_path":"view/frontend/web/js/view/login-button-wrapper.js","diff":"+/**\n+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\").\n+ * You may not use this file except in compliance with the License.\n+ * A copy of the License is located at\n+ *\n+ * http://aws.amazon.com/apache2.0\n+ *\n+ * or in the \"license\" file accompanying this file. This file is distributed\n+ * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n+ * express or implied. See the License for the specific language governing\n+ * permissions and limitations under the License.\n+ */\n+\n+define(\n+ [\n+ 'jquery',\n+ 'uiRegistry',\n+ 'Amazon_Pay/js/model/storage',\n+ 'amazonPayLoginButton',\n+ 'uiComponent'\n+ ], function(\n+ $,\n+ registry,\n+ amazonStorage,\n+ loginButton,\n+ component\n+ ) {\n+ 'use strict';\n+\n+ if (amazonStorage.isLwaEnabled) {\n+ return component.extend({\n+ defaults: {\n+ template: 'Amazon_Pay/login-button-wrapper'\n+ },\n+\n+ initializeLoginButton: function() {\n+ $('#AmazonPayButton').AmazonLoginButton();\n+ }\n+\n+ });\n+ }\n+\n+ return component;\n+});\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/layout/default.xml\",\n \"new_path\": \"view/frontend/layout/default.xml\",\n \"diff\": \"\\n\\n\\n+\\n+ \\n+ \\n+ \\n+ - \\n+
- \\n+
- \\n+
- \\n+
- Amazon_Pay/js/view/login-button-wrapper
\\n+ - 0
\\n+ - additional-login-form-fields
\\n+ - \\n+
- Securely login into our website using your existing Amazon details.
\\n+\\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n\\n\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/web/css/source/_module.less\",\n \"new_path\": \"view/frontend/web/css/source/_module.less\",\n \"diff\": \"top: 50%;\\n}\\n}\\n+ .block-customer-login {\\n+ .amazon-sign-in-button-container {\\n+ .field-tooltip {\\n+ .field-tooltip-content {\\n+ top: 38px;\\n+ left: -245px;\\n+\\n+ &:before {\\n+ border: none;\\n+ border-left: 10px solid transparent;\\n+ border-right: 10px solid transparent;\\n+ border-bottom: 10px solid #666666;\\n+ top: -10px;\\n+ left: 244px;\\n+ }\\n+ &:after {\\n+ border: none;\\n+ border-left: 10px solid transparent;\\n+ border-right: 10px solid transparent;\\n+ border-bottom: 10px solid #f4f4f4;\\n+ top: -8px;\\n+ left: 244px;\\n+ }\\n+ }\\n+ }\\n+ }\\n+ }\\n.cart-summary {\\n.amazon-button-container {\\n\"\n },\n {\n \"change_type\": \"ADD\",\n \"old_path\": null,\n \"new_path\": \"view/frontend/web/js/view/login-button-wrapper.js\",\n \"diff\": \"+/**\\n+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.\\n+ *\\n+ * Licensed under the Apache License, Version 2.0 (the \\\"License\\\").\\n+ * You may not use this file except in compliance with the License.\\n+ * A copy of the License is located at\\n+ *\\n+ * http://aws.amazon.com/apache2.0\\n+ *\\n+ * or in the \\\"license\\\" file accompanying this file. This file is distributed\\n+ * on an \\\"AS IS\\\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\\n+ * express or implied. See the License for the specific language governing\\n+ * permissions and limitations under the License.\\n+ */\\n+\\n+define(\\n+ [\\n+ 'jquery',\\n+ 'uiRegistry',\\n+ 'Amazon_Pay/js/model/storage',\\n+ 'amazonPayLoginButton',\\n+ 'uiComponent'\\n+ ], function(\\n+ $,\\n+ registry,\\n+ amazonStorage,\\n+ loginButton,\\n+ component\\n+ ) {\\n+ 'use strict';\\n+\\n+ if (amazonStorage.isLwaEnabled) {\\n+ return component.extend({\\n+ defaults: {\\n+ template: 'Amazon_Pay/login-button-wrapper'\\n+ },\\n+\\n+ initializeLoginButton: function() {\\n+ $('#AmazonPayButton').AmazonLoginButton();\\n+ }\\n+\\n+ });\\n+ }\\n+\\n+ return component;\\n+});\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-661 - add Sign in with Amazon button to the authentication modal that is triggered when guest checkout is disabled and a guest clicks proceed to checkout"}}},{"rowIdx":514,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"17.03.2021 13:53:16"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"83e232dbb6a72cf095fabfce8bfc2b0d4d538ce6"},"message":{"kind":"string","value":"remove commented lines from xml"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"view/frontend/layout/default.xml","new_path":"view/frontend/layout/default.xml","diff":"- additional-login-form-fields
\n- \n
- Securely login into our website using your existing Amazon details.
\n-\n-\n \n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/layout/default.xml\",\n \"new_path\": \"view/frontend/layout/default.xml\",\n \"diff\": \"- additional-login-form-fields
\\n- \\n
- Securely login into our website using your existing Amazon details.
\\n-\\n-\\n \\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-661 - remove commented lines from xml"}}},{"rowIdx":515,"cells":{"author":{"kind":"number","value":21266,"string":"21,266"},"date":{"kind":"string","value":"19.03.2021 14:29:06"},"timezone":{"kind":"number","value":14400,"string":"14,400"},"hash":{"kind":"string","value":"43964ffc77b154d723f82b06ba8057db7afcf9bc"},"message":{"kind":"string","value":"Add MFTF for"},"mods":{"kind":"list like","value":[{"change_type":"ADD","old_path":null,"new_path":"Test/Mftf-24/Test/AmazonSignInButtonVisibleNoGuestCheckout.xml","diff":"+\n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n"}],"string":"[\n {\n \"change_type\": \"ADD\",\n \"old_path\": null,\n \"new_path\": \"Test/Mftf-24/Test/AmazonSignInButtonVisibleNoGuestCheckout.xml\",\n \"diff\": \"+\\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"Add MFTF for ASD-661"}}},{"rowIdx":516,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"19.03.2021 16:58:25"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"491e6563e441e9b09d81c15e94eb9b72febb3964"},"message":{"kind":"string","value":"add required argument for a test, and make filename / test name match"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"Test/Mftf-24/Test/AmazonShippingAddressTest.xml","new_path":"Test/Mftf-24/Test/AmazonShippingAddressTest.xml","diff":"\n\n\n- \n+ \n+ \n+ \n\n\n"},{"change_type":"RENAME","old_path":"Test/Mftf-24/Test/AmazonSignInButtonVisibleNoGuestCheckout.xml","new_path":"Test/Mftf-24/Test/AmazonSignInButtonNoGuestCheckoutPopupTest.xml","diff":"\n\n- \n+ \n\n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Test/Mftf-24/Test/AmazonShippingAddressTest.xml\",\n \"new_path\": \"Test/Mftf-24/Test/AmazonShippingAddressTest.xml\",\n \"diff\": \"\\n\\n\\n- \\n+ \\n+ \\n+ \\n\\n\\n\"\n },\n {\n \"change_type\": \"RENAME\",\n \"old_path\": \"Test/Mftf-24/Test/AmazonSignInButtonVisibleNoGuestCheckout.xml\",\n \"new_path\": \"Test/Mftf-24/Test/AmazonSignInButtonNoGuestCheckoutPopupTest.xml\",\n \"diff\": \"\\n\\n- \\n+ \\n\\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-661 - add required argument for a test, and make filename / test name match"}}},{"rowIdx":517,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"23.03.2021 15:37:36"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"13a8a9ca1d95f6f4aea6facc54d1dc0cf479d456"},"message":{"kind":"string","value":"restructure the button widget creation to add an observer, so that if the customer data loads after the button js runs and adds customer data then it will trigger rendering the Amazon Pay button"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"view/frontend/web/js/amazon-button.js","new_path":"view/frontend/web/js/amazon-button.js","diff":"@@ -22,16 +22,6 @@ define([\n], function ($, checkoutSessionConfigLoad, amazonStorage, url, amazonCheckout, customerData) {\n'use strict';\n- var cart = customerData.get('cart'),\n- customer = customerData.get('customer'),\n- canCheckoutWithAmazon = false;\n-\n- // to use Amazon Pay: customer needs to be logged in, or guest checkout allowed, or Amazon Sign-in enabled\n- if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\n- canCheckoutWithAmazon = true;\n- }\n-\n- if (amazonStorage.isEnabled && canCheckoutWithAmazon) {\n$.widget('amazon.AmazonButton', {\noptions: {\npayOnly: null,\n@@ -129,6 +119,25 @@ define([\n}\n});\n+\n+ var cart = customerData.get('cart'),\n+ customer = customerData.get('customer'),\n+ canCheckoutWithAmazon = false;\n+\n+ // to use Amazon Pay: customer needs to be logged in, or guest checkout allowed, or Amazon Sign-in enabled\n+ if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\n+ canCheckoutWithAmazon = true;\n+ }\n+\n+ if (amazonStorage.isEnabled && canCheckoutWithAmazon) {\nreturn $.amazon.AmazonButton;\n+ } else {\n+ return function(config, element) {\n+ customer.subscribe(function() {\n+ if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\n+ $(element).AmazonButton();\n+ }\n+ });\n+ };\n}\n});\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/web/js/amazon-button.js\",\n \"new_path\": \"view/frontend/web/js/amazon-button.js\",\n \"diff\": \"@@ -22,16 +22,6 @@ define([\\n], function ($, checkoutSessionConfigLoad, amazonStorage, url, amazonCheckout, customerData) {\\n'use strict';\\n- var cart = customerData.get('cart'),\\n- customer = customerData.get('customer'),\\n- canCheckoutWithAmazon = false;\\n-\\n- // to use Amazon Pay: customer needs to be logged in, or guest checkout allowed, or Amazon Sign-in enabled\\n- if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\\n- canCheckoutWithAmazon = true;\\n- }\\n-\\n- if (amazonStorage.isEnabled && canCheckoutWithAmazon) {\\n$.widget('amazon.AmazonButton', {\\noptions: {\\npayOnly: null,\\n@@ -129,6 +119,25 @@ define([\\n}\\n});\\n+\\n+ var cart = customerData.get('cart'),\\n+ customer = customerData.get('customer'),\\n+ canCheckoutWithAmazon = false;\\n+\\n+ // to use Amazon Pay: customer needs to be logged in, or guest checkout allowed, or Amazon Sign-in enabled\\n+ if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\\n+ canCheckoutWithAmazon = true;\\n+ }\\n+\\n+ if (amazonStorage.isEnabled && canCheckoutWithAmazon) {\\nreturn $.amazon.AmazonButton;\\n+ } else {\\n+ return function(config, element) {\\n+ customer.subscribe(function() {\\n+ if (customer().firstname || amazonStorage.isGuestCheckoutEnabled || amazonStorage.isLwaEnabled) {\\n+ $(element).AmazonButton();\\n+ }\\n+ });\\n+ };\\n}\\n});\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-660 - restructure the button widget creation to add an observer, so that if the customer data loads after the button js runs and adds customer data then it will trigger rendering the Amazon Pay button"}}},{"rowIdx":518,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"24.03.2021 10:18:32"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"780966fb41fba3474399ddf86c62d90cb9ae5e48"},"message":{"kind":"string","value":"better handle hitting controller when checkoutSessionId is empty"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"Controller/Login/Checkout.php","new_path":"Controller/Login/Checkout.php","diff":"@@ -28,6 +28,9 @@ class Checkout extends \\Amazon\\Pay\\Controller\\Login\npublic function execute()\n{\n$checkoutSessionId = $this->getRequest()->getParam('amazonCheckoutSessionId');\n+ if ($checkoutSessionId == '') {\n+ return $this->_redirect('checkout/cart');\n+ }\ntry {\n$checkoutSession = $this->amazonAdapter->getCheckoutSession(\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Controller/Login/Checkout.php\",\n \"new_path\": \"Controller/Login/Checkout.php\",\n \"diff\": \"@@ -28,6 +28,9 @@ class Checkout extends \\\\Amazon\\\\Pay\\\\Controller\\\\Login\\npublic function execute()\\n{\\n$checkoutSessionId = $this->getRequest()->getParam('amazonCheckoutSessionId');\\n+ if ($checkoutSessionId == '') {\\n+ return $this->_redirect('checkout/cart');\\n+ }\\ntry {\\n$checkoutSession = $this->amazonAdapter->getCheckoutSession(\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-601 - better handle hitting controller when checkoutSessionId is empty"}}},{"rowIdx":519,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"29.03.2021 10:45:26"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"cec04909a4851d15fcb6be7e9a9669ae32ca234c"},"message":{"kind":"string","value":"convert another str_contains to strpos"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"view/frontend/templates/config.phtml","new_path":"view/frontend/templates/config.phtml","diff":"registry.set('amazonPay', = /* @noEscape */ \\Zend_Json::encode($block->getConfig()); ?>);\n});\n- \n+ \nrequire (['Amazon_Pay/js/model/storage'], function(amazonStorage) {\namazonStorage.clearAmazonCheckout();\n});\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/templates/config.phtml\",\n \"new_path\": \"view/frontend/templates/config.phtml\",\n \"diff\": \"registry.set('amazonPay', = /* @noEscape */ \\\\Zend_Json::encode($block->getConfig()); ?>);\\n});\\n- \\n+ \\nrequire (['Amazon_Pay/js/model/storage'], function(amazonStorage) {\\namazonStorage.clearAmazonCheckout();\\n});\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-668 - convert another str_contains to strpos"}}},{"rowIdx":520,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"30.03.2021 14:13:06"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"ced22bd11bb263fa0e32153dfabfaf9ba0efc27f"},"message":{"kind":"string","value":"add dependencies that are used but not listed in composer.json"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"composer.json","new_path":"composer.json","diff":"\"magento/module-quote\": \"^101.0\",\n\"magento/module-customer\": \"^102.0||^103.0\",\n\"magento/module-store\": \"^101.0\",\n+ \"magento/module-catalog\": \"^103.0||^104.0\",\n+ \"magento/module-configurable-product\": \"^100.0\",\n+ \"magento/module-directory\": \"^100.0\",\n+ \"magento/module-media-storage\": \"^100.0\",\n+ \"magento/module-paypal\": \"^100.0||^101.0\",\n\"amzn/amazon-pay-api-sdk-php\": \"^2.2\",\n\"aws/aws-php-sns-message-validator\": \"^1.5\"\n},\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"composer.json\",\n \"new_path\": \"composer.json\",\n \"diff\": \"\\\"magento/module-quote\\\": \\\"^101.0\\\",\\n\\\"magento/module-customer\\\": \\\"^102.0||^103.0\\\",\\n\\\"magento/module-store\\\": \\\"^101.0\\\",\\n+ \\\"magento/module-catalog\\\": \\\"^103.0||^104.0\\\",\\n+ \\\"magento/module-configurable-product\\\": \\\"^100.0\\\",\\n+ \\\"magento/module-directory\\\": \\\"^100.0\\\",\\n+ \\\"magento/module-media-storage\\\": \\\"^100.0\\\",\\n+ \\\"magento/module-paypal\\\": \\\"^100.0||^101.0\\\",\\n\\\"amzn/amazon-pay-api-sdk-php\\\": \\\"^2.2\\\",\\n\\\"aws/aws-php-sns-message-validator\\\": \\\"^1.5\\\"\\n},\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-603 - add dependencies that are used but not listed in composer.json"}}},{"rowIdx":521,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"31.03.2021 14:40:28"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"b6555d9f701a74398b1154128b36d46bba951451"},"message":{"kind":"string","value":"alter the redirect behavior to be configurable, to support checkout paths other than /checkout and success pages other than /checkout/onepage/success"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"Controller/Checkout/CompleteSession.php","new_path":"Controller/Checkout/CompleteSession.php","diff":"@@ -27,6 +27,11 @@ class CompleteSession extends \\Magento\\Framework\\App\\Action\\Action\n*/\nprivate $amazonCheckoutSession;\n+ /**\n+ * @var \\Amazon\\Pay\\Model\\AmazonConfig\n+ */\n+ private $amazonConfig;\n+\n/**\n* @var \\Magento\\Store\\Model\\StoreManagerInterface\n*/\n@@ -51,6 +56,7 @@ class CompleteSession extends \\Magento\\Framework\\App\\Action\\Action\n* CompleteCheckout constructor.\n* @param \\Magento\\Framework\\App\\Action\\Context $context\n* @param \\Amazon\\Pay\\CustomerData\\CheckoutSession $amazonCheckoutSession\n+ * @param \\Amazon\\Pay\\Model\\AmazonConfig $amazonConfig\n* @param \\Magento\\Framework\\Stdlib\\CookieManagerInterface $cookieManager\n* @param \\Magento\\Framework\\Stdlib\\Cookie\\CookieMetadataFactory $cookieMetadataFactory\n* @param \\Magento\\Store\\Model\\StoreManagerInterface $storeManager\n@@ -59,6 +65,7 @@ class CompleteSession extends \\Magento\\Framework\\App\\Action\\Action\npublic function __construct(\n\\Magento\\Framework\\App\\Action\\Context $context,\n\\Amazon\\Pay\\CustomerData\\CheckoutSession $amazonCheckoutSession,\n+ \\Amazon\\Pay\\Model\\AmazonConfig $amazonConfig,\n\\Magento\\Framework\\Stdlib\\CookieManagerInterface $cookieManager,\n\\Magento\\Framework\\Stdlib\\Cookie\\CookieMetadataFactory $cookieMetadataFactory,\n\\Magento\\Store\\Model\\StoreManagerInterface $storeManager,\n@@ -66,6 +73,7 @@ class CompleteSession extends \\Magento\\Framework\\App\\Action\\Action\n) {\nparent::__construct($context);\n$this->amazonCheckoutSession = $amazonCheckoutSession;\n+ $this->amazonConfig = $amazonConfig;\n$this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\n$this->cookieManager = $cookieManager;\n$this->cookieMetadataFactory = $cookieMetadataFactory;\n@@ -91,7 +99,8 @@ class CompleteSession extends \\Magento\\Framework\\App\\Action\\Action\nthrow new \\Magento\\Framework\\Exception\\NotFoundException(__('Something went wrong. Please try again.'));\n}\n$this->updateVersionCookie();\n- return $this->_redirect('checkout/onepage/success', [\n+ $successUrl = $this->amazonConfig->getCheckoutResultUrlPath();\n+ return $this->_redirect($successUrl, [\n'_scope' => $scope,\n]);\n} catch (\\Exception $e) {\n"},{"change_type":"MODIFY","old_path":"Controller/Login/Checkout.php","new_path":"Controller/Login/Checkout.php","diff":"@@ -81,7 +81,8 @@ class Checkout extends \\Amazon\\Pay\\Controller\\Login\n$this->_eventManager->dispatch('amazon_login_authorize_error', ['exception' => $e]);\n}\n- return $this->_redirect('checkout', ['_query' => ['amazonCheckoutSessionId' => $checkoutSessionId]]);\n+ $checkoutUrl = $this->amazonConfig->getCheckoutReviewUrlPath();\n+ return $this->_redirect($checkoutUrl, ['_query' => ['amazonCheckoutSessionId' => $checkoutSessionId]]);\n}\nprotected function processAmazonCustomer(AmazonCustomerInterface $amazonCustomer)\n"},{"change_type":"MODIFY","old_path":"Model/Adapter/AmazonPayAdapter.php","new_path":"Model/Adapter/AmazonPayAdapter.php","diff":"@@ -159,7 +159,7 @@ class AmazonPayAdapter\n$payload = [\n'webCheckoutDetails' => [\n- 'checkoutResultReturnUrl' => $this->amazonConfig->getCheckoutResultUrl()\n+ 'checkoutResultReturnUrl' => $this->url->getRouteUrl('amazon_pay/checkout/completeSession')\n],\n'paymentDetails' => [\n'paymentIntent' => $paymentIntent,\n@@ -462,7 +462,7 @@ class AmazonPayAdapter\n{\n$payload = [\n'webCheckoutDetails' => [\n- 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewUrl(),\n+ 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewReturnUrl(),\n'checkoutCancelUrl' => $this->getCancelUrl(),\n],\n'storeId' => $this->amazonConfig->getClientId(),\n"},{"change_type":"MODIFY","old_path":"Model/AmazonConfig.php","new_path":"Model/AmazonConfig.php","diff":"@@ -507,7 +507,18 @@ class AmazonConfig\n/**\n* @return string\n*/\n- public function getCheckoutReviewUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n+ public function getCheckoutReviewReturnUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n+ {\n+ return $this->storeManager->getStore()->getUrl(\n+ 'amazon_pay/login/checkout',\n+ ['_forced_secure' => true]\n+ );\n+ }\n+\n+ /**\n+ * @return string\n+ */\n+ public function getCheckoutReviewUrlPath($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n{\n$result = $this->scopeConfig->getValue(\n'payment/amazon_payment_v2/checkout_review_url',\n@@ -515,10 +526,7 @@ class AmazonConfig\n$scopeCode\n);\nif (empty($result)) {\n- $result = $this->storeManager->getStore()->getUrl(\n- 'amazon_pay/login/checkout',\n- ['_forced_secure' => true]\n- );\n+ $result = 'checkout';\n}\nreturn $result;\n}\n@@ -526,7 +534,7 @@ class AmazonConfig\n/**\n* @return string\n*/\n- public function getCheckoutResultUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n+ public function getCheckoutResultUrlPath($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\n{\n$result = $this->scopeConfig->getValue(\n'payment/amazon_payment_v2/checkout_result_url',\n@@ -534,10 +542,7 @@ class AmazonConfig\n$scopeCode\n);\nif (empty($result)) {\n- $result = $this->storeManager->getStore()->getUrl(\n- 'amazon_pay/checkout/completeSession',\n- ['_forced_secure' => true]\n- );\n+ $result = 'checkout/onepage/success';\n}\nreturn $result;\n}\n"},{"change_type":"MODIFY","old_path":"Plugin/ConfigCredentialsValidator.php","new_path":"Plugin/ConfigCredentialsValidator.php","diff":"@@ -189,7 +189,7 @@ class ConfigCredentialsValidator\n$client = $this->clientFactory->create($scopeCode, $scope, $config);\n$response = $client->createCheckoutSession([\n'webCheckoutDetails' => [\n- 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewUrl(),\n+ 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewReturnUrl(),\n],\n'storeId' => $storeId,\n'platformId' => $this->amazonConfig->getPlatformId(),\n"},{"change_type":"MODIFY","old_path":"etc/adminhtml/system.xml","new_path":"etc/adminhtml/system.xml","diff":"payment/amazon_payment/logging\n\n\n- \n- \n+ \n+ Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Amazon Pay will redirect to this URL after the buyer selects their preferred payment instrument and shipping address. Do not use a leading slash.]]>\npayment/amazon_payment_v2/checkout_review_url\n- validate-secure-url\n\n\n- \n- \n+ \n+ Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Amazon Pay will redirect to this URL after completing the transaction. Do not use a leading slash.]]>\npayment/amazon_payment_v2/checkout_result_url\n- validate-secure-url\n\n\n\n"},{"change_type":"MODIFY","old_path":"etc/config.xml","new_path":"etc/config.xml","diff":"\n0\nA2ZAYEJU54T1BM\n+ checkout\n+ checkout/onepage/success\n\n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Controller/Checkout/CompleteSession.php\",\n \"new_path\": \"Controller/Checkout/CompleteSession.php\",\n \"diff\": \"@@ -27,6 +27,11 @@ class CompleteSession extends \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Action\\n*/\\nprivate $amazonCheckoutSession;\\n+ /**\\n+ * @var \\\\Amazon\\\\Pay\\\\Model\\\\AmazonConfig\\n+ */\\n+ private $amazonConfig;\\n+\\n/**\\n* @var \\\\Magento\\\\Store\\\\Model\\\\StoreManagerInterface\\n*/\\n@@ -51,6 +56,7 @@ class CompleteSession extends \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Action\\n* CompleteCheckout constructor.\\n* @param \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Context $context\\n* @param \\\\Amazon\\\\Pay\\\\CustomerData\\\\CheckoutSession $amazonCheckoutSession\\n+ * @param \\\\Amazon\\\\Pay\\\\Model\\\\AmazonConfig $amazonConfig\\n* @param \\\\Magento\\\\Framework\\\\Stdlib\\\\CookieManagerInterface $cookieManager\\n* @param \\\\Magento\\\\Framework\\\\Stdlib\\\\Cookie\\\\CookieMetadataFactory $cookieMetadataFactory\\n* @param \\\\Magento\\\\Store\\\\Model\\\\StoreManagerInterface $storeManager\\n@@ -59,6 +65,7 @@ class CompleteSession extends \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Action\\npublic function __construct(\\n\\\\Magento\\\\Framework\\\\App\\\\Action\\\\Context $context,\\n\\\\Amazon\\\\Pay\\\\CustomerData\\\\CheckoutSession $amazonCheckoutSession,\\n+ \\\\Amazon\\\\Pay\\\\Model\\\\AmazonConfig $amazonConfig,\\n\\\\Magento\\\\Framework\\\\Stdlib\\\\CookieManagerInterface $cookieManager,\\n\\\\Magento\\\\Framework\\\\Stdlib\\\\Cookie\\\\CookieMetadataFactory $cookieMetadataFactory,\\n\\\\Magento\\\\Store\\\\Model\\\\StoreManagerInterface $storeManager,\\n@@ -66,6 +73,7 @@ class CompleteSession extends \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Action\\n) {\\nparent::__construct($context);\\n$this->amazonCheckoutSession = $amazonCheckoutSession;\\n+ $this->amazonConfig = $amazonConfig;\\n$this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);\\n$this->cookieManager = $cookieManager;\\n$this->cookieMetadataFactory = $cookieMetadataFactory;\\n@@ -91,7 +99,8 @@ class CompleteSession extends \\\\Magento\\\\Framework\\\\App\\\\Action\\\\Action\\nthrow new \\\\Magento\\\\Framework\\\\Exception\\\\NotFoundException(__('Something went wrong. Please try again.'));\\n}\\n$this->updateVersionCookie();\\n- return $this->_redirect('checkout/onepage/success', [\\n+ $successUrl = $this->amazonConfig->getCheckoutResultUrlPath();\\n+ return $this->_redirect($successUrl, [\\n'_scope' => $scope,\\n]);\\n} catch (\\\\Exception $e) {\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Controller/Login/Checkout.php\",\n \"new_path\": \"Controller/Login/Checkout.php\",\n \"diff\": \"@@ -81,7 +81,8 @@ class Checkout extends \\\\Amazon\\\\Pay\\\\Controller\\\\Login\\n$this->_eventManager->dispatch('amazon_login_authorize_error', ['exception' => $e]);\\n}\\n- return $this->_redirect('checkout', ['_query' => ['amazonCheckoutSessionId' => $checkoutSessionId]]);\\n+ $checkoutUrl = $this->amazonConfig->getCheckoutReviewUrlPath();\\n+ return $this->_redirect($checkoutUrl, ['_query' => ['amazonCheckoutSessionId' => $checkoutSessionId]]);\\n}\\nprotected function processAmazonCustomer(AmazonCustomerInterface $amazonCustomer)\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Model/Adapter/AmazonPayAdapter.php\",\n \"new_path\": \"Model/Adapter/AmazonPayAdapter.php\",\n \"diff\": \"@@ -159,7 +159,7 @@ class AmazonPayAdapter\\n$payload = [\\n'webCheckoutDetails' => [\\n- 'checkoutResultReturnUrl' => $this->amazonConfig->getCheckoutResultUrl()\\n+ 'checkoutResultReturnUrl' => $this->url->getRouteUrl('amazon_pay/checkout/completeSession')\\n],\\n'paymentDetails' => [\\n'paymentIntent' => $paymentIntent,\\n@@ -462,7 +462,7 @@ class AmazonPayAdapter\\n{\\n$payload = [\\n'webCheckoutDetails' => [\\n- 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewUrl(),\\n+ 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewReturnUrl(),\\n'checkoutCancelUrl' => $this->getCancelUrl(),\\n],\\n'storeId' => $this->amazonConfig->getClientId(),\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Model/AmazonConfig.php\",\n \"new_path\": \"Model/AmazonConfig.php\",\n \"diff\": \"@@ -507,7 +507,18 @@ class AmazonConfig\\n/**\\n* @return string\\n*/\\n- public function getCheckoutReviewUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\\n+ public function getCheckoutReviewReturnUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\\n+ {\\n+ return $this->storeManager->getStore()->getUrl(\\n+ 'amazon_pay/login/checkout',\\n+ ['_forced_secure' => true]\\n+ );\\n+ }\\n+\\n+ /**\\n+ * @return string\\n+ */\\n+ public function getCheckoutReviewUrlPath($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\\n{\\n$result = $this->scopeConfig->getValue(\\n'payment/amazon_payment_v2/checkout_review_url',\\n@@ -515,10 +526,7 @@ class AmazonConfig\\n$scopeCode\\n);\\nif (empty($result)) {\\n- $result = $this->storeManager->getStore()->getUrl(\\n- 'amazon_pay/login/checkout',\\n- ['_forced_secure' => true]\\n- );\\n+ $result = 'checkout';\\n}\\nreturn $result;\\n}\\n@@ -526,7 +534,7 @@ class AmazonConfig\\n/**\\n* @return string\\n*/\\n- public function getCheckoutResultUrl($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\\n+ public function getCheckoutResultUrlPath($scope = ScopeInterface::SCOPE_STORE, $scopeCode = null)\\n{\\n$result = $this->scopeConfig->getValue(\\n'payment/amazon_payment_v2/checkout_result_url',\\n@@ -534,10 +542,7 @@ class AmazonConfig\\n$scopeCode\\n);\\nif (empty($result)) {\\n- $result = $this->storeManager->getStore()->getUrl(\\n- 'amazon_pay/checkout/completeSession',\\n- ['_forced_secure' => true]\\n- );\\n+ $result = 'checkout/onepage/success';\\n}\\nreturn $result;\\n}\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Plugin/ConfigCredentialsValidator.php\",\n \"new_path\": \"Plugin/ConfigCredentialsValidator.php\",\n \"diff\": \"@@ -189,7 +189,7 @@ class ConfigCredentialsValidator\\n$client = $this->clientFactory->create($scopeCode, $scope, $config);\\n$response = $client->createCheckoutSession([\\n'webCheckoutDetails' => [\\n- 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewUrl(),\\n+ 'checkoutReviewReturnUrl' => $this->amazonConfig->getCheckoutReviewReturnUrl(),\\n],\\n'storeId' => $storeId,\\n'platformId' => $this->amazonConfig->getPlatformId(),\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"etc/adminhtml/system.xml\",\n \"new_path\": \"etc/adminhtml/system.xml\",\n \"diff\": \"payment/amazon_payment/logging\\n\\n\\n- \\n- \\n+ \\n+ Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Amazon Pay will redirect to this URL after the buyer selects their preferred payment instrument and shipping address. Do not use a leading slash.]]>\\npayment/amazon_payment_v2/checkout_review_url\\n- validate-secure-url\\n\\n\\n- \\n- \\n+ \\n+ Amazon Pay Checkout could potentially break if this value is modified. Do it only if it is needed by your website.
Amazon Pay will redirect to this URL after completing the transaction. Do not use a leading slash.]]>\\npayment/amazon_payment_v2/checkout_result_url\\n- validate-secure-url\\n\\n\\n\\n\"\n },\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"etc/config.xml\",\n \"new_path\": \"etc/config.xml\",\n \"diff\": \"\\n0\\nA2ZAYEJU54T1BM\\n+ checkout\\n+ checkout/onepage/success\\n\\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-629 - alter the redirect behavior to be configurable, to support checkout paths other than /checkout and success pages other than /checkout/onepage/success"}}},{"rowIdx":522,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"01.04.2021 10:57:59"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"e10a664ce2403f53b2bed5881319b8cab5dea1d9"},"message":{"kind":"string","value":"add type=\"button\" to private key config so that enter on an unrelated text field doesn't trigger the buttons"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"view/adminhtml/templates/system/config/private-key.phtml","new_path":"view/adminhtml/templates/system/config/private-key.phtml","diff":"?>\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/adminhtml/templates/system/config/private-key.phtml\",\n \"new_path\": \"view/adminhtml/templates/system/config/private-key.phtml\",\n \"diff\": \"?>\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-670 - add type=\"button\" to private key config so that enter on an unrelated text field doesn't trigger the buttons"}}},{"rowIdx":523,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"06.04.2021 18:28:47"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"74bea0e108b12c83874c7fadae3ccfcc772358cc"},"message":{"kind":"string","value":"set the Amazon Checkout Session ID based on the correct url param, it would set it to any url param in some cases before"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"view/frontend/web/js/model/storage.js","new_path":"view/frontend/web/js/model/storage.js","diff":"@@ -60,14 +60,15 @@ define([\n*/\ngetCheckoutSessionId: function () {\nvar sessionId = getStorage().get('id');\n- var param = '?amazonCheckoutSessionId=';\n- if (typeof sessionId === 'undefined' && window.location.search.indexOf(param) != -1) {\n- sessionId = window.location.search.replace(param, '');\n+ var param = 'amazonCheckoutSessionId';\n+\n+ var myParams = new URLSearchParams(window.location.search);\n+ if (myParams.has(param)) {\n+ var paramSessionId = myParams.get(param);\n+ if (typeof sessionId === 'undefined' || paramSessionId != sessionId) {\n+ sessionId = paramSessionId;\ngetStorage().set('id', sessionId);\n}\n- else if(sessionId != window.location.search.replace(param, '') && window.location.search.replace(param, '') != '') {\n- sessionId = window.location.search.replace(param, '');\n- getStorage().set('id', sessionId);\n}\nreturn sessionId;\n},\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"view/frontend/web/js/model/storage.js\",\n \"new_path\": \"view/frontend/web/js/model/storage.js\",\n \"diff\": \"@@ -60,14 +60,15 @@ define([\\n*/\\ngetCheckoutSessionId: function () {\\nvar sessionId = getStorage().get('id');\\n- var param = '?amazonCheckoutSessionId=';\\n- if (typeof sessionId === 'undefined' && window.location.search.indexOf(param) != -1) {\\n- sessionId = window.location.search.replace(param, '');\\n+ var param = 'amazonCheckoutSessionId';\\n+\\n+ var myParams = new URLSearchParams(window.location.search);\\n+ if (myParams.has(param)) {\\n+ var paramSessionId = myParams.get(param);\\n+ if (typeof sessionId === 'undefined' || paramSessionId != sessionId) {\\n+ sessionId = paramSessionId;\\ngetStorage().set('id', sessionId);\\n}\\n- else if(sessionId != window.location.search.replace(param, '') && window.location.search.replace(param, '') != '') {\\n- sessionId = window.location.search.replace(param, '');\\n- getStorage().set('id', sessionId);\\n}\\nreturn sessionId;\\n},\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-671 - set the Amazon Checkout Session ID based on the correct url param, it would set it to any url param in some cases before"}}},{"rowIdx":524,"cells":{"author":{"kind":"number","value":21255,"string":"21,255"},"date":{"kind":"string","value":"08.04.2021 17:53:07"},"timezone":{"kind":"number","value":14400,"string":"14,400"},"hash":{"kind":"string","value":"b5f17405d21734a2fdd243d1ed8b2f9537ca063a"},"message":{"kind":"string","value":"Alexa Model - use Phrases to construct Exceptions"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"Model/Alexa.php","new_path":"Model/Alexa.php","diff":"@@ -18,6 +18,7 @@ namespace Amazon\\Pay\\Model;\nuse Amazon\\Pay\\Client\\ClientFactoryInterface;\nuse Magento\\Framework\\Module\\Dir;\n+use Magento\\Framework\\Phrase;\nuse Magento\\Sales\\Model\\Order\\Payment;\nuse Magento\\Store\\Model\\ScopeInterface;\n@@ -94,7 +95,7 @@ class Alexa\n$errorMessage = __('API error:') . ' (' . $status . ') ';\n$errorMessage .= !empty($response['reasonCode']) ? $response['reasonCode'] . ': ' : '';\n$errorMessage .= !empty($response['message']) ? $response['message'] : '';\n- throw new \\Magento\\Framework\\Exception\\StateException($errorMessage);\n+ throw new \\Magento\\Framework\\Exception\\StateException(new Phrase($errorMessage));\n}\nreturn $response;\n}\n@@ -115,7 +116,9 @@ class Alexa\n}\n$transaction = $this->transactionRepository->getByTransactionType($transationType, $payment->getId());\nif (!$transaction) {\n- throw new \\Magento\\Framework\\Exception\\NotFoundException('Failed to lookup order transaction');\n+ throw new \\Magento\\Framework\\Exception\\NotFoundException(\n+ new Phrase('Failed to lookup order transaction')\n+ );\n}\n$response = $this->apiCall($order->getStoreId(), 'getCharge', [$transaction->getTxnId()]);\nreturn $response['chargePermissionId'];\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"Model/Alexa.php\",\n \"new_path\": \"Model/Alexa.php\",\n \"diff\": \"@@ -18,6 +18,7 @@ namespace Amazon\\\\Pay\\\\Model;\\nuse Amazon\\\\Pay\\\\Client\\\\ClientFactoryInterface;\\nuse Magento\\\\Framework\\\\Module\\\\Dir;\\n+use Magento\\\\Framework\\\\Phrase;\\nuse Magento\\\\Sales\\\\Model\\\\Order\\\\Payment;\\nuse Magento\\\\Store\\\\Model\\\\ScopeInterface;\\n@@ -94,7 +95,7 @@ class Alexa\\n$errorMessage = __('API error:') . ' (' . $status . ') ';\\n$errorMessage .= !empty($response['reasonCode']) ? $response['reasonCode'] . ': ' : '';\\n$errorMessage .= !empty($response['message']) ? $response['message'] : '';\\n- throw new \\\\Magento\\\\Framework\\\\Exception\\\\StateException($errorMessage);\\n+ throw new \\\\Magento\\\\Framework\\\\Exception\\\\StateException(new Phrase($errorMessage));\\n}\\nreturn $response;\\n}\\n@@ -115,7 +116,9 @@ class Alexa\\n}\\n$transaction = $this->transactionRepository->getByTransactionType($transationType, $payment->getId());\\nif (!$transaction) {\\n- throw new \\\\Magento\\\\Framework\\\\Exception\\\\NotFoundException('Failed to lookup order transaction');\\n+ throw new \\\\Magento\\\\Framework\\\\Exception\\\\NotFoundException(\\n+ new Phrase('Failed to lookup order transaction')\\n+ );\\n}\\n$response = $this->apiCall($order->getStoreId(), 'getCharge', [$transaction->getTxnId()]);\\nreturn $response['chargePermissionId'];\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"Alexa Model - use Phrases to construct Exceptions"}}},{"rowIdx":525,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"16.04.2021 11:47:15"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"61ccf64d04078d949fee98b9bf3f3283d3ef4db5"},"message":{"kind":"string","value":"add sort order config option"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"etc/adminhtml/system.xml","new_path":"etc/adminhtml/system.xml","diff":"Amazon\\Pay\\Model\\Config\\Source\\AuthorizationMode\npayment/amazon_payment/authorization_mode\n\n+ \n+ \n+ validate-number\n+ payment/amazon_payment_v2/sort_order\n+ \n\n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"etc/adminhtml/system.xml\",\n \"new_path\": \"etc/adminhtml/system.xml\",\n \"diff\": \"Amazon\\\\Pay\\\\Model\\\\Config\\\\Source\\\\AuthorizationMode\\npayment/amazon_payment/authorization_mode\\n\\n+ \\n+ \\n+ validate-number\\n+ payment/amazon_payment_v2/sort_order\\n+ \\n\\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-464 - add sort order config option"}}},{"rowIdx":526,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"19.04.2021 10:56:00"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"169a8843f4183e90bad668ee24ab94817dda76f3"},"message":{"kind":"string","value":"update location of sort order config option"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"etc/adminhtml/system.xml","new_path":"etc/adminhtml/system.xml","diff":"Amazon\\Pay\\Model\\Config\\Source\\AuthorizationMode\npayment/amazon_payment/authorization_mode\n\n- \n- \n- validate-number\n- payment/amazon_payment_v2/sort_order\n- \n\n\n\nMagento\\Config\\Model\\Config\\Source\\Yesno\npayment/amazonlogin/active\n\n+ \n+ \n+ validate-number\n+ payment/amazon_payment_v2/sort_order\n+ \n\n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"etc/adminhtml/system.xml\",\n \"new_path\": \"etc/adminhtml/system.xml\",\n \"diff\": \"Amazon\\\\Pay\\\\Model\\\\Config\\\\Source\\\\AuthorizationMode\\npayment/amazon_payment/authorization_mode\\n\\n- \\n- \\n- validate-number\\n- payment/amazon_payment_v2/sort_order\\n- \\n\\n\\n\\nMagento\\\\Config\\\\Model\\\\Config\\\\Source\\\\Yesno\\npayment/amazonlogin/active\\n\\n+ \\n+ \\n+ validate-number\\n+ payment/amazon_payment_v2/sort_order\\n+ \\n\\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-464 - update location of sort order config option"}}},{"rowIdx":527,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"19.04.2021 11:43:32"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"9c09f4c8564f87b41b3fdc3e5d19c2fe17b00b1b"},"message":{"kind":"string","value":"re-add the dependency on \"Show Amazon Pay in payment methods\" field for the sort order config to show up"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"etc/adminhtml/system.xml","new_path":"etc/adminhtml/system.xml","diff":"\nvalidate-number\npayment/amazon_payment_v2/sort_order\n+ \n+ 1\n+ \n\n\n\n"}],"string":"[\n {\n \"change_type\": \"MODIFY\",\n \"old_path\": \"etc/adminhtml/system.xml\",\n \"new_path\": \"etc/adminhtml/system.xml\",\n \"diff\": \"\\nvalidate-number\\npayment/amazon_payment_v2/sort_order\\n+ \\n+ 1\\n+ \\n\\n\\n\\n\"\n }\n]"},"language":{"kind":"string","value":"PHP"},"license":{"kind":"string","value":"Apache License 2.0"},"repo":{"kind":"string","value":"amzn/amazon-payments-magento-2-plugin"},"original_message":{"kind":"string","value":"ASD-464 - re-add the dependency on \"Show Amazon Pay in payment methods\" field for the sort order config to show up"}}},{"rowIdx":528,"cells":{"author":{"kind":"number","value":21241,"string":"21,241"},"date":{"kind":"string","value":"26.04.2021 20:39:57"},"timezone":{"kind":"number","value":18000,"string":"18,000"},"hash":{"kind":"string","value":"731060bd5c73cc09f9385b1557fad4ecb3bc534a"},"message":{"kind":"string","value":"change how core javascript is extended/overridden"},"mods":{"kind":"list like","value":[{"change_type":"MODIFY","old_path":"etc/frontend/di.xml","new_path":"etc/frontend/di.xml","diff":"\n\n\n- \n- \n- \n\n"},{"change_type":"MODIFY","old_path":"view/frontend/requirejs-config.js","new_path":"view/frontend/requirejs-config.js","diff":"@@ -21,6 +21,21 @@ var config = {\n'Magento_Tax/js/view/checkout/summary/grand-total': {\n'Amazon_Pay/js/view/checkout/summary/grand-total-mixin': true,\n'Amazon_Payment/js/view/checkout/summary/grand-total-mixin': false\n+ },\n+ 'Magento_Checkout/js/view/form/element/email': {\n+ 'Amazon_Pay/js/view/form/element/email': true\n+ },\n+ 'Magento_Checkout/js/view/shipping-address/list': {\n+ 'Amazon_Pay/js/view/shipping-address/list': true\n+ },\n+ 'Magento_Checkout/js/view/shipping-address/address-renderer/default': {\n+ 'Amazon_Pay/js/view/shipping-address/address-renderer/default': true\n+ },\n+ 'Magento_Checkout/js/view/billing-address': {\n+ 'Amazon_Pay/js/view/billing-address': true\n+ },\n+ 'Magento_Checkout/js/view/shipping': {\n+ 'Amazon_Pay/js/view/shipping': true\n}\n}\n},\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/js/view/billing-address.js","new_path":"view/frontend/web/js/view/billing-address.js","diff":"define([\n'jquery',\n- 'Magento_Checkout/js/view/billing-address',\n'Amazon_Pay/js/action/toggle-form-fields',\n'Amazon_Pay/js/model/storage',\n'Amazon_Pay/js/model/billing-address/form-address-state'\n-], function ($, Component, toggleFormFields, amazonStorage, billingFormAddressState) {\n+], function ($, toggleFormFields, amazonStorage, billingFormAddressState) {\n'use strict';\n+ return function(Component) {\nif (!amazonStorage.isAmazonCheckout()) {\n// DO NOT EXTEND SHARED BILLING ADDRESS FORM IF AMAZON CHECKOUT IS NOT INITIATED\nreturn Component;\n@@ -76,4 +76,5 @@ define([\nreturn this.isAddressEditable ? this._super() : false;\n}\n});\n+ }\n});\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/js/view/form/element/email.js","new_path":"view/frontend/web/js/view/form/element/email.js","diff":"define([\n'jquery',\n- 'Magento_Checkout/js/view/form/element/email',\n'Magento_Customer/js/customer-data',\n'Magento_Checkout/js/model/quote',\n'Magento_Checkout/js/checkout-data',\n+ 'Amazon_Pay/js/model/storage',\n'mage/validation'\n-], function ($, Component, customerData, quote, checkoutData) {\n+], function ($, customerData, quote, checkoutData, amazonStorage) {\n'use strict';\n+ return function(Component) {\n+ if (!amazonStorage.isEnabled) {\n+ return Component;\n+ }\n+\nreturn Component.extend({\ndefaults: {\nemail: checkoutData.getInputFieldEmailValue(),\n@@ -32,4 +37,5 @@ define([\nreturn this;\n}\n});\n+ }\n});\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/js/view/shipping-address/address-renderer/default.js","new_path":"view/frontend/web/js/view/shipping-address/address-renderer/default.js","diff":"define([\n'jquery',\n- 'Magento_Checkout/js/view/shipping-address/address-renderer/default',\n'uiRegistry',\n'Amazon_Pay/js/action/toggle-form-fields',\n'Amazon_Pay/js/model/storage',\n'Amazon_Pay/js/amazon-checkout'\n-], function ($, Component, registry, toggleFormFields, amazonStorage, amazonCheckout) {\n+], function ($, registry, toggleFormFields, amazonStorage, amazonCheckout) {\n'use strict';\n- var self;\n- var editSelector = '.edit-address-link';\n-\n+ return function(Component) {\nif (!amazonStorage.isAmazonCheckout()) {\nreturn Component;\n}\n+ var self;\n+ var editSelector = '.edit-address-link';\n+\nreturn Component.extend({\ndefaults: {\ntemplate: {\n@@ -56,6 +56,8 @@ define([\n/**\n* Edit address (using amazon.Pay.bindChangeAction).\n*/\n- editAddress: function () { }\n+ editAddress: function () {\n+ }\n});\n+ }\n});\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/js/view/shipping-address/list.js","new_path":"view/frontend/web/js/view/shipping-address/list.js","diff":"define([\n- 'Magento_Checkout/js/view/shipping-address/list',\n'Magento_Customer/js/model/address-list',\n- 'Amazon_Pay/js/model/storage',\n- 'ko'\n-], function (Component, addressList, amazonStorage, ko) {\n+ 'Amazon_Pay/js/model/storage'\n+], function (addressList, amazonStorage) {\n'use strict';\n- if (!amazonStorage.isAmazonCheckout()) {\n+ return function(Component) {\n+ if (!amazonStorage.isEnabled || !amazonStorage.isAmazonCheckout()) {\nreturn Component;\n}\n@@ -20,15 +19,12 @@ define([\nreturn this;\n},\n- /**\n- * @param {Object} address\n- * @param {*} index\n- */\ncreateRendererComponent: function (address, index) {\nif (address.getType() === 'new-customer-address') {\n// Only display one address from Amazon\n- this._super();\n+ return this._super();\n}\n}\n});\n+ }\n});\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/js/view/shipping.js","new_path":"view/frontend/web/js/view/shipping.js","diff":"define(\n[\n'jquery',\n- 'Magento_Checkout/js/view/shipping',\n'Amazon_Pay/js/model/storage'\n],\nfunction (\n$,\n- Component,\namazonStorage\n) {\n'use strict';\n+ return function(Component) {\n+ if (!amazonStorage.isAmazonCheckout()) {\n+ return Component;\n+ }\n+\nreturn Component.extend({\n/**\n@@ -19,9 +22,7 @@ define(\n*/\ninitialize: function () {\nthis._super();\n- if (amazonStorage.isAmazonCheckout()) {\nthis.isNewAddressAdded(true);\n- }\nreturn this;\n},\n@@ -37,4 +38,5 @@ define(\n}\n});\n}\n+ }\n);\n"},{"change_type":"MODIFY","old_path":"view/frontend/web/template/form/element/email.html","new_path":"view/frontend/web/template/form/element/email.html","diff":"* permissions and limitations under the License.\n*/\n-->\n+\n\n\n\nmethod=\"post\">\n