|
|
@@ -534,10 +534,17 @@ class OrderController extends ProducerBaseController |
|
|
|
]); |
|
|
|
|
|
|
|
// Produits |
|
|
|
$productsArray = Product::find() |
|
|
|
->orWhere(['id_producer' => $this->getProducer()->id,]) |
|
|
|
->orWhere(['id_producer' => 0,]) // produit "Don" |
|
|
|
->joinWith(['productDistribution' => function($query) use($distribution) { |
|
|
|
if(Producer::getConfig('option_allow_user_gift')) { |
|
|
|
$productsArray = Product::find() |
|
|
|
->orWhere(['id_producer' => $this->getProducer()->id,]) |
|
|
|
->orWhere(['id_producer' => 0,]) ; // produit "Don"; |
|
|
|
} |
|
|
|
else { |
|
|
|
$productsArray = Product::find() |
|
|
|
->where(['id_producer' => $this->getProducer()->id,]) ; |
|
|
|
} |
|
|
|
|
|
|
|
$productsArray = $productsArray->joinWith(['productDistribution' => function($query) use($distribution) { |
|
|
|
$query->andOnCondition('product_distribution.id_distribution = '.$distribution->id) ; |
|
|
|
}]) |
|
|
|
->orderBy('product_distribution.active DESC, order ASC') |