|
|
@@ -160,13 +160,15 @@ class DistributionController extends BackendController |
|
|
|
|
|
|
|
$potentialRevenues = 0; |
|
|
|
$potentialWeight = 0; |
|
|
|
|
|
|
|
|
|
|
|
foreach($productsArray as &$theProduct) { |
|
|
|
|
|
|
|
$quantityOrder = Order::getProductQuantity($theProduct['id'], $ordersArray) ; |
|
|
|
$theProduct['quantity_ordered'] = $quantityOrder ; |
|
|
|
|
|
|
|
if(!isset($theProduct['productDistribution'][0])) { |
|
|
|
$theProduct['productDistribution'][0] = $distribution->linkProduct($theProduct) ; |
|
|
|
$theProductObject = (object) $theProduct ; |
|
|
|
$theProduct['productDistribution'][0] = $distribution->linkProduct($theProductObject) ; |
|
|
|
} |
|
|
|
|
|
|
|
if(!is_numeric($theProduct['productDistribution'][0]['quantity_max'])) { |
|
|
@@ -200,9 +202,6 @@ class DistributionController extends BackendController |
|
|
|
] ; |
|
|
|
} |
|
|
|
|
|
|
|
/*$productOrderArray = \yii\helpers\ArrayHelper::map($order->productOrder, 'id_product', 'quantity') ; |
|
|
|
*/ |
|
|
|
|
|
|
|
foreach($productsArray as $product) { |
|
|
|
if(!isset($productOrderArray[$product['id']])) { |
|
|
|
$productOrderArray[$product['id']] = [ |