Fixed text for clockify import

.github/workflows/build-private.yml

@@ -10,8 +10,6 @@ on:
       - '.github/workflows/build-private.yml'
       - 'docker/prod/**'
   workflow_dispatch:
-permissions:
-  contents: read
 
 name: Build - Private
 jobs:
@@ -19,7 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
-
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4

.github/workflows/build-public.yml

@@ -11,12 +11,6 @@ on:
       - 'docker/prod/**'
   workflow_dispatch:
 
-permissions:
-  packages: write
-  contents: read
-  attestations: write
-  id-token: write
-
 env:
   DOCKERHUB_REPO: solidtime/solidtime
   GHCR_REPO: ghcr.io/solidtime-io/solidtime
@@ -32,6 +26,11 @@ jobs:
           - runs-on: "ubuntu-24.04"
             platform: "linux/amd64"
     runs-on: ${{ matrix.runs-on }}
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     timeout-minutes: 90
 
     steps:
@@ -164,6 +163,11 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     timeout-minutes: 90
     needs:
       - build

.github/workflows/generate-api-docs.yml

@@ -3,9 +3,6 @@ on:
   push:
     branches:
       - main
-permissions:
-  contents: read
-
 jobs:
   api_docs:
     runs-on: ubuntu-latest

.github/workflows/npm-build.yml

@@ -1,8 +1,6 @@
 name: NPM Build
 
 on: [push]
-permissions:
-  contents: read
 
 jobs:
   build:

.github/workflows/npm-lint.yml

@@ -1,8 +1,6 @@
 name: NPM Lint
 
 on: [push]
-permissions:
-  contents: read
 
 jobs:
   build:

.github/workflows/npm-publish-api.yml

@@ -1,8 +1,6 @@
 name: Publish API package to NPM
 on:
   workflow_dispatch
-permissions:
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/npm-publish-ui.yml

@@ -1,8 +1,6 @@
 name: Publish UI package to NPM
 on:
   workflow_dispatch
-permissions:
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/npm-typecheck.yml

@@ -1,8 +1,7 @@
 name: NPM Typecheck
 
 on: [push]
-permissions:
+
-  contents: read
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/phpstan.yml

@@ -1,7 +1,5 @@
 name: Static code analysis (PHPStan)
 on: push
-permissions:
-  contents: read
 jobs:
   phpstan:
     runs-on: ubuntu-latest

.github/workflows/phpunit.yml

@@ -1,18 +1,13 @@
 name: PHPUnit Tests
 on: push
-permissions:
-  contents: read
 jobs:
   phpunit:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    strategy:
-      matrix:
-        postgres_version: [ 15, 16, 17 ]
 
     services:
       pgsql_test:
-        image: postgres:${{ matrix.postgres_version }}
+        image: postgres:15
         env:
           PGPASSWORD: 'root'
           POSTGRES_DB: 'laravel'
@@ -68,7 +63,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -1,7 +1,5 @@
 name: PHP Linting
 on: push
-permissions:
-  contents: read
 jobs:
   pint:
     runs-on: ubuntu-latest

.github/workflows/playwright.yml

@@ -1,7 +1,5 @@
 name: Playwright Tests
 on: [push]
-permissions:
-  contents: read
 jobs:
   test:
     runs-on: ubuntu-latest

app/Filament/Resources/UserResource.php

@@ -23,7 +23,6 @@ use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
@@ -208,14 +207,6 @@ class UserResource extends Resource
                     }),
             ])
             ->bulkActions([
-                Tables\Actions\BulkAction::make('Resend verification email')
-                    ->icon('heroicon-o-paper-airplane')
-                    ->action(function (Collection $records): void {
-                        foreach ($records as $user) {
-                            /** @var User $user */
-                            $user->sendEmailVerificationNotification();
-                        }
-                    }),
             ]);
     }
 

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -226,7 +226,6 @@ class TimeEntryController extends Controller
                 'start' => $request->getStart()->timezone($timezone),
                 'end' => $request->getEnd()->timezone($timezone),
                 'localization' => $localizationService,
-                'showBillableRate' => $showBillableRate,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
@@ -429,7 +428,6 @@ class TimeEntryController extends Controller
                 'end' => $request->getEnd()->timezone($timezone),
                 'debug' => $debug,
                 'localization' => $localizationService,
-                'showBillableRate' => $showBillableRate,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
@@ -458,7 +456,7 @@ class TimeEntryController extends Controller
                 ->putFileAs($folderPath, new File($tempFolder->path($filenameTemp)), $filename);
         } else {
             Excel::store(
-                new TimeEntriesReportExport($aggregatedData, $format, $currency, $group, $subGroup, $showBillableRate),
+                new TimeEntriesReportExport($aggregatedData, $format, $currency, $group, $subGroup),
                 $path,
                 config('filesystems.private'),
                 $format->getExportPackageType(),

app/Http/Requests/V1/BaseFormRequest.php

@@ -8,7 +8,9 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class BaseFormRequest extends FormRequest
 {
+
     /**
+     * @param bool $bigInt
      * @return list<string>
      */
     protected function moneyRules(bool $bigInt = false): array

app/Service/ReportExport/TimeEntriesReportExport.php

@@ -46,8 +46,6 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
 
     private TimeEntryAggregationType $subGroup;
 
-    private bool $showBillableRate;
-
     /**
      * @param array{
      *         grouped_type: string|null,
@@ -68,14 +66,13 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
      *         cost: int|null
      *   } $data
      */
-    public function __construct(array $data, ExportFormat $exportFormat, string $currency, TimeEntryAggregationType $group, TimeEntryAggregationType $subGroup, bool $showBillableRate)
+    public function __construct(array $data, ExportFormat $exportFormat, string $currency, TimeEntryAggregationType $group, TimeEntryAggregationType $subGroup)
     {
         $this->data = $data;
         $this->exportFormat = $exportFormat;
         $this->currency = $currency;
         $this->group = $group;
         $this->subGroup = $subGroup;
-        $this->showBillableRate = $showBillableRate;
     }
 
     public function view(): View
@@ -86,7 +83,6 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
             'group' => $this->group,
             'subGroup' => $this->subGroup,
             'exportFormat' => $this->exportFormat,
-            'showBillableRate' => $this->showBillableRate,
         ]);
     }
 

resources/js/Components/Common/Report/ReportSaveButton.vue

@@ -5,7 +5,6 @@ import { h, ref } from 'vue';
 import type { CreateReportBodyProperties } from '@/packages/api/src';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import UpgradeModal from '@/Components/Common/UpgradeModal.vue';
-import { canCreateReports } from '@/utils/permissions';
 defineProps<{
     reportProperties: CreateReportBodyProperties;
 }>();
@@ -34,10 +33,7 @@ function onSaveReportClick() {
         <strong>Sharable Reports</strong> is only available in solidtime
         Professional.
     </UpgradeModal>
-    <SecondaryButton
+    <SecondaryButton :icon="SaveIcon" @click="onSaveReportClick"
-        v-if="canCreateReports()"
-        :icon="SaveIcon"
-        @click="onSaveReportClick"
         >Save Report</SecondaryButton
     >
 </template>

resources/js/Components/Common/Reporting/ReportingOverview.vue

@@ -107,10 +107,6 @@ function getFilterAttributes(): AggregatedTimeEntriesQueryParams {
                 : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
-        member_id:
-            getCurrentRole() === 'employee'
-                ? getCurrentMembershipId()
-                : undefined,
     };
     return params;
 }

resources/js/packages/ui/src/Input/DateRangePicker.vue

@@ -5,7 +5,10 @@ import {
     PopoverTrigger,
 } from '@/Components/ui/popover';
 import { RangeCalendar } from '@/Components/ui/range-calendar';
-import { CalendarDate } from '@internationalized/date';
+import {
+    CalendarDate,
+    getLocalTimeZone,
+} from '@internationalized/date';
 import { CalendarIcon } from 'lucide-vue-next';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
@@ -13,9 +16,8 @@ import {
     getDayJsInstance,
     getLocalizedDayJs,
 } from '@/packages/ui/src/utils/time';
+import { formatDateLocalized } from '@/packages/ui/src/utils/time';
 import { type Organization } from '@/packages/api/src';
-import { getUserTimezone } from '@/packages/ui/src/utils/settings';
-import { formatDate } from '@/packages/ui/src/utils/time';
 
 const props = defineProps<{
     start: string;
@@ -57,13 +59,12 @@ const modelValue = computed<CalendarDateRange>({
     }),
     set: (newValue) => {
         if (newValue.start) {
-            console.log(newValue.start);
+            const date = newValue.start.toDate(getLocalTimeZone());
-            const date = newValue.start.toDate(getUserTimezone());
+            emit('update:start', getDayJsInstance()(date).format('YYYY-MM-DD'));
-            emit('update:start', getLocalizedDayJs(date.toString()).format());
         }
         if (newValue.end) {
-            const date = newValue.end.toDate(getUserTimezone());
+            const date = newValue.end.toDate(getLocalTimeZone());
-            emit('update:end', getLocalizedDayJs(date.toString()).format());
+            emit('update:end', getDayJsInstance()(date).format('YYYY-MM-DD'));
         }
     },
 });
@@ -218,27 +219,12 @@ watch(open, (value) => {
                 <CalendarIcon class="mr-2 h-4 w-4" />
                 <template v-if="modelValue.start">
                     <template v-if="modelValue.end">
-                        {{
+                        {{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.start.toString(),
-                                organization?.date_format
-                            )
-                        }}
                         -
-                        {{
+                        {{ formatDateLocalized(modelValue.end.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.end.toString(),
-                                organization?.date_format
-                            )
-                        }}
                     </template>
                     <template v-else>
-                        {{
+                        {{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }}
-                            formatDate(
-                                modelValue.start.toString(),
-                                organization?.date_format
-                            )
-                        }}
                     </template>
                 </template>
                 <template v-else> Pick a date </template>

resources/js/utils/permissions.ts

@@ -125,6 +125,4 @@ export function canViewAllTimeEntries() {
 export function canViewInvoices() {
     return currentUserHasPermission('invoices:view');
 }
-export function canCreateReports() {
+
-    return currentUserHasPermission('reports:create');
-}

resources/views/reports/time-entry-aggregate/pdf.blade.php

@@ -152,13 +152,12 @@
             <div
                 style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
         </div>
-        @if($showBillableRate)
         <div style="padding: 8px 12px; border-radius: 8px;">
             <div style="color: #71717a; font-weight: 600;">Total cost</div>
             <div
                 style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)) }} </div>
         </div>
-        @endif
+
     </div>
     <div id="main-chart" style="width: 700px; height: 300px; margin: 20px auto;"></div>
 
@@ -178,9 +177,7 @@
                         {{ $group->description() }}
                     </th>
                     <th>Duration</th>
-                    @if($showBillableRate)
                     <th style="text-align: right;">Cost</th>
-                    @endif
                 </tr>
                 </thead>
                 @foreach($aggregatedData['grouped_data'] as $group1Entry)
@@ -191,21 +188,23 @@
  }};">
                             </div>
                             <span style="padding-left: 8px;">
+
                                 @if($group->is(\App\Enums\TimeEntryAggregationType::Billable))
                                     {{ $group1Entry['key'] === '1' ? 'Billable' : 'Non-billable' }}
                                 @else
                                     {{ $group1Entry['description'] ?? $group1Entry['key'] ?? 'No '.Str::lower($group->description()) }}
                                 @endif
-                            </span>
+
+
+                    </span>
                         </td>
                         <td style="text-align: left;">
                             {{ $localization->formatInterval(CarbonInterval::seconds($group1Entry['seconds'])) }}
                         </td>
-                        @if($showBillableRate)
                         <td style="text-align: right;">
                             {{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($group1Entry['cost'], 2)->__toString(), $currency)) }}
                         </td>
-                        @endif
+
                     </tr>
                 @endforeach
                 <tfoot>
@@ -216,11 +215,9 @@
                     <td style="font-weight: 500;color: #18181b;">
                         {{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }}
                     </td>
-                    @if($showBillableRate)
                     <td style="text-align: right; font-weight: 500;color: #18181b;">
                         {{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)) }}
                     </td>
-                    @endif
                 </tr>
                 </tfoot>
             </table>
@@ -256,11 +253,9 @@
                     <th>
                         Duration (h)
                     </th>
-                    @if($showBillableRate)
                     <th>
                         Cost
                     </th>
-                    @endif
                 </tr>
                 </thead>
                 <tbody>
@@ -287,17 +282,13 @@
                         <td>
                             {{ $localization->formatNumber($duration->totalHours) }}
                         </td>
-                        @if($showBillableRate)
                         <td>
                             {{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($group2Entry['cost'], 2)->__toString(), $currency)) }}
                         </td>
-                        @endif
                     </tr>
                     @php
                         $totalDuration += $group2Entry['seconds'];
-                        if ($showBillableRate) {
+                        $totalCost += $group2Entry['cost'];
-                            $totalCost += $group2Entry['cost'];
-                        }
                     @endphp
                 @endforeach
                 </tbody>

resources/views/reports/time-entry-aggregate/spreadsheet.blade.php

@@ -62,11 +62,9 @@
                     <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                         {{ round($duration->totalHours, 2) }}
                     </td>
-                    @if($showBillableRate)
                     <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                         {{ round(BigDecimal::ofUnscaledValue($group2Entry['cost'], 2)->toFloat(), 2) }}
                     </td>
-                    @endif
                 @else
                     @if ($group === TimeEntryAggregationType::Billable)
                         <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
@@ -94,20 +92,16 @@
                         data-format="{{ NumberFormat::FORMAT_NUMBER_00 }}">
                         {{ $duration->totalHours }}
                     </td>
-                    @if($showBillableRate)
                     <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_NUMERIC }}"
                         data-format="{{ NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1 }}">
                         {{ BigDecimal::ofUnscaledValue($group2Entry['cost'], 2)->__toString() }}
                     </td>
-                    @endif
                 @endif
             </tr>
             @php
                 ++$counter;
                 $totalDuration += $group2Entry['seconds'];
-                if ($showBillableRate) {
+                $totalCost += $group2Entry['cost'];
-                    $totalCost += $group2Entry['cost'];
-                }
             @endphp
         @endforeach
     @endforeach
@@ -126,11 +120,9 @@
             <td style="border: 1px solid black; font-weight: bold;" data-type="{{ DataType::TYPE_STRING }}">
                 {{ round($totalDurationInterval->totalHours, 2) }}
             </td>
-            @if($showBillableRate)
             <td style="border: 1px solid black; font-weight: bold;" data-type="{{ DataType::TYPE_STRING }}">
                 {{ round(BigDecimal::ofUnscaledValue($totalCost, 2)->toFloat(), 2) }}
             </td>
-            @endif
         @else
             <td style="border: 1px solid black; font-weight: bold;" data-type="{{ DataType::TYPE_FORMULA }}"
                 data-format="[hh]:mm:ss">

resources/views/reports/time-entry-index/pdf.blade.php

@@ -140,14 +140,12 @@
             <div
                 style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
         </div>
-        @if($showBillableRate)
         <div style="padding: 8px 12px; border-radius: 8px;">
             <div style="color: #71717a; font-weight: 600;">Total cost</div>
-            <div style="font-size: 24px; font-weight: 500; margin-top: 2px;">
+            <div
-                {{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)) }}
+                style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatCurrency(Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)) }} </div>
-            </div>
         </div>
-        @endif
+
     </div>
     <div>
         <table style="width: 100%;">

tests/TestCaseWithDatabase.php

@@ -56,12 +56,10 @@ abstract class TestCaseWithDatabase extends TestCase
     /**
      * @return object{user: User, organization: Organization, member: Member, owner: User, ownerMember: Member}
      */
-    public function createUserWithRole(Role $role, bool $employeesCanSeeBillableRates = false): object
+    public function createUserWithRole(Role $role): object
     {
         $owner = User::factory()->create();
-        $organization = Organization::factory()->withOwner($owner)->create([
+        $organization = Organization::factory()->withOwner($owner)->create();
-            'employees_can_see_billable_rates' => $employeesCanSeeBillableRates,
-        ]);
         $ownerMember = Member::factory()->forUser($owner)->forOrganization($organization)->role(Role::Owner)->create();
         $owner->currentOrganization()->associate($organization);
         $owner->save();

tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php

@@ -686,10 +686,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:view:all',
         ]);
         Passport::actingAs($data->user);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
         $this->actAsOrganizationWithSubscription();
 
         // Act
@@ -704,192 +700,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertResponseCode($response, 200);
     }
 
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_csv_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::CSV,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_ods_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::ODS,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_xlxs_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::XLSX,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_pdf_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        Passport::actingAs($data->user);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $this->actAsOrganizationWithSubscription();
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::PDF,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_csv_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::CSV,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_ods_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::ODS,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_xlxs_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::XLSX,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_index_export_endpoint_can_create_a_detailed_time_entry_report_in_format_pdf_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        Passport::actingAs($data->user);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $this->actAsOrganizationWithSubscription();
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::PDF,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->id,
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
     public function test_aggregate_export_endpoints_fails_if_user_no_permission_to_view_time_entries(): void
     {
         // Arrange
@@ -1005,58 +815,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertResponseCode($response, 200);
     }
 
-    public function test_aggregate_export_endpoints_can_create_a_csv_report_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::CSV,
-            'group' => TimeEntryAggregationType::Client,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_aggregate_export_endpoints_can_create_a_csv_report_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::CSV,
-            'group' => TimeEntryAggregationType::Client,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
     public function test_aggregate_export_endpoints_can_create_a_xlsx_report(): void
     {
         // Arrange
@@ -1084,58 +842,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertResponseCode($response, 200);
     }
 
-    public function test_aggregate_export_endpoints_can_create_a_xlsx_report_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::XLSX,
-            'group' => TimeEntryAggregationType::Client,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_aggregate_export_endpoints_can_create_a_xlsx_report_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::XLSX,
-            'group' => TimeEntryAggregationType::Client,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
     public function test_aggregate_export_endpoints_can_create_a_ods_report(): void
     {
         // Arrange
@@ -1163,58 +869,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertResponseCode($response, 200);
     }
 
-    public function test_aggregate_export_endpoints_can_create_a_ods_report_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::ODS,
-            'group' => TimeEntryAggregationType::User,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_aggregate_export_endpoints_can_create_a_ods_report_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::ODS,
-            'group' => TimeEntryAggregationType::User,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
     public function test_aggregate_export_endpoint_fails_if_pdf_renderer_is_not_configured_but_a_user_want_a_pdf_report(): void
     {
         // Arrange
@@ -1273,60 +927,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertResponseCode($response, 200);
     }
 
-    public function test_aggregate_export_endpoints_can_create_a_pdf_report_as_employee_role_with_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, true);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-        $this->actAsOrganizationWithSubscription();
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::PDF,
-            'group' => TimeEntryAggregationType::User,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
-    public function test_aggregate_export_endpoints_can_create_a_pdf_report_as_employee_role_without_show_billable_rate(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(Role::Employee, false);
-        $client = Client::factory()->forOrganization($data->organization)->create();
-        $project = Project::factory()->forOrganization($data->organization)->forClient($client)->create();
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forProject($project)->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create();
-        Passport::actingAs($data->user);
-        $this->actAsOrganizationWithSubscription();
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate-export', [
-            $data->organization->getKey(),
-            'format' => ExportFormat::PDF,
-            'group' => TimeEntryAggregationType::User,
-            'sub_group' => TimeEntryAggregationType::Project,
-            'history_group' => TimeEntryAggregationTypeInterval::Month,
-            'start' => Carbon::now()->startOfYear()->toIso8601ZuluString(),
-            'end' => Carbon::now()->endOfYear()->toIso8601ZuluString(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-    }
-
     public function test_aggregate_endpoint_fails_if_user_has_only_access_to_own_time_entries_but_does_not_filter_for_this(): void
     {
         // Arrange