Merge pull request PrestaShop#77 from PrestaShop/dev

Release v2.6.1

Author: Progi1984

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev

README.md

@@ -1,8 +1,13 @@
 # E-mail subscription form
 
+[![Build Status](https://travis-ci.com/PrestaShop/ps_emailsubscription.svg?branch=master)](https://travis-ci.com/PrestaShop/ps_emailsubscription)
+[![Latest Stable Version](https://poser.pugx.org/PrestaShop/ps_emailsubscription/v)](//packagist.org/packages/PrestaShop/ps_emailsubscription)
+[![Total Downloads](https://poser.pugx.org/PrestaShop/ps_emailsubscription/downloads)](//packagist.org/packages/PrestaShop/ps_emailsubscription)
+[![GitHub license](https://img.shields.io/github/license/PrestaShop/ps_emailsubscription)](https://github.com/PrestaShop/ps_emailsubscription/LICENSE.md)
+
 ## About
 
-Adds a block for newsletter subscription.
+Keep in touch with your customers the way you want, add a form to the homepage of your store and allow all the curious to subscribe to your newsletter.
 
 ## Multistore compatibility
 

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_emailsubscription</name>
     <displayName><![CDATA[E-mail subscription form]]></displayName>
-    <version><![CDATA[2.6.0]]></version>
+    <version><![CDATA[2.6.1]]></version>
     <description><![CDATA[Adds a block for newsletter subscription.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <confirmUninstall><![CDATA[Are you sure that you want to delete all of your contacts?]]></confirmUninstall>

logo.png

@@ -64,13 +64,13 @@ public function __construct(EntityManager $entity_manager)
         parent::__construct();
 
         $this->displayName = $this->trans('Newsletter subscription', array(), 'Modules.Emailsubscription.Admin');
-        $this->description = $this->trans('Adds a form for newsletter subscription.', array(), 'Modules.Emailsubscription.Admin');
+        $this->description = $this->trans('Keep in touch with your customers the way you want, add a form to the homepage of your store and allow all the curious to subscribe to your newsletter.', array(), 'Modules.Emailsubscription.Admin');
         $this->confirmUninstall = $this->trans('Are you sure that you want to delete all of your contacts?', array(), 'Modules.Emailsubscription.Admin');
         $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
 
         $this->entity_manager = $entity_manager;
 
-        $this->version = '2.6.0';
+        $this->version = '2.6.1';
         $this->author = 'PrestaShop';
         $this->error = false;
         $this->valid = false;
@@ -977,7 +977,9 @@ public function hookAdditionalCustomerFormFields($params)
             array(
                 '[1]' => '<br>',
                 '[2]' => '<em>',
-                '%conditions%' => Configuration::get('NW_CONDITIONS', $this->context->language->id),
+                '%conditions%' => Tools::htmlentitiesUTF8(
+                    Configuration::get('NW_CONDITIONS', $this->context->language->id)
+                ),
                 '[/2]' => '</em>',
             ),
             'Modules.Emailsubscription.Shop'
@@ -1119,7 +1121,7 @@ public function renderExportForm()
                         'hint' => $this->trans('Customers can subscribe to your newsletter when registering, or by entering their email in the newsletter form.', array(), 'Modules.Emailsubscription.Admin'),
                         'name' => 'SUSCRIBERS',
                         'required' => false,
-                        'default_value' => (int) $this->context->country->id,
+                        'default_value' => 1,
                         'options' => array(
                             'query' => array(
                                 array('id' => 0, 'name' => $this->trans('All subscribers', array(), 'Modules.Emailsubscription.Admin')),
@@ -1138,7 +1140,7 @@ public function renderExportForm()
                         'hint' => $this->trans('Partner offers subscribers have agreed to receive your partners\' offers.', array(), 'Modules.Emailsubscription.Admin'),
                         'name' => 'OPTIN',
                         'required' => false,
-                        'default_value' => (int) $this->context->country->id,
+                        'default_value' => 1,
                         'options' => array(
                             'query' => array(
                                 array('id' => 0, 'name' => $this->trans('All customers', array(), 'Modules.Emailsubscription.Admin')),
@@ -1169,7 +1171,6 @@ public function renderExportForm()
         $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT'));
         $helper->default_form_language = $lang->id;
         $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $helper->id = (int) Tools::getValue('id_carrier');
         $helper->identifier = $this->identifier;
         $helper->submit_action = 'btnSubmit';
         $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false) . '&configure=' . $this->name . '&tab_module=' . $this->tab . '&module_name=' . $this->name;
@@ -1444,7 +1445,7 @@ public function hookActionExportGDPRData($customer)
     {
         if (!Tools::isEmpty($customer['email']) && Validate::isEmail($customer['email'])) {
             $sql = 'SELECT * FROM ' . _DB_PREFIX_ . "emailsubscription WHERE email = '" . pSQL($customer['email']) . "'";
-            if ($res = Db::getInstance()->ExecuteS($sql)) {
+            if ($res = Db::getInstance()->executeS($sql)) {
                 return json_encode($res);
             }
 

ps_emailsubscription.php

@@ -32,7 +32,7 @@
   </p>
 
   {if $variables.conditions}
-    <p>{$variables.conditions nofilter}</p>
+    <p>{$variables.conditions}</p>
   {/if}
 
 {/block}

views/templates/front/subscription_execution.tpl

@@ -29,9 +29,9 @@
     <p class="notification {if $nw_error}notification-error{else}notification-success{/if}">{$msg}</p>
   {/if}
   <form action="{$urls.current_url}#blockEmailSubscription_{$hookName}" method="post">
-    <input type="text" name="email" value="{$value}" placeholder="{l s='Your e-mail' d='Modules.Emailsubscription.Shop'}" />
+    <input type="email" name="email" value="{$value}" placeholder="{l s='Your e-mail' d='Modules.Emailsubscription.Shop'}" required />
     {if $conditions}
-      <p>{$conditions nofilter}</p>
+      <p>{$conditions}</p>
     {/if}
     {hook h='displayNewsletterRegistration'}
     <input type="hidden" name="blockHookName" value="{$hookName}" />

views/templates/hook/ps_emailsubscription-column.tpl

@@ -29,9 +29,9 @@
     <p class="notification {if $nw_error}notification-error{else}notification-success{/if}">{$msg}</p>
   {/if}
   <form action="{$urls.current_url}#blockEmailSubscription_{$hookName}" method="post">
-    <input type="text" name="email" value="{$value}" placeholder="{l s='Your e-mail' d='Modules.Emailsubscription.Shop'}" />
+    <input type="email" name="email" value="{$value}" placeholder="{l s='Your e-mail' d='Modules.Emailsubscription.Shop'}" required />
     {if $conditions}
-      <p>{$conditions nofilter}</p>
+      <p>{$conditions}</p>
     {/if}
     {hook h='displayNewsletterRegistration'}
     <input type="hidden" value="{$hookName}" name="blockHookName" />