Merge branch 'develop'

common/models/Product.php

@@ -242,6 +242,10 @@ class Product extends ActiveRecordCommon
 
     public function isAvailableOnPointSale($pointSale)
     {
+        if(!$pointSale) {
+            return false;
+        }
+
         // disponible par défaut
         if ($this->available_on_points_sale) {
             foreach ($this->productPointSale as $productPointSale) {

producer/views/order/order.php

@@ -184,11 +184,13 @@ $producer = $this->context->getProducer();
                                                                 if($pointSaleDistributions && count($pointSaleDistributions) > 0) {
                                                                         echo '<div class="point-sales">' ;
                                                                         foreach($pointSaleDistributions as $pointSaleDistribution) {
+                                                                            //if($pointSaleDistribution->pointSale->status == 1) {
                                                                                 echo $pointSaleDistribution->pointSale->name.'' ;
                                                                                 if(strlen($pointSaleDistribution->pointSale->locality)) {
-                                                                                        echo ' ('.$pointSaleDistribution->pointSale->locality.')' ;
+                                                                                    echo ' ('.$pointSaleDistribution->pointSale->locality.')' ;
                                                                                 }
                                                                                 echo '<br />' ;
+                                                                            //}
                                                                         }
                                                                         echo '</div>' ;
                                                                 }