浏览代码

Merge branch 'dev'

prodstable
Guillaume 4 年前
父节点
当前提交
a2870a3520
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. +2
    -1
      common/models/Subscription.php

+ 2
- 1
common/models/Subscription.php 查看文件

@@ -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)) {

正在加载...
取消
保存