Merge remote-tracking branch 'origin/develop' into feat/blocks-page-r…

…edesign
ArdentHQ · Sep 4, 2023 · 394da62 · 394da62
2 parents e46fd41 + b33d04a
commit 394da62
Show file tree

Hide file tree

Showing 40 changed files with 397 additions and 420 deletions.
diff --git a/.env.example b/.env.example
@@ -64,3 +64,5 @@ SCOUT_RUN_JOBS=false
 ARKSCAN_PRODUCTIVITY_DANGER=97
 ARKSCAN_PRODUCTIVITY_WARNING=99.8
 ARKSCAN_PAGINATION_PER_PAGE=25
+
+MIX_NOTIFICATIONS_DISABLED=false
diff --git a/app/Http/Livewire/Concerns/HasTableFilter.php b/app/Http/Livewire/Concerns/HasTableFilter.php
@@ -30,13 +30,13 @@ public function mountHasTableFilter(): void
     {
         foreach ($this->filter as $key => $filter) {
             if (in_array($filter, ['1', 'true', true], true)) {
-                $filter = true;
+                $this->filter[$key] = true;
             } elseif (in_array($filter, ['0', 'false', false], true)) {
-                $filter = false;
+                $this->filter[$key] = false;
             }
-
-            $this->syncInput('filter.'.$key, $filter);
         }
+
+        $this->selectAllFilters = $this->getIsAllSelectedProperty();
     }
 
     public function getIsAllSelectedProperty(): bool

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "fruitcake/laravel-cors": "^2.0",
         "http-interop/http-factory-guzzle": "^1.2",
         "huddledigital/zendesk-laravel": "^3.8",
-        "laravel/framework": "^9.20",
+        "laravel/framework": "^9.21",
         "laravel/horizon": "^5.19",
         "laravel/scout": "^10.2",
         "laravel/tinker": "^2.8",