|
|
@@ -412,20 +412,25 @@ class DistributionController extends BackendController |
|
|
|
|
|
|
|
$ordersArray = Order::searchAll([ |
|
|
|
'distribution.date' => $date, |
|
|
|
'distribution.id_producer' => $idProducer |
|
|
|
], |
|
|
|
[ |
|
|
|
'orderby' => 'user.lastname ASC, user.name ASC, comment_point_sale ASC', |
|
|
|
'conditions' => 'date_delete IS NULL' |
|
|
|
]); |
|
|
|
|
|
|
|
$distribution = Distribution::searchOne([], [ |
|
|
|
$distribution = Distribution::searchOne([ |
|
|
|
'id_producer' => $idProducer |
|
|
|
], [ |
|
|
|
'conditions' => 'date LIKE :date', |
|
|
|
'params' => [':date' => $date] |
|
|
|
]); |
|
|
|
|
|
|
|
if ($distribution) { |
|
|
|
$selectedProductsArray = ProductDistribution::searchByDistribution($distribution->id); |
|
|
|
$pointsSaleArray = PointSale::searchAll(); |
|
|
|
$pointsSaleArray = PointSale::searchAll([ |
|
|
|
'point_sale.id_producer' => $idProducer |
|
|
|
]); |
|
|
|
|
|
|
|
foreach ($pointsSaleArray as $pointSale) { |
|
|
|
$pointSale->initOrders($ordersArray); |
|
|
@@ -437,7 +442,7 @@ class DistributionController extends BackendController |
|
|
|
$q->where(['id_distribution' => $distribution->id]); |
|
|
|
}]) |
|
|
|
->where([ |
|
|
|
'id_producer' => GlobalParam::getCurrentProducerId(), |
|
|
|
'id_producer' => $idProducer, |
|
|
|
]) |
|
|
|
->orderBy('order ASC') |
|
|
|
->all(); |