From 8a86c97ec523218685786195305cb4fe83ee0cbd Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 13 Jul 2024 11:54:47 +0200 Subject: [PATCH 01/10] add newsletter subscribe form widget --- .../Newsletter/Block/Widget/Subscribe.php | 31 +++++++++++++++ app/code/core/Mage/Newsletter/etc/widget.xml | 38 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php create mode 100644 app/code/core/Mage/Newsletter/etc/widget.xml diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php new file mode 100644 index 00000000000..0312153fac1 --- /dev/null +++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php @@ -0,0 +1,31 @@ + + + + + Newsletter Subscribe Form + Newsletter Subscribe Form + 0 + + + + + From cf01dc544e44ae8590cef7ab5234d29011694f4e Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 13 Jul 2024 12:09:32 +0200 Subject: [PATCH 02/10] add translation --- app/locale/en_US/Mage_Newsletter.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv index d1e8841114e..292518970cb 100644 --- a/app/locale/en_US/Mage_Newsletter.csv +++ b/app/locale/en_US/Mage_Newsletter.csv @@ -140,3 +140,4 @@ "You have been unsubscribed.","You have been unsubscribed." "Your subscription has been confirmed.","Your subscription has been confirmed." "This email address is already confirmed.","This email address is already confirmed." +"Newsletter Subscribe Form","Newsletter Subscribe Form" \ No newline at end of file From 387699bfcbe89353304a95167c67ae14dd034cca Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 13 Jul 2024 12:49:44 +0200 Subject: [PATCH 03/10] fix php cs --- app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php index 0312153fac1..50b3e89e571 100644 --- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php @@ -28,4 +28,4 @@ protected function _construct() { parent::_construct(); } -} \ No newline at end of file +} From 45d8502eb10db83ea6268e130712c6e0c47e2273 Mon Sep 17 00:00:00 2001 From: Tony Date: Sun, 14 Jul 2024 11:52:32 +0200 Subject: [PATCH 04/10] update copyright --- app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 2 +- app/code/core/Mage/Newsletter/etc/widget.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php index 50b3e89e571..2868f7c30ae 100644 --- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php @@ -9,7 +9,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/etc/widget.xml b/app/code/core/Mage/Newsletter/etc/widget.xml index cdd501870f1..be7da743cda 100644 --- a/app/code/core/Mage/Newsletter/etc/widget.xml +++ b/app/code/core/Mage/Newsletter/etc/widget.xml @@ -10,7 +10,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> From edb9542c907cabc268e134e09a7d78ce25a46eb2 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 15 Jul 2024 15:44:44 +0100 Subject: [PATCH 05/10] newline at the end --- app/locale/en_US/Mage_Newsletter.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv index 292518970cb..225161af9fa 100644 --- a/app/locale/en_US/Mage_Newsletter.csv +++ b/app/locale/en_US/Mage_Newsletter.csv @@ -140,4 +140,4 @@ "You have been unsubscribed.","You have been unsubscribed." "Your subscription has been confirmed.","Your subscription has been confirmed." "This email address is already confirmed.","This email address is already confirmed." -"Newsletter Subscribe Form","Newsletter Subscribe Form" \ No newline at end of file +"Newsletter Subscribe Form","Newsletter Subscribe Form" From 2d09151c1ab6188a1af3166ee8b3621e32a3ab7d Mon Sep 17 00:00:00 2001 From: Tony Date: Wed, 17 Jul 2024 11:53:12 +0200 Subject: [PATCH 06/10] Update app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php Co-authored-by: Fabrizio Balliano --- app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php index 2868f7c30ae..3074f73a2fc 100644 --- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php @@ -24,8 +24,4 @@ */ class Mage_Newsletter_Block_Widget_Subscribe extends Mage_Newsletter_Block_Subscribe implements Mage_Widget_Block_Interface { - protected function _construct() - { - parent::_construct(); - } } From da6f8d171e4b0b6037854c9fd6479aeade09468a Mon Sep 17 00:00:00 2001 From: Tony Date: Wed, 17 Jul 2024 16:31:11 +0200 Subject: [PATCH 07/10] add stock status to children products --- app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php index db49ed16933..9ab5f2fa62f 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php @@ -432,6 +432,7 @@ public function attachChildrenProducts(array $products, $storeId) ); $collection->setFlag('product_children', true) + ->setFlag('require_stock_items', true) ->addStoreFilter($storeId) ->addAttributeToSelect($this->_getChildrenProductsAttributes()); $collection->addProductSetFilter($productIds); From 578255a0522bb3e6f4e6f5ed1867ae4294af83a1 Mon Sep 17 00:00:00 2001 From: Tony Date: Wed, 17 Jul 2024 17:03:48 +0200 Subject: [PATCH 08/10] Delete app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php --- .../Newsletter/Block/Widget/Subscribe.php | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php deleted file mode 100644 index 3074f73a2fc..00000000000 --- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php +++ /dev/null @@ -1,27 +0,0 @@ - Date: Wed, 17 Jul 2024 17:04:07 +0200 Subject: [PATCH 09/10] Delete app/code/core/Mage/Newsletter/etc/widget.xml --- app/code/core/Mage/Newsletter/etc/widget.xml | 38 -------------------- 1 file changed, 38 deletions(-) delete mode 100644 app/code/core/Mage/Newsletter/etc/widget.xml diff --git a/app/code/core/Mage/Newsletter/etc/widget.xml b/app/code/core/Mage/Newsletter/etc/widget.xml deleted file mode 100644 index be7da743cda..00000000000 --- a/app/code/core/Mage/Newsletter/etc/widget.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - Newsletter Subscribe Form - Newsletter Subscribe Form - 0 - - - - - From 37fb8c4c76a8787c14edd27febc767686ce2cfe1 Mon Sep 17 00:00:00 2001 From: Tony Date: Wed, 17 Jul 2024 17:04:21 +0200 Subject: [PATCH 10/10] Delete app/locale/en_US/Mage_Newsletter.csv --- app/locale/en_US/Mage_Newsletter.csv | 143 --------------------------- 1 file changed, 143 deletions(-) delete mode 100644 app/locale/en_US/Mage_Newsletter.csv diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv deleted file mode 100644 index 225161af9fa..00000000000 --- a/app/locale/en_US/Mage_Newsletter.csv +++ /dev/null @@ -1,143 +0,0 @@ -" Copy"," Copy" -"Important! Enabling this option means that your custom templates used for newsletter subscription must contain form_key block output. Otherwise newsletter subscription will not work.","Important! Enabling this option means that your custom templates used for newsletter subscription must contain form_key block output. Otherwise newsletter subscription will not work." -"Action","Action" -"Add New Template","Add New Template" -"Add to Queue","Add to Queue" -"Allow Guest Subscription","Allow Guest Subscription" -"An error occurred while saving your subscription.","An error occurred while saving your subscription." -"Are you sure that you want to delete this template?","Are you sure that you want to delete this template?" -"Are you sure that you want to strip all tags?","Are you sure that you want to strip all tags?" -"Back","Back" -"Cancel","Cancel" -"Cancelled","Cancelled" -"Cannot mark as received subscriber.","Cannot mark as received subscriber." -"Confirmation Email Sender","Confirmation Email Sender" -"Confirmation Email Template","Confirmation Email Template" -"Confirmation request has been sent.","Confirmation request has been sent." -"Convert to Plain Text","Convert to Plain Text" -"Create Newsletter Template","Create Newsletter Template" -"Customer","Customer" -"Customer First Name","Customer First Name" -"Customer Last Name","Customer Last Name" -"Customer Middle Name","Customer Middle Name" -"Customer My Account Newsletter Subscriptions","Customer My Account Newsletter Subscriptions" -"Date Added","Date Added" -"Date Updated","Date Updated" -"Delete","Delete" -"Delete Selected Problems","Delete Selected Problems" -"Delete Template","Delete Template" -"Do you really want to cancel the queue?","Do you really want to cancel the queue?" -"Duplicate template code.","Duplicate template code." -"Edit Newsletter","Edit Newsletter" -"Edit Newsletter Template","Edit Newsletter Template" -"Edit Queue","Edit Queue" -"Edit Template","Edit Template" -"Email","Email" -"Enable Form Key Validation","Enable Form Key Validation" -"Enter your email address","Enter your email address" -"Error Code","Error Code" -"Error Text","Error Text" -"Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}","Follow this link to unsubscribe {{var subscriber.getUnsubscriptionLink()}}" -"Guest","Guest" -"ID","ID" -"Invalid queue selected.","Invalid queue selected." -"Invalid subscription ID.","Invalid subscription ID." -"Invalid subscription confirmation code.","Invalid subscription confirmation code." -"Message","Message" -"Need to Confirm","Need to Confirm" -"New Newsletter Template","New Newsletter Template" -"New Template","New Template" -"Newsletter","Newsletter" -"Newsletter Message Preview","Newsletter Message Preview" -"Newsletter Problem Reports","Newsletter Problem Reports" -"Newsletter Queue","Newsletter Queue" -"Newsletter Sign-up:","Newsletter Sign-up:" -"Newsletter Styles","Newsletter Styles" -"Newsletter Subscribers","Newsletter Subscribers" -"Newsletter Subscription","Newsletter Subscription" -"Newsletter Subscription Form Before","Newsletter Subscription Form Before" -"Newsletter Subscriptions","Newsletter Subscriptions" -"Newsletter Templates","Newsletter Templates" -"Newsletter subscription confirmation","Newsletter subscription confirmation" -"Newsletter subscription success","Newsletter subscription success" -"Newsletter unsubscription success","Newsletter unsubscription success" -"No Templates Found","No Templates Found" -"No problems found.","No problems found." -"No subscribers selected.","No subscribers selected." -"Not Activated","Not Activated" -"Not Sent","Not Sent" -"Pause","Pause" -"Paused","Paused" -"Please enter a valid email address.","Please enter a valid email address." -"Please enter new template name","Please enter new template name" -"Please refer to exeption.log","Please refer to exeption.log" -"Please select subscriber(s)","Please select subscriber(s)" -"Preview","Preview" -"Preview Template","Preview Template" -"Processed","Processed" -"Queue Date Start","Queue Date Start" -"Queue Finish","Queue Finish" -"Queue Information","Queue Information" -"Queue Newsletter...","Queue Newsletter..." -"Queue Start","Queue Start" -"Queue Subject","Queue Subject" -"Recipients","Recipients" -"Reset","Reset" -"Resume","Resume" -"Return HTML Version","Return HTML Version" -"Save As","Save As" -"Save Newsletter","Save Newsletter" -"Save Template","Save Template" -"Save and Resume","Save and Resume" -"Security","Security" -"Selected problem subscribers have been unsubscribed.","Selected problem subscribers have been unsubscribed." -"Selected problems have been deleted.","Selected problems have been deleted." -"Sender","Sender" -"Sender Email","Sender Email" -"Sender Name","Sender Name" -"Sending","Sending" -"Sent","Sent" -"Sign Up for Our Newsletter:","Sign Up for Our Newsletter:" -"Sign up for our newsletter","Sign up for our newsletter" -"Sorry, but administrator denied subscription for guests. Please register.","Sorry, but administrator denied subscription for guests. Please register." -"Start","Start" -"Status","Status" -"Store","Store" -"Store View","Store View" -"Subject","Subject" -"Submit","Submit" -"Subscribe","Subscribe" -"Subscribed","Subscribed" -"Subscriber","Subscriber" -"Subscribers","Subscribers" -"Subscribers From","Subscribers From" -"Subscription Options","Subscription Options" -"Success Email Sender","Success Email Sender" -"Success Email Template","Success Email Template" -"Template Content","Template Content" -"Template Information","Template Information" -"Template Name","Template Name" -"Template Styles","Template Styles" -"Template Subject","Template Subject" -"Template Type","Template Type" -"Thank you for your subscription.","Thank you for your subscription." -"The subscription has been removed.","The subscription has been removed." -"The subscription has been saved.","The subscription has been saved." -"There was a problem with the subscription.","There was a problem with the subscription." -"There was a problem with the subscription: %s","There was a problem with the subscription: %s" -"There was a problem with the un-subscription.","There was a problem with the un-subscription." -"This email address is already assigned to another user.","This email address is already assigned to another user." -"This email address is already registered.","This email address is already registered." -"Type","Type" -"Unconfirmed","Unconfirmed" -"Unsubscribe","Unsubscribe" -"Unsubscribe Selected","Unsubscribe Selected" -"Unsubscribed","Unsubscribed" -"Unsubscription Email Sender","Unsubscription Email Sender" -"Unsubscription Email Template","Unsubscription Email Template" -"View Newsletter","View Newsletter" -"Website","Website" -"You have been unsubscribed.","You have been unsubscribed." -"Your subscription has been confirmed.","Your subscription has been confirmed." -"This email address is already confirmed.","This email address is already confirmed." -"Newsletter Subscribe Form","Newsletter Subscribe Form"