archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 20:34:03 +00:00
Code Activity

Make with-pending default to config('tenancy.pending.include_in_queries') in HasTenantOptions

Browse source
This commit is contained in:
lukinovec 2022-09-30 10:19:31 +02:00
parent bd8a1aa2ce
commit 7a0eaeb007
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Concerns/HasTenantOptions.php
View file

@ -16,7 +16,7 @@ trait HasTenantOptions
{ {
return array_merge([ return array_merge([
['tenants', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_OPTIONAL, '', null], ['tenants', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_OPTIONAL, '', null],
['with-pending', null, InputOption::VALUE_NONE, 'include pending tenants in query', null], ['with-pending', null, InputOption::VALUE_OPTIONAL, 'include pending tenants in query', config('tenancy.pending.include_in_queries')],
], parent::getOptions()); ], parent::getOptions());
} }
@ -27,7 +27,7 @@ trait HasTenantOptions
->when($this->option('tenants'), function ($query) { ->when($this->option('tenants'), function ($query) {
$query->whereIn(tenancy()->model()->getTenantKeyName(), $this->option('tenants')); $query->whereIn(tenancy()->model()->getTenantKeyName(), $this->option('tenants'));
}) })
->when(! is_null($this->option('with-pending')) && tenancy()->model()::hasGlobalScope(PendingScope::class), function ($query) { ->when(tenancy()->model()::hasGlobalScope(PendingScope::class), function ($query) {
$query->withPending($this->option('with-pending')); $query->withPending($this->option('with-pending'));
}) })
->cursor(); ->cursor();