Merge pull request #39 from eporsche/add_account_admins

eporsche · web-flow · commit 843aa17f3c63 · 2022-03-18T11:41:48.000+01:00
Add account admins
diff --git a/app/AbsenceCalendar/EmployeeAbsenceCalendar.php b/app/AbsenceCalendar/EmployeeAbsenceCalendar.php
@@ -85,7 +85,6 @@ protected function calculatePaidHours()
             if ($this->startAndEndDayAreSame()) {
                 $calcHours = BigDecimal::of($this->startDay->diffInMinutes($this->endDay))
                     ->dividedBy('60', 2, RoundingMode::HALF_EVEN);
-                    // dd($calcHours);
                 return $calcHours->isGreaterThanOrEqualTo($absenceDay->getTargetHours()) ?
                     $absenceDay->getTargetHours() : $calcHours;
             }
diff --git a/app/Actions/UpdateEmployeeProfile.php b/app/Actions/UpdateEmployeeProfile.php
@@ -27,15 +27,17 @@ public function update($user, $data)
         Validator::make($data, [
             'name' => ['required','string','max:255'],
             'date_of_employment' => ['nullable', $this->dateFormatter->dateFormatRule()],
-            'opening_overtime_balance' => ['nullable','numeric']
+            'opening_overtime_balance' => ['nullable','numeric'],
+            'is_account_admin' => ['required','boolean'],
         ])->validateWithBag('saveEmployee');
 
         $user->forceFill([
             'name' => $data['name'],
             'date_of_employment' =>
                 $this->dateFormatter->strToDate($data['date_of_employment']),
             'opening_overtime_balance' =>
-                $data['opening_overtime_balance']
+                $data['opening_overtime_balance'],
+            'is_account_admin' => $data['is_account_admin'],
         ])->save();
     }
 }
diff --git a/app/Http/Controllers/EditEmployeeController.php b/app/Http/Controllers/EditEmployeeController.php
@@ -4,11 +4,15 @@
 
 use App\Models\User;
 use App\Models\Account;
+use Illuminate\Support\Facades\Gate;
 
 class EditEmployeeController extends Controller
 {
     public function __invoke(Account $account, User $employee)
     {
+        if (Gate::denies('view', $account)) {
+            abort(403);
+        }
         return view('employees.edit',['employee' => $employee]);
     }
 }
diff --git a/app/Http/Controllers/ShowEmployeesForAccountController.php b/app/Http/Controllers/ShowEmployeesForAccountController.php
@@ -3,11 +3,15 @@
 namespace App\Http\Controllers;
 
 use App\Models\Account;
+use Illuminate\Support\Facades\Gate;
 
 class ShowEmployeesForAccountController extends Controller
 {
     public function __invoke(Account $account)
     {
+        if (Gate::denies('view', $account)) {
+            abort(403);
+        }
         return view('employees.index', compact('account'));
     }
 }
diff --git a/app/Http/Controllers/ShowLocationsForAccountController.php b/app/Http/Controllers/ShowLocationsForAccountController.php
@@ -4,12 +4,17 @@
 
 use App\Models\Account;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 
 class ShowLocationsForAccountController extends Controller
 {
 
     public function __invoke(Account $account, Request $request)
     {
+        if (Gate::denies('view', $account)) {
+            abort(403);
+        }
+
         return view('locations.index', [
             'account' => $account,
             'user' => $request->user()
diff --git a/app/Http/Livewire/Employees/EditUserProfile.php b/app/Http/Livewire/Employees/EditUserProfile.php
@@ -63,7 +63,9 @@ class EditUserProfile extends Component
     public $editUserProfileForm = [
         'name' => null,
         'date_of_employment' => null,
-        'opening_overtime_balance' => null
+        'opening_overtime_balance' => null,
+        'is_account_admin' => false
+
     ];
 
     public $days = [
@@ -226,6 +228,7 @@ public function mount(User $employee)
                 $this->employee->date_of_employment_for_humans,
             'opening_overtime_balance' =>
                 $this->employee->opening_overtime_balance,
+            'is_account_admin' => $this->employee->is_account_admin
         ], fn() => $this->fillPayrollFormFields($employee), Daybreak::hasEmployeePayrollFeature());
     }
 
diff --git a/app/Policies/AccountPolicy.php b/app/Policies/AccountPolicy.php
@@ -30,7 +30,7 @@ public function viewAny(User $user)
      */
     public function view(User $user, Account $account)
     {
-        return $user->ownsAccount($account);
+        return $user->isAccountAdmin($account);
     }
 
     /**
@@ -53,7 +53,7 @@ public function create(User $user)
      */
     public function update(User $user, Account $account)
     {
-        return $user->ownsAccount($account);
+        return $user->isAccountAdmin($account);
     }
 
     /**
diff --git a/app/Traits/HasAccounts.php b/app/Traits/HasAccounts.php
@@ -21,6 +21,12 @@ public function ownsAccount(Account $account)
         return $this->id == $account->owned_by;
     }
 
+    public function isAccountAdmin(Account $account)
+    {
+        return $this->ownsAccount($account)
+         || ($this->belongsToAccount($account) && $this->is_account_admin);
+    }
+
     /**
      * Switch the user's context to the given account.
      *
diff --git a/database/migrations/2022_03_17_144634_add_account_admin_to_users_table.php b/database/migrations/2022_03_17_144634_add_account_admin_to_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAccountAdminToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('is_account_admin')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('is_account_admin');
+        });
+    }
+}
diff --git a/resources/views/account-navigation-menu.blade.php b/resources/views/account-navigation-menu.blade.php
@@ -5,33 +5,33 @@
             <div class="flex">
                 <!-- Logo -->
                 <div class="flex-shrink-0 flex items-center">
-                    <a href="{{ route('accounts.show', Auth::user()->ownedAccount) }}">
+                    <a href="{{ route('accounts.show', Auth::user()->account) }}">
                        <img src="/logo.svg" class="block h-12 w-auto">
                     </a>
                 </div>
 
                 <!-- Navigation Links -->
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                    <x-account-nav-link href="{{ route('locations', Auth::user()->ownedAccount) }}" :active="request()->routeIs('locations')">
+                    <x-account-nav-link href="{{ route('locations', Auth::user()->account) }}" :active="request()->routeIs('locations')">
                         {{ __('Locations') }}
                     </x-account-nav-link>
                 </div>
                 @if(App\Daybreak::hasProjectBillingFeature())
                     <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                        <x-account-nav-link href="{{ route('projects', Auth::user()->ownedAccount) }}" :active="request()->routeIs('projects')">
+                        <x-account-nav-link href="{{ route('projects', Auth::user()->account) }}" :active="request()->routeIs('projects')">
                             {{ __('Projects') }}
                         </x-account-nav-link>
                     </div>
                 @endif
                 @if(App\Daybreak::hasEmployeePayrollFeature())
                     <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                        <x-account-nav-link href="{{ route('payrolls', Auth::user()->ownedAccount) }}" :active="request()->routeIs('payrolls')">
+                        <x-account-nav-link href="{{ route('payrolls', Auth::user()->account) }}" :active="request()->routeIs('payrolls')">
                             {{ __('Payroll') }}
                         </x-account-nav-link>
                     </div>
                 @endif
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                    <x-account-nav-link href="{{ route('employees', Auth::user()->ownedAccount) }}" :active="request()->routeIs('employees')">
+                    <x-account-nav-link href="{{ route('employees', Auth::user()->account) }}" :active="request()->routeIs('employees')">
                         {{ __('Employees') }}
                     </x-account-nav-link>
                 </div>
@@ -77,12 +77,12 @@
                         <div class="border-t border-gray-100"></div>
 
                         <!-- Account Management -->
-                        @can('view', Auth::user()->ownedAccount)
+                        @can('view', Auth::user()->account)
                             <div class="block px-4 py-2 text-xs text-gray-400">
                                 {{ __('Manage Account') }}
                             </div>
 
-                            <x-jet-dropdown-link href="{{ route('accounts.show', Auth::user()->ownedAccount) }}">
+                            <x-jet-dropdown-link href="{{ route('accounts.show', Auth::user()->account) }}">
                                 {{ __('Account Settings') }}
                             </x-jet-dropdown-link>
                         @endcan
@@ -94,7 +94,7 @@
                             {{ __('Manage Location') }}
                         </div>
 
-                        {{-- <x-jet-dropdown-link href="{{ route('locations.index', Auth::user()->ownedAccount->id) }}">
+                        {{-- <x-jet-dropdown-link href="{{ route('locations.index', Auth::user()->account->id) }}">
                             {{ __('Account Settings') }}
                         </x-jet-dropdown-link> --}}
 
@@ -190,22 +190,22 @@
                     </x-jet-responsive-nav-link>
                 @endif
 
-                <x-jet-responsive-nav-link href="{{ route('locations', Auth::user()->ownedAccount) }}" :active="request()->routeIs('locations')">
+                <x-jet-responsive-nav-link href="{{ route('locations', Auth::user()->account) }}" :active="request()->routeIs('locations')">
                     {{ __('Locations') }}
                 </x-jet-responsive-nav-link>
                 @if(App\Daybreak::hasProjectBillingFeature())
 
-                    <x-jet-responsive-nav-link href="{{ route('projects', Auth::user()->ownedAccount) }}" :active="request()->routeIs('projects')">
+                    <x-jet-responsive-nav-link href="{{ route('projects', Auth::user()->account) }}" :active="request()->routeIs('projects')">
                         {{ __('Projects') }}
                     </x-jet-responsive-nav-link>
                 @endif
                 @if(App\Daybreak::hasEmployeePayrollFeature())
-                    <x-jet-responsive-nav-link href="{{ route('payrolls', Auth::user()->ownedAccount) }}" :active="request()->routeIs('payrolls')">
+                    <x-jet-responsive-nav-link href="{{ route('payrolls', Auth::user()->account) }}" :active="request()->routeIs('payrolls')">
                         {{ __('Payroll') }}
                     </x-jet-responsive-nav-link>
                 @endif
 
-                <x-jet-responsive-nav-link href="{{ route('employees', Auth::user()->ownedAccount) }}" :active="request()->routeIs('employees')">
+                <x-jet-responsive-nav-link href="{{ route('employees', Auth::user()->account) }}" :active="request()->routeIs('employees')">
                     {{ __('Employees') }}
                 </x-jet-responsive-nav-link>
 
diff --git a/resources/views/livewire/employees/edit-user-profile.blade.php b/resources/views/livewire/employees/edit-user-profile.blade.php
@@ -215,6 +215,13 @@
                     @if(App\Daybreak::hasEmployeePayrollFeature())
                         <x-dynamic-component component="employee-payroll-form" />
                     @endif
+                    <div class="col-span-6 lg:col-span-4 mt-2">
+                        <div class="inline-flex">
+                            <input type="checkbox" id="is_account_admin" wire:model.defer="editUserProfileForm.is_account_admin" class="h-4 w-4 text-indigo-600 focus:ring-indigo-500 border-gray-300 rounded">
+                            <x-jet-label for="is_account_admin" class="ml-2 block text-sm text-gray-900" value="{{ __('Account Admin') }}" />
+                        </div>
+                        <x-jet-input-error for="is_account_admin" class="mt-2" />
+                    </div>
                 </div>
             </x-slot>
             <x-slot name="actions">
diff --git a/resources/views/navigation-menu.blade.php b/resources/views/navigation-menu.blade.php
@@ -103,12 +103,12 @@
                         <div class="border-t border-gray-100"></div>
 
                         <!-- Account Management -->
-                        @can('view', Auth::user()->ownedAccount)
+                        @can('view', Auth::user()->account)
                             <div class="block px-4 py-2 text-xs text-gray-400">
                                 {{ __('Manage Account') }}
                             </div>
 
-                            <x-jet-dropdown-link href="{{ route('accounts.show', Auth::user()->ownedAccount->id) }}">
+                            <x-jet-dropdown-link href="{{ route('accounts.show', Auth::user()->account->id) }}">
                                 {{ __('Account Settings') }}
                             </x-jet-dropdown-link>
                         @endcan
@@ -180,8 +180,8 @@
                         {{ __('Location Settings') }}
                     </x-jet-responsive-nav-link>
                 @endcan
-                @can('view', Auth::user()->ownedAccount)
-                    <x-jet-responsive-nav-link href="{{ route('accounts.show', Auth::user()->ownedAccount->id) }}">
+                @can('view', Auth::user()->account)
+                    <x-jet-responsive-nav-link href="{{ route('accounts.show', Auth::user()->account->id) }}">
                         {{ __('Account Settings') }}
                     </x-jet-responsive-nav-link>
                 @endcan

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ protected function calculatePaidHours()`
`85`	`85`	`if ($this->startAndEndDayAreSame()) {`
`86`	`86`	`$calcHours = BigDecimal::of($this->startDay->diffInMinutes($this->endDay))`
`87`	`87`	`->dividedBy('60', 2, RoundingMode::HALF_EVEN);`
`88`		`- // dd($calcHours);`
`89`	`88`	`return $calcHours->isGreaterThanOrEqualTo($absenceDay->getTargetHours()) ?`
`90`	`89`	`$absenceDay->getTargetHours() : $calcHours;`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,15 @@`
`4`	`4`
`5`	`5`	`use App\Models\User;`
`6`	`6`	`use App\Models\Account;`
	`7`	`+use Illuminate\Support\Facades\Gate;`
`7`	`8`
`8`	`9`	`class EditEmployeeController extends Controller`
`9`	`10`	`{`
`10`	`11`	`public function __invoke(Account $account, User $employee)`
`11`	`12`	`{`
	`13`	`+ if (Gate::denies('view', $account)) {`
	`14`	`+ abort(403);`
	`15`	`+ }`
`12`	`16`	`return view('employees.edit',['employee' => $employee]);`
`13`	`17`	`}`
`14`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,15 @@`
`3`	`3`	`namespace App\Http\Controllers;`
`4`	`4`
`5`	`5`	`use App\Models\Account;`
	`6`	`+use Illuminate\Support\Facades\Gate;`
`6`	`7`
`7`	`8`	`class ShowEmployeesForAccountController extends Controller`
`8`	`9`	`{`
`9`	`10`	`public function __invoke(Account $account)`
`10`	`11`	`{`
	`12`	`+ if (Gate::denies('view', $account)) {`
	`13`	`+ abort(403);`
	`14`	`+ }`
`11`	`15`	`return view('employees.index', compact('account'));`
`12`	`16`	`}`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function viewAny(User $user)`
`30`	`30`	`*/`
`31`	`31`	`public function view(User $user, Account $account)`
`32`	`32`	`{`
`33`		`- return $user->ownsAccount($account);`
	`33`	`+ return $user->isAccountAdmin($account);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`@@ -53,7 +53,7 @@ public function create(User $user)`
`53`	`53`	`*/`
`54`	`54`	`public function update(User $user, Account $account)`
`55`	`55`	`{`
`56`		`- return $user->ownsAccount($account);`
	`56`	`+ return $user->isAccountAdmin($account);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,12 @@ public function ownsAccount(Account $account)`
`21`	`21`	`return $this->id == $account->owned_by;`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ public function isAccountAdmin(Account $account)`
	`25`	`+ {`
	`26`	`+ return $this->ownsAccount($account)`
	`27`	`+ \|\| ($this->belongsToAccount($account) && $this->is_account_admin);`
	`28`	`+ }`
	`29`	`+`
`24`	`30`	`/**`
`25`	`31`	`* Switch the user's context to the given account.`
`26`	`32`	`*`