From: Vincent Vanwaelscappel Date: Wed, 14 Feb 2024 16:03:01 +0000 (+0100) Subject: wait #6727 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e02c11dd8a8babfc8c5cbb6bcf2422c68564c276;p=cubedesigners_userdatabase.git wait #6727 @1 --- diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php index 99e18e9..5cfed0f 100644 --- a/src/app/Jobs/ApplyPermissionsToUsers.php +++ b/src/app/Jobs/ApplyPermissionsToUsers.php @@ -4,6 +4,7 @@ namespace Cubedesigners\UserDatabase\Jobs; use Cubedesigners\UserDatabase\Models\Company; use Cubedesigners\UserDatabase\Models\User; +use Cubedesigners\UserDatabase\Permissions; use Cubist\Backpack\Jobs\Base; use Cubist\Backpack\Jobs\URL; use Illuminate\Contracts\Queue\ShouldBeUnique; @@ -15,6 +16,7 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique { public function handle() { + // Set grade to 0 when null DB::connection('extranet_users')->table('user')->whereNull('e1_grade')->update(['e1_grade' => 0]); @@ -58,6 +60,7 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique $users = []; foreach (Company::withoutGlobalScopes()->get() as $company) { /** @var $company Company */ + $isResselerClient = (Permissions::getInvoicableCompany($company->id) != $company->id); if (!$company->toolbox_access) { $disabledUsers = array_merge($disabledUsers, array_keys($company->getUsers())); continue; @@ -105,6 +108,9 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique if ($company->permissions_elearning) { $p[] = $rolesByName['elearning:user']; } + if ($isResselerClient) { + $p[] = $rolesByName['fluidbook:client']; + } switch ($company->e1_ws_grade) { case 1: $p[] = $rolesByName['fluidbook:client'];