From ba8d32b96ea3af2794ec54be4e56241647461b5e Mon Sep 17 00:00:00 2001
From: Vladimir Malik <vladimir@convert.no>
Date: Thu, 27 May 2021 11:47:01 +0300
Subject: [PATCH 1/4] use schema location instead relative path

---
 etc/adminhtml/events.xml | 2 +-
 etc/frontend/events.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml
index 2fc902c2..861e4426 100644
--- a/etc/adminhtml/events.xml
+++ b/etc/adminhtml/events.xml
@@ -1,4 +1,4 @@
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/events.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="config_data_save_before">
         <observer name="klaviyo_reclaim" instance="Klaviyo\Reclaim\Observer\PrivateApiKeyObserver" />
     </event>
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
index 71d2e38f..2f235b69 100644
--- a/etc/frontend/events.xml
+++ b/etc/frontend/events.xml
@@ -1,4 +1,4 @@
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/events.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="controller_action_postdispatch_newsletter_subscriber_new">
         <observer name="klaviyo_reclaim" instance="Klaviyo\Reclaim\Observer\NewsletterSubscribeObserver" />
     </event>

From 6ad42ef3be35646d0987048fdc87918467f6d677 Mon Sep 17 00:00:00 2001
From: Vladimir Malik <vladimir@convert.no>
Date: Thu, 27 May 2021 11:48:13 +0300
Subject: [PATCH 2/4] Added translations for comments. Made translatable
 default option.

---
 Model/Config/Source/ListOptions.php |  2 +-
 etc/adminhtml/system.xml            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Model/Config/Source/ListOptions.php b/Model/Config/Source/ListOptions.php
index 6d57ae63..248ad3c2 100644
--- a/Model/Config/Source/ListOptions.php
+++ b/Model/Config/Source/ListOptions.php
@@ -53,7 +53,7 @@ public function toOptionArray()
         }, $result['lists']);
 
         $default_value = [
-            self::LABEL => 'Select a list...',
+            self::LABEL => __('Select a list...'),
             self::VALUE => 0
         ];
         array_unshift($options, $default_value);
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index f539a6ad..51554a52 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -26,7 +26,7 @@
                     <label>Custom Media URL</label>
                     <validate>validate-url</validate>
                 </field>
-                <field id="logger" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="logger" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Klaviyo Logger</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Log file is located under the standard log directory for your Magento app install. By default this will be {magento-root-directory}/var/log/klaviyo.log</comment>
@@ -46,7 +46,7 @@
                     <source_model>Klaviyo\Reclaim\Model\Config\Source\ListOptions</source_model>
                     <frontend_model>Klaviyo\Reclaim\Block\System\Config\Form\Field\Newsletter</frontend_model>
                 </field>
-                <field id="using_klaviyo_list_opt_in" translate="label" type="radios" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="using_klaviyo_list_opt_in" translate="label comment" type="radios" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use Klaviyo Opt-In Settings For This List?</label>
                     <source_model>Klaviyo\Reclaim\Model\Config\Source\Radiobtn</source_model>
                     <comment>NOTE: There is a separate Magento opt-in setting for this list that can also send opt-in emails</comment>
@@ -60,7 +60,7 @@
             <resource>Klaviyo_Reclaim::klaviyo_reclaim</resource>
             <group id="email_consent" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email</label>
-                <field id="is_active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="is_active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Subscribe contacts to email marketing at checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Adds a checkbox to the checkout page for email opt in</comment>
@@ -91,7 +91,7 @@
             </group>
             <group id="sms_consent" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>SMS</label>
-                <field id="is_active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="is_active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Subscribe contacts to SMS marketing at checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Adds a checkbox to the checkout page for SMS opt in. <a target="_blank" href="https://help.klaviyo.com/hc/en-us/articles/360039190611-On-Demand-Training-Getting-Started-with-Klaviyo-SMS">Set up SMS in Klaviyo</a>]]></comment>
@@ -158,7 +158,7 @@
                     <label>Webhook Secret</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="using_product_delete_before_webhook" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="using_product_delete_before_webhook" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use Product Delete Webhook?</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>This will remove deleted products from the Klaviyo catalog.</comment>

From af3fd240ba0d6382e6280b2abc2fe60badb19b50 Mon Sep 17 00:00:00 2001
From: Vladimir Malik <vladimir@convert.no>
Date: Thu, 27 May 2021 11:49:55 +0300
Subject: [PATCH 3/4] Use $block instead $this. Shortcut instead echo. Added
 module name - for proper overriding template in theme.

---
 view/frontend/layout/catalog_product_view.xml      | 2 +-
 view/frontend/layout/default.xml                   | 2 +-
 view/frontend/templates/analytics/initialize.phtml | 6 +++---
 view/frontend/templates/checkout/cart.phtml        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index 52ba5b05..cba079a3 100644
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -1,7 +1,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="product.info.main">
-            <block name="klaviyo_reclaim.viewedproduct" class="Klaviyo\Reclaim\Block\Catalog\Product\ViewedProduct" before="-" template="product/viewed.phtml" />
+            <block name="klaviyo_reclaim.viewedproduct" class="Klaviyo\Reclaim\Block\Catalog\Product\ViewedProduct" before="-" template="Klaviyo_Reclaim::product/viewed.phtml" />
         </referenceContainer>
     </body>
 </page>
\ No newline at end of file
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 3a24151e..1417e870 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -1,7 +1,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="header.container">
-            <block class="Klaviyo\Reclaim\Block\Initialize" template="analytics/initialize.phtml" />
+            <block class="Klaviyo\Reclaim\Block\Initialize" template="Klaviyo_Reclaim::analytics/initialize.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/templates/analytics/initialize.phtml b/view/frontend/templates/analytics/initialize.phtml
index 634f183f..a6b76d95 100644
--- a/view/frontend/templates/analytics/initialize.phtml
+++ b/view/frontend/templates/analytics/initialize.phtml
@@ -1,7 +1,7 @@
-<?php $klaviyoKey = $this->getPublicApiKey(); ?>
-<?php if ( $this->isKlaviyoEnabled() && $klaviyoKey ): ?>
+<?php $klaviyoKey = $block->getPublicApiKey(); ?>
+<?php if ( $block->isKlaviyoEnabled() && $klaviyoKey ): ?>
 <script type="application/javascript" async 
- src="https://static.klaviyo.com/onsite/js/klaviyo.js?company_id=<?php echo $klaviyoKey; ?>"></script>
+ src="https://static.klaviyo.com/onsite/js/klaviyo.js?company_id=<?= $klaviyoKey; ?>"></script>
 
     <script type="text/x-magento-init">
         {
diff --git a/view/frontend/templates/checkout/cart.phtml b/view/frontend/templates/checkout/cart.phtml
index 41fe2a2d..c9b0763d 100644
--- a/view/frontend/templates/checkout/cart.phtml
+++ b/view/frontend/templates/checkout/cart.phtml
@@ -1,4 +1,4 @@
-<?php if ( $this->isKlaviyoEnabled() && $this->getPublicApiKey() ): ?>
+<?php if ( $block->isKlaviyoEnabled() && $block->getPublicApiKey() ): ?>
     <script>
         require([
            'jquery'

From e0c261618f0d91e1c9620663de6936254e81017c Mon Sep 17 00:00:00 2001
From: Vladimir Malik <vladimir@convert.no>
Date: Mon, 4 Oct 2021 09:52:47 +0300
Subject: [PATCH 4/4] remove obsolete file: no present in new versions.

---
 etc/frontend/events.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 etc/frontend/events.xml

diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
deleted file mode 100644
index 2f235b69..00000000
--- a/etc/frontend/events.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="controller_action_postdispatch_newsletter_subscriber_new">
-        <observer name="klaviyo_reclaim" instance="Klaviyo\Reclaim\Observer\NewsletterSubscribeObserver" />
-    </event>
-    <event name="newsletter_subscriber_save_commit_after">
-        <observer name="klaviyo_reclaim" instance="Klaviyo\Reclaim\Observer\UserProfileNewsletterSubscribeObserver" />
-    </event>
-</config>