Merge pull request #17 from lopes-vincent/master

Fix when purchase price is null
thelia-modules · Dec 20, 2019 · a56d3b5 · a56d3b5
2 parents 69c0718 + e426b87
commit a56d3b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -7,7 +7,7 @@
     <descriptive locale="fr_FR">
         <title>Famille de clients et prix d'achat</title>
     </descriptive>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <author>
         <name>Guillaume Barral / Etienne Perriere</name>
         <email>gbarral@openstudio.fr / eperriere@openstudio.fr</email>

diff --git a/LoopExtend/BaseCustomerFamilyLoopExtend.php b/LoopExtend/BaseCustomerFamilyLoopExtend.php
@@ -19,6 +19,10 @@ public function getCustomerFamily()
     {
         $currentCustomer = $this->securityContext->getCustomerUser();
 
+        if (null === $currentCustomer) {
+            return null;
+        }
+
         $customerFamily = CustomerFamilyQuery::create()
             ->useCustomerCustomerFamilyQuery()
                 ->filterByCustomerId($currentCustomer->getId())

diff --git a/Service/CustomerFamilyService.php b/Service/CustomerFamilyService.php
@@ -96,12 +96,12 @@ public function getPseProductPrice($pseId, $currencyId)
     public function getPurchasePrice($pseId, $currencyId)
     {
         $mode = CustomerFamily::getConfigValue('customer_family_price_mode', 0);
-        if($mode == 1){
+        if ($mode == 1) {
             $pseProductPrice = $this->getPseProductPrice($pseId, $currencyId);
-            return $pseProductPrice->getPrice();
+            return $pseProductPrice !== null ? $pseProductPrice->getPrice() : null;
         }
         $pseProductPurchasePrice = $this->getPseProductPurchasePrice($pseId, $currencyId);
-        return $pseProductPurchasePrice->getPurchasePrice();
+        return $pseProductPurchasePrice !== null  ? $pseProductPurchasePrice->getPurchasePrice() : null;
     }
 
     /**