MC-3695: Remove Newsletter

- remove newsletter template

Author: krissyhiserote

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Newsletter.php

@@ -44,12 +44,26 @@ public function render(array $itemData, array $additionalData = []) : string
         }
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
-        $newsletterClasses = $eavData['css_classes'] ?? '';
-        $newsletterButtonText = $eavData['button_text'] ?? '';
-        $newsletterLabel = $eavData['label'] ?? '';
-        $newsletterTitle = $eavData['title'] ?? '';
-        $newsletterPlaceHolder = $eavData['placeholder'] ?? '';
+        $rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
+        $rootElementHtml .= $this->getNewsletterHtml($itemData, $eavData) . '</div>';
+
+        return $rootElementHtml;
+    }
 
+    /**
+     * get the html for the newsletter
+     *
+     * @param array $itemData
+     * @param array $eavData
+     * @return string
+     */
+    private function getNewsletterHtml(array $itemData, array $eavData): string
+    {
+        $newsletterButtonText = $eavData['button_text'] ?? __('Subscribe');
+        $newsletterLabel = $eavData['label'] ?? __('Sign Up for Our Newsletter:');
+        $newsletterTitle = $eavData['title'] ?? __('Newsletter');
+        $newsletterPlaceHolder = $eavData['placeholder'] ?? __('Enter your email address');
+        $newsletterClasses = $eavData['css_classes'] ?? '';
         $newsletterStyles = '';
         if (isset($itemData['formData'])) {
             $justifyContent = '';
@@ -69,18 +83,29 @@ public function render(array $itemData, array $additionalData = []) : string
             }
         }
 
-        $newsletterHtml = "{{block class=\"Magento\Newsletter\Block\Subscribe\" " .
-            "template=\"Magento_PageBuilder::content_type/newsletter.phtml\" " .
-            "placeholder=\"$newsletterPlaceHolder\" " .
-            "classes=\"$newsletterClasses\" " .
-            "styles=\"$newsletterStyles\" " .
-            "button_text=\"$newsletterButtonText\" " .
-            "label_text=\"$newsletterLabel\" " .
-            "title=\"$newsletterTitle\"}}";
+        $newsletterHtml = '<div class="' . $newsletterClasses . '" style="' . $newsletterStyles . '">' .
+            '<div class="block newsletter"><div class="title"><strong>' . $newsletterTitle . '</strong></div>' .
+            '<div class="content">' .
+            '<form class="form subscribe" novalidate method="post" ' .
+                   'action="{{store direct_url=\'newsletter/subscriber/new\' _secure=1}}" ' .
+                   'data-mage-init=\'{"validation": {"errorClass": "mage-error"}}\'>' .
+            '<div class="field newsletter">' .
+            '<label class="label" for="newsletter-' . $itemData['entityId'] . '">' .
+            '<span>' . $newsletterLabel . '</span>'.
+            '</label>' .
+            '<div class="control">' .
+            '<input name="email" type="email" id="newsletter-' . $itemData['entityId'] . '" '.
+                    'placeholder="' . $newsletterPlaceHolder . '" ' .
+                    'data-mage-init=\'{"mage/trim-input":{}}\' ' .
+                    'data-validate="{required:true, \'validate-email\':true}"/>' .
+            '</div></div>' .
+            '<div class="actions">' .
+            '<button class="action subscribe primary" title="' . $newsletterButtonText . '" type="submit">' .
+            '<span>' . $newsletterButtonText . '</span>' .
+            '</button>' .
+            '</div></form></div></div></div>';
 
-        $rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
-        $rootElementHtml .= $newsletterHtml . '</div>';
 
-        return $rootElementHtml;
+        return $newsletterHtml;
     }
 }

app/code/Magento/PageBuilder/view/frontend/templates/content_type/newsletter.phtml

@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="html" data-appearance="default">{{block class="Magento\Newsletter\Block\Subscribe" template="Magento_PageBuilder::content_type/newsletter.phtml" placeholder="Placeholder" classes="newsletter-one newsletter-two" styles="display: flex; margin: 5px 5px 5px 5px; padding: 1px 1px 1px 1px; justify-content: center;" button_text="Button Text" label_text="Label" title="Title"}}</div></div></div>
+<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="html" data-appearance="default"><div class="newsletter-one newsletter-two" style="display: flex; margin: 5px 5px 5px 5px; padding: 1px 1px 1px 1px; justify-content: center;"><div class="block newsletter"><div class="title"><strong>Title</strong></div><div class="content"><form class="form subscribe" novalidate method="post" action="{{store direct_url='newsletter/subscriber/new' _secure=1}}" data-mage-init='{"validation": {"errorClass": "mage-error"}}'><div class="field newsletter"><label class="label" for="newsletter-1"><span>Label</span></label><div class="control"><input name="email" type="email" id="newsletter-1" placeholder="Placeholder" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}"/></div></div><div class="actions"><button class="action subscribe primary" title="Button Text" type="submit"><span>Button Text</span></button></div></form></div></div></div></div></div></div>