Merge pull request #59 from thelia-modules/GetCartAmountFix

Fixed Get Cart Amount on null bug
thelia-modules · Jun 25, 2018 · 4372508 · 4372508
2 parents 53dab5f + aff0948
commit 4372508
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
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.4</version>
+    <version>1.4.5</version>
     <author>
         <name>Thelia</name>
         <email>info@thelia.net</email>

diff --git a/SoColissimo.php b/SoColissimo.php
@@ -150,16 +150,20 @@ public static function getPostageAmount($areaId, $weight, $cartAmount = 0, $deli
 
             if ($deliveryModeQuery === 'dom') {
                 $cartAmountDom = SocolissimoAreaFreeshippingDomQuery::create()
-                    ->findOne()
-                    ->getCartAmount();
+                    ->findOne();
+                if ($cartAmountDom) {
+                    $cartAmountDom = $cartAmountDom->getCartAmount();
+                }
                 if (null !== $cartAmountDom && $cartAmountDom <= $cartAmount) {
                     $postage = 0;
                     return $postage;
                 }
             } elseif ($deliveryModeQuery === 'pr') {
                 $cartAmountPr = SocolissimoAreaFreeshippingPrQuery::create()
-                    ->findOne()
-                    ->getCartAmount();
+                    ->findOne();
+                if ($cartAmountPr) {
+                    $cartAmountPr = $cartAmountPr->getCartAmount();
+                }
                 if (null !== $cartAmountPr && $cartAmountPr <= $cartAmount) {
                     $postage = 0;
                     return $postage;