Merge remote-tracking branch 'origin/main'

inikoo · Jan 23, 2025 · 5033eb5 · 5033eb5
2 parents 0ea2d31 + fd8c42d
commit 5033eb5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/Actions/CRM/WebUser/IndexWebUserRequests.php b/app/Actions/CRM/WebUser/IndexWebUserRequests.php
@@ -59,7 +59,7 @@ public function handle(Group|Shop|Organisation|Customer|FulfilmentCustomer|Websi
                     ->whereIn('web_users.id', $parent->webUsers->pluck('id'));
             });
         } elseif ($parent instanceof Group) {
-            $queryBuilder->where('group_id', $parent->id);
+            $queryBuilder->where('web_user_requests.group_id', $parent->id);
         }
 
         $queryBuilder->leftJoin('web_users', 'web_users.id', '=', 'web_user_requests.web_user_id');

diff --git a/app/Actions/CRM/WebUser/IndexWebUsers.php b/app/Actions/CRM/WebUser/IndexWebUsers.php
@@ -255,26 +255,26 @@ public function tableStructure(Group|Shop|Organisation|Customer|FulfilmentCustom
     public function inGroup(ActionRequest $request): LengthAwarePaginator
     {
         $this->parent = group();
-        $this->initialisationFromGroup($this->parent, $request);
+        $this->initialisationFromGroup($this->parent, $request)->withTab(WebUserTabsEnum::values());
 
-        return $this->handle(parent: $this->parent);
+        return $this->handle(parent: $this->parent, prefix: WebUserTabsEnum::WEB_USERS->value);
     }
 
     public function inOrganisation(Organisation $organisation, ActionRequest $request): LengthAwarePaginator
     {
         $this->parent = $organisation;
         $this->initialisation($organisation, $request);
 
-        return $this->handle($this->parent);
+        return $this->handle(parent: $this->parent, prefix: WebUserTabsEnum::WEB_USERS->value);
     }
 
     /** @noinspection PhpUnusedParameterInspection */
     public function inWebsite(Organisation $organisation, Shop $shop, Website $website, ActionRequest $request): LengthAwarePaginator
     {
         $this->parent = $website;
-        $this->initialisationFromShop($shop, $request);
+        $this->initialisationFromShop($shop, $request)->withTab(WebUserTabsEnum::values());
 
-        return $this->handle(parent: $website);
+        return $this->handle(parent: $website, prefix: WebUserTabsEnum::WEB_USERS->value);
     }
 
     /** @noinspection PhpUnusedParameterInspection */
@@ -291,7 +291,7 @@ public function asController(Organisation $organisation, Shop $shop, Customer $c
         $this->parent = $customer;
         $this->initialisationFromShop($shop, $request);
 
-        return $this->handle(parent: $customer);
+        return $this->handle(parent: $customer, prefix: WebUserTabsEnum::WEB_USERS->value);
     }