Change looking for mail waiting for downlinks() instead of children()
This commit is contained in:
parent
27956146e3
commit
a687b5fd1c
@ -1163,7 +1163,7 @@ class Address extends Model
|
|||||||
$netmails = $this
|
$netmails = $this
|
||||||
->UncollectedNetmail()
|
->UncollectedNetmail()
|
||||||
->select('netmails.id')
|
->select('netmails.id')
|
||||||
->whereIn('addresses.id',$this->children()->add($this)->pluck('id'))
|
->whereIn('addresses.id',$this->downlinks()->add($this)->pluck('id'))
|
||||||
->groupBy(['netmails.id'])
|
->groupBy(['netmails.id'])
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
@ -1185,7 +1185,7 @@ class Address extends Model
|
|||||||
->whereRaw(sprintf('(flags & %d) > 0',Message::FLAG_PKTPASSWD))
|
->whereRaw(sprintf('(flags & %d) > 0',Message::FLAG_PKTPASSWD))
|
||||||
->whereRaw(sprintf('(flags & %d) = 0',Message::FLAG_SENT))
|
->whereRaw(sprintf('(flags & %d) = 0',Message::FLAG_SENT))
|
||||||
->select('netmails.id')
|
->select('netmails.id')
|
||||||
->whereIn('addresses.id',$this->children()->add($this)->pluck('id'))
|
->whereIn('addresses.id',$this->downlinks()->add($this)->pluck('id'))
|
||||||
->groupBy(['netmails.id'])
|
->groupBy(['netmails.id'])
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user