Merge pull request #107 from PrestaShop/dev

Release version 2.8.1
PrestaShop · Jan 11, 2024 · 9fe6e33 · 9fe6e33
2 parents 5af0bf4 + 5aff277
commit 9fe6e33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_emailsubscription</name>
     <displayName><![CDATA[E-mail subscription form]]></displayName>
-    <version><![CDATA[2.8.0]]></version>
+    <version><![CDATA[2.8.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>

diff --git a/ps_emailsubscription.php b/ps_emailsubscription.php
@@ -100,7 +100,7 @@ public function __construct()
         $this->confirmUninstall = $this->trans('Are you sure that you want to delete all of your contacts?', [], 'Modules.Emailsubscription.Admin');
         $this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
 
-        $this->version = '2.8.0';
+        $this->version = '2.8.1';
         $this->author = 'PrestaShop';
         $this->error = false;
         $this->valid = false;
@@ -153,8 +153,8 @@ public function install()
             $conditions[(int) $lang['id_lang']] = $this->getConditionFixtures($lang);
         }
         Configuration::updateValue('NW_CONDITIONS', $conditions, true);
-        Configuration::updateValue('NW_VERIFICATION_EMAIL', false);
-        Configuration::updateValue('NW_CONFIRMATION_EMAIL', false);
+        Configuration::updateValue('NW_VERIFICATION_EMAIL', 0);
+        Configuration::updateValue('NW_CONFIRMATION_EMAIL', 0);
         Configuration::updateValue('NW_VOUCHER_CODE', '');
 
         return Db::getInstance()->execute('
@@ -206,8 +206,8 @@ public function uninstallPrestaShop16Module()
     public function getContent()
     {
         if (Tools::isSubmit('submitUpdate')) {
-            Configuration::updateValue('NW_CONFIRMATION_EMAIL', (bool) Tools::getValue('NW_CONFIRMATION_EMAIL'));
-            Configuration::updateValue('NW_VERIFICATION_EMAIL', (bool) Tools::getValue('NW_VERIFICATION_EMAIL'));
+            Configuration::updateValue('NW_CONFIRMATION_EMAIL', (int) Tools::getValue('NW_CONFIRMATION_EMAIL'));
+            Configuration::updateValue('NW_VERIFICATION_EMAIL', (int) Tools::getValue('NW_VERIFICATION_EMAIL'));
 
             $conditions = [];
             $languages = Language::getLanguages(false);

diff --git a/upgrade/install-1-1.php → upgrade/install-1.1.0.php b/upgrade/install-1-1.php → upgrade/install-1.1.0.php
@@ -27,7 +27,7 @@
     exit;
 }
 
-function upgrade_module_1_1($module)
+function upgrade_module_1_1_0($module)
 {
     $hook_to_remove_id = Hook::getIdByName('displayAfterBodyOpeningTag');
     if ($hook_to_remove_id) {

diff --git a/upgrade/upgrade-2-3-0.php → upgrade/upgrade-2.3.0.php b/upgrade/upgrade-2-3-0.php → upgrade/upgrade-2.3.0.php