Newsletter subscription with ajax

core/lib/Thelia/Config/Resources/config.xml

@@ -63,6 +63,7 @@
         <form name="thelia.front.address.create" class="Thelia\Form\AddressCreateForm"/>
         <form name="thelia.front.address.update" class="Thelia\Form\AddressUpdateForm"/>
         <form name="thelia.front.contact" class="Thelia\Form\ContactForm"/>
+        <form name="thelia.front.newsletter" class="Thelia\Form\NewsletterForm"/>
 
         <!--  Forms for Admin -->
         <form name="thelia.install.step3" class="Thelia\Form\InstallStep3Form"/>
@@ -153,8 +154,6 @@
 
         <form name="thelia.shopping_zone_area" class="Thelia\Form\ShippingZone\ShippingZoneAddArea"/>
         <form name="thelia.shopping_zone_remove_area" class="Thelia\Form\ShippingZone\ShippingZoneRemoveArea"/>
-
-        <form name="thelia.newsletter" class="Thelia\Form\NewsletterForm"/>
     </forms>
 
 

core/lib/Thelia/Config/Resources/routing/front.xml

@@ -207,10 +207,5 @@
         <default key="_view">newsletter</default>
     </route>
 
-    <route id="newsletter.success" path="/newsletter/success">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
-        <default key="_view">newsletter-success</default>
-    </route>
-
     <!-- end newsletter management -->
 </routes>

core/lib/Thelia/Controller/Front/NewsletterController.php

@@ -62,17 +62,32 @@ class NewsletterController extends BaseFrontController
             $error_message = $e->getMessage();
         }
 
-        if($error_message !== false) {
-            \Thelia\Log\Tlog::getInstance()->error(sprintf('Error during newsletter subscription : %s', $error_message));
+        \Thelia\Log\Tlog::getInstance()->error(sprintf('Error during newsletter subscription : %s', $error_message));
 
+        // If Ajax Request
+        if ($this->getRequest()->isXmlHttpRequest()) {
+            if ($error_message) {
+                $response = $this->jsonResponse(json_encode(array(
+                            "success" => false,
+                            "message" => $error_message
+                        )));
+            } else {
+                $response = $this->jsonResponse(json_encode(array(
+                            "success" => true,
+                            "message" => "Thanks for signing up! We'll keep you posted whenever we have any new updates."
+                        )));;
+            }
+
+            return $response;
+
+        } else {
             $newsletterForm->setErrorMessage($error_message);
 
             $this->getParserContext()
                 ->addForm($newsletterForm)
                 ->setGeneralError($error_message)
             ;
-        } else {
-            $this->redirectToRoute('newsletter.success');
         }
+
     }
 }

core/lib/Thelia/Form/NewsletterForm.php

@@ -73,7 +73,7 @@ class NewsletterForm extends BaseForm
                         )
                     ))
                 ),
-                'label' => Translator::getInstance()->trans('email'),
+                'label' => Translator::getInstance()->trans('Email address'),
                 'label_attr' => array(
                     'for' => 'email_newsletter'
                 )
@@ -84,7 +84,7 @@ class NewsletterForm extends BaseForm
     {
         $customer = NewsletterQuery::create()->findOneByEmail($value);
         if ($customer) {
-            $context->addViolation("This email already exists");
+            $context->addViolation("You are already subscribed!");
         }
     }