|
|
@@ -380,7 +380,6 @@ class Subscription extends ActiveRecordCommon |
|
|
|
->where('id_producer = :id_producer') |
|
|
|
->andWhere('date >= :date_begin') |
|
|
|
->andWhere('date >= :date_earliest_order'); |
|
|
|
$incomingDistributions = Distribution::filterDistributionsByDateDelay($incomingDistributions) ; |
|
|
|
|
|
|
|
if ($this->date_end) { |
|
|
|
$incomingDistributions->andWhere('date < :date_end'); |
|
|
@@ -392,6 +391,8 @@ class Subscription extends ActiveRecordCommon |
|
|
|
$incomingDistributions->params($params); |
|
|
|
$incomingDistributionsArray = $incomingDistributions->all(); |
|
|
|
|
|
|
|
$incomingDistributions = Distribution::filterDistributionsByDateDelay($incomingDistributionsArray) ; |
|
|
|
|
|
|
|
$matchedIncomingDistributionsArray = []; |
|
|
|
foreach ($incomingDistributionsArray as $incomingDistribution) { |
|
|
|
if ($this->matchWith($incomingDistribution->date)) { |