|
|
@@ -605,7 +605,7 @@ class OrderController extends ProducerBaseController |
|
|
|
]); |
|
|
|
|
|
|
|
// Produits |
|
|
|
if (Producer::getConfig('option_allow_user_gift')) { |
|
|
|
/*if (Producer::getConfig('option_allow_user_gift')) { |
|
|
|
$productsArray = Product::find() |
|
|
|
->orWhere(['id_producer' => $this->getProducer()->id,]) |
|
|
|
//->orWhere(['id_producer' => 0,]) // produit "Don"; |
|
|
@@ -613,13 +613,13 @@ class OrderController extends ProducerBaseController |
|
|
|
} else { |
|
|
|
$productsArray = Product::find() |
|
|
|
->where(['id_producer' => $this->getProducer()->id,]); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/*$productsArray = Product::find() |
|
|
|
$productsArray = Product::find() |
|
|
|
->where([ |
|
|
|
'id_producer' => $this->getProducer()->id, |
|
|
|
'active' => 1, |
|
|
|
]);*/ |
|
|
|
'product.active' => 1, |
|
|
|
]); |
|
|
|
|
|
|
|
$productsArray = $productsArray->joinWith(['productDistribution' => function ($query) use ($distribution) { |
|
|
|
$query->andOnCondition('product_distribution.id_distribution = ' . $distribution->id); |