Merge pull request #60 from Lurivar/fix/mailIssue

Fixed crash when mail_socolissimo isn't created
thelia-modules · Jun 28, 2018 · 7f17680 · 7f17680
2 parents 4372508 + 79e0277
commit 7f17680
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.4.6
+- Displays an arror message instead of crashing when "mail_socolissimo" isn't created, thus allowing to not send any confirmation email.
+
+# 1.4.5
+- Fixed crash when using getCartAmount while cartAmount is null
+
 # 1.4.4
 - create loops: AreaFreeshippingDom and AreaFreeshippingPr
 - update template for to add these loops 

diff --git a/Config/module.xml b/Config/module.xml
@@ -7,7 +7,7 @@
     <descriptive locale="fr_FR">
         <title>So Colissimo</title>
     </descriptive>
-    <version>1.4.5</version>
+    <version>1.4.6</version>
     <author>
         <name>Thelia</name>
         <email>[email protected]</email>

diff --git a/Listener/SendMail.php b/Listener/SendMail.php
@@ -64,7 +64,7 @@ public function updateStatus(OrderEvent $event)
                     ->filterByName('mail_socolissimo')
                     ->findOne();
 
-                if (false === $message) {
+                if (false === $message || null === $message) {
                     throw new \Exception("Failed to load message 'order_confirmation'.");
                 }