A free open source IT asset/license management system
renamed boolean, changed usage order
Godfrey M7dfefc2d6ce8
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.phpindex 90d2ed993d..907f4be738 100644--- a/app/Http/Controllers/Api/CompaniesController.php+++ b/app/Http/Controllers/Api/CompaniesController.php@@ -96,7 +96,7 @@ class CompaniesController extends Controller$companies->where('parent_id', '=', (int) $parentId);}}- if ($request->boolean('webhook_filled')) {+ if ($request->boolean('has_webhook')) {$companies->whereNotNull('webhook_endpoint')->where('webhook_endpoint', '!=', '');}diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.phpindex 461330cb23..94abe90933 100755--- a/resources/views/groups/index.blade.php+++ b/resources/views/groups/index.blade.php@@ -11,7 +11,6 @@{{-- Page content --}}@section('content')- HI<x-container><x-box name="groups" sr_only_title>diff --git a/resources/views/settings/integrations.blade.php b/resources/views/settings/integrations.blade.phpindex 3efdce9bfe..a4a15e7924 100644--- a/resources/views/settings/integrations.blade.php+++ b/resources/views/settings/integrations.blade.php@@ -36,7 +36,7 @@name="webhook_companies"fixed_right_number="1"fixed_number="1"- api_url="{{ route('api.companies.index', ['webhook_filled' => 1]) }}"+ api_url="{{ route('api.companies.index', ['has_webhook' => 1]) }}":presenter="\App\Presenters\CompanyIntegrationsPresenter::dataTableLayout()":show_export="false":show_columns="false"diff --git a/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckinTest.php b/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckinTest.phpindex 8af246aad4..5ca19fecd8 100644--- a/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckinTest.php+++ b/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckinTest.php@@ -10,6 +10,7 @@ use App\Models\Category;use App\Models\Component;use App\Models\LicenseSeat;use App\Models\Location;+use App\Models\Setting;use App\Models\User;use App\Notifications\CheckinAccessoryNotification;use App\Notifications\CheckinAssetNotification;@@ -24,7 +25,6 @@ use NotificationChannels\GoogleChat\GoogleChatMessage;use PHPUnit\Framework\Attributes\DataProvider;use PHPUnit\Framework\Attributes\Group;use Tests\TestCase;-use App\Models\Setting;#[Group('notifications')]class IntegrationNotificationsUponCheckinTest extends TestCasediff --git a/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckoutTest.php b/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckoutTest.phpindex e2395bd96e..924d71a75d 100644--- a/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckoutTest.php+++ b/tests/Feature/Notifications/Webhooks/IntegrationNotificationsUponCheckoutTest.php@@ -11,6 +11,7 @@ use App\Models\Component;use App\Models\Consumable;use App\Models\LicenseSeat;use App\Models\Location;+use App\Models\Setting;use App\Models\User;use App\Notifications\CheckoutAccessoryNotification;use App\Notifications\CheckoutAssetNotification;@@ -26,7 +27,6 @@ use PHPUnit\Framework\Attributes\Group;use Tests\TestCase;use Illuminate\Notifications\Messages\SlackMessage;use NotificationChannels\GoogleChat\GoogleChatMessage;-use App\Models\Setting;#[Group('notifications')]