Prix spécifiques : correctif filtre prix dans ProductPrice

common/models/Product.php

@@ -455,18 +455,17 @@ class Product extends ActiveRecordCommon
         public function getSpecificPricesFilterByPriorityMatch($specificPrices, $user, $pointSale)
         {
             $priorityMatchSpecificPrice = ProductPrice::getPriorityMatchOfSpecificPriceArray($specificPrices, $user, $pointSale);
+            $specificPricesFilter = [];
 
-            if($priorityMatchSpecificPrice) {
-                foreach($specificPrices as $keySpecificPrice => $specificPrice) {
-                    if(!$specificPrice->$priorityMatchSpecificPrice($user, $pointSale)) {
-                        unset($specificPrices[$keySpecificPrice]);
-                    }
-                }
+            foreach($specificPrices as $keySpecificPrice => $specificPrice) {
+                if(($priorityMatchSpecificPrice && $specificPrice->$priorityMatchSpecificPrice($user, $pointSale))
+                    || $specificPrice->matchFromQuantityOnly()) {
 
-                return $specificPrices;
+                    $specificPricesFilter[] = $specificPrice;
+                }
             }
 
-            return [];
+            return $specificPricesFilter;
         }
 
         public function getPrice($params = [])

common/models/ProductPrice.php

@@ -251,4 +251,12 @@ class ProductPrice extends ActiveRecordCommon
             && $this->id_point_sale == $pointSale->id
             && $this->id_user == $user->id;
     }
+
+    public function matchFromQuantityOnly()
+    {
+        return !$this->id_user
+            && !$this->id_point_sale
+            && !$this->id_user_group
+            && $this->from_quantity;
+    }
 }