From 7a0eaeb007ba812fc1eb1d7f67e6ca77d71b1237 Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Fri, 30 Sep 2022 10:19:31 +0200
Subject: [PATCH] Make `with-pending` default to
 `config('tenancy.pending.include_in_queries')` in HasTenantOptions

---
 src/Concerns/HasTenantOptions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Concerns/HasTenantOptions.php b/src/Concerns/HasTenantOptions.php
index a9df1a0e..97300422 100644
--- a/src/Concerns/HasTenantOptions.php
+++ b/src/Concerns/HasTenantOptions.php
@@ -16,7 +16,7 @@ trait HasTenantOptions
     {
         return array_merge([
             ['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());
     }
 
@@ -27,7 +27,7 @@ trait HasTenantOptions
             ->when($this->option('tenants'), function ($query) {
                 $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'));
             })
             ->cursor();