Merge pull request #79 from PrestaShop/dev

Release 2.2.2
PrestaShop · Mar 16, 2021 · 7ced3b6 · 7ced3b6
2 parents 2e52395 + ca551db
commit 7ced3b6
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 55 deletions.
diff --git a/MailAlert.php b/MailAlert.php
@@ -197,6 +197,9 @@ public static function sendCustomerAlert($id_product, $id_product_attribute)
             }
 
             $iso = Language::getIsoById($id_lang);
+            $locale = Language::getLocaleByIso($iso);
+
+            $translator = Context::getContext()->getTranslatorFromLocale($locale);
 
             if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.txt') &&
                 file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.html')) {
@@ -205,7 +208,7 @@ public static function sendCustomerAlert($id_product, $id_product_attribute)
                     Mail::Send(
                         $id_lang,
                         'customer_qty',
-                        Mail::l('Product available', $id_lang),
+                        $translator->trans('Product available', array(), 'Emails.Subject', $locale),
                         $template_vars,
                         (string) $customer_email,
                         null,

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## About
 
-Sends e-mail notifications to customers and merchants regarding stock and order modifications.
+Make your everyday life easier, handle mail alerts about stock and orders, addressed to you as well as your customers.
 
 ## Multistore compatibility
 

diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>ps_emailalerts</name>
 	<displayName><![CDATA[Mail alerts]]></displayName>
-	<version><![CDATA[2.2.1]]></version>
+	<version><![CDATA[2.2.2]]></version>
 	<description><![CDATA[Sends e-mail notifications to customers and merchants regarding stock and order modifications.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[administration]]></tab>

diff --git a/controllers/front/actions.php b/controllers/front/actions.php
@@ -70,7 +70,7 @@ public function processRemove()
         $context = Context::getContext();
         if (MailAlert::deleteAlert(
             (int) $context->customer->id,
-            (int) $context->customer->email,
+            (string) $context->customer->email,
             (int) $product->id,
             (int) $this->id_product_attribute,
             (int) $context->shop->id

diff --git a/logo.png b/logo.png
diff --git a/ps_emailalerts.php b/ps_emailalerts.php
diff --git a/views/templates/front/mailalerts-account.tpl b/views/templates/front/mailalerts-account.tpl
@@ -25,7 +25,7 @@
 {extends file='customer/page.tpl'}
 
 {block name='page_title'}
-  {l s='My alerts' d='Modules.Mailalerts.Shop'}
+  {l s='My alerts' d='Modules.Emailalerts.Shop'}
 {/block}
 
 {block name='page_content'}
@@ -36,6 +36,6 @@
       {/foreach}
     </ul>
   {else}
-    <p class="alert alert-warning">{l s='No mail alerts yet.' d='Modules.Mailalerts.Shop'}</p>
+    <p class="alert alert-warning">{l s='No mail alerts yet.' d='Modules.Emailalerts.Shop'}</p>
   {/if}
 {/block}
diff --git a/views/templates/hook/my-account-footer.tpl b/views/templates/hook/my-account-footer.tpl
@@ -24,5 +24,5 @@
 *}
 
 <li>
-  <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Mailalerts.Shop'}</a>
+  <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Emailalerts.Shop'}</a>
 </li>
diff --git a/views/templates/hook/my-account.tpl b/views/templates/hook/my-account.tpl
@@ -24,5 +24,5 @@
 *}
 
 <li>
-  <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Mailalerts.Shop'}</a>
+  <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Emailalerts.Shop'}</a>
 </li>
diff --git a/views/templates/hook/product.tpl b/views/templates/hook/product.tpl
@@ -27,14 +27,14 @@
     <form>
         <div class="js-mailalert" style="text-align:center;" data-url="{url entity='module' name='ps_emailalerts' controller='actions' params=['process' => 'add']}">
             {if isset($email) AND $email}
-                <input class="form-control" type="email" placeholder="{l s='[email protected]' d='Modules.Mailalerts.Shop'}"/><br />
+                <input class="form-control" type="email" placeholder="{l s='[email protected]' d='Modules.Emailalerts.Shop'}"/><br />
             {/if}
             {if isset($id_module)}
                 {hook h='displayGDPRConsent' id_module=$id_module}
             {/if}
             <input type="hidden" value="{$id_product}"/>
             <input type="hidden" value="{$id_product_attribute}"/>
-            <button class="btn btn-primary" type="submit" rel="nofollow" onclick="return addNotification();">{l s='Notify me when available' d='Modules.Mailalerts.Shop'}</button>
+            <button class="btn btn-primary" type="submit" rel="nofollow" onclick="return addNotification();">{l s='Notify me when available' d='Modules.Emailalerts.Shop'}</button>
             <span style="display:none;padding:5px"></span>
         </div>
     </form>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,5 +24,5 @@ @@
     *}
     <li>
-      <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Mailalerts.Shop'}</a>
+      <a href="{url entity='module' name='ps_emailalerts' controller='account'}">{l s='My alerts' d='Modules.Emailalerts.Shop'}</a>
     </li>