Fixed problem with merge into when project members already exist in destination member

.github/workflows/build-private.yml

@@ -107,24 +107,6 @@ jobs:
       - name: "Install npm dependencies in services extension"
         run: cd extensions/Services && npm ci
 
-      - name: "Checkout invoicing extension"
-        uses: actions/checkout@v4
-        with:
-          repository: solidtime-io/extension-invoicing
-          path: extensions/Invoicing
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
-
-      - name: "Install composer dependencies in invoicing extension"
-        uses: php-actions/composer@v6
-        with:
-          working_dir: "extensions/Invoicing"
-          command: install
-          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-          php_version: 8.3
-
-      - name: "Install npm dependencies in invoicing extension"
-        run: cd extensions/Invoicing && npm ci
-
       - name: "Setup PHP with PECL extension"
         uses: shivammathur/setup-php@v2
         with:
@@ -145,9 +127,6 @@ jobs:
       - name: "Activate services extension"
         run: php artisan module:enable Services
 
-      - name: "Activate invoicing extension"
-        run: php artisan module:enable Invoicing
-
       - name: "Install npm dependencies"
         run: npm ci
 

.github/workflows/phpunit.yml

@@ -63,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.2
+        uses: codecov/codecov-action@v5.4.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

app/Actions/Fortify/CreateNewUser.php

@@ -76,11 +76,6 @@ class CreateNewUser implements CreatesNewUsers
         $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
 
         $startOfWeek = Weekday::Monday;
-        $numberFormat = null;
-        $currencyFormat = null;
-        $dateFormat = null;
-        $intervalFormat = null;
-        $timeFormat = null;
         $currency = null;
         if ($ipLookupResponse !== null) {
             $startOfWeek = $ipLookupResponse->startOfWeek ?? Weekday::Monday;
@@ -90,7 +85,7 @@ class CreateNewUser implements CreatesNewUsers
             $currency = $ipLookupResponse->currency;
         }
         $user = null;
-        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency, $numberFormat, $currencyFormat, $dateFormat, $intervalFormat, $timeFormat): void {
+        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency): void {
             $userService = app(UserService::class);
             $user = $userService->createUser(
                 $input['name'],
@@ -98,12 +93,7 @@ class CreateNewUser implements CreatesNewUsers
                 $input['password'],
                 $timezone ?? 'UTC',
                 $startOfWeek,
-                $currency,
-                $numberFormat,
-                $currencyFormat,
-                $dateFormat,
-                $intervalFormat,
-                $timeFormat
+                $currency ?? 'EUR',
             );
         });
 

app/Actions/Jetstream/CreateOrganization.php

@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
+use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\IpLookup\IpLookupServiceContract;
-use App\Service\OrganizationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
@@ -34,18 +33,16 @@ class CreateOrganization implements CreatesTeams
             'name' => ['required', 'string', 'max:255'],
         ])->validateWithBag('createTeam');
 
-        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
+        $organization = new Organization;
+        $organization->name = $input['name'];
+        $organization->personal_team = false;
+        $organization->owner()->associate($user);
+        $organization->save();
 
-        $currency = null;
-        if ($ipLookupResponse !== null) {
-            $currency = $ipLookupResponse->currency;
-        }
-
-        $organization = app(OrganizationService::class)->createOrganization(
-            $input['name'],
-            $user,
-            false,
-            $currency
+        $organization->users()->attach(
+            $user, [
+                'role' => Role::Owner->value,
+            ]
         );
 
         $user->switchTeam($organization);

app/Console/Commands/Admin/UserCreateCommand.php

@@ -64,8 +64,8 @@ class UserCreateCommand extends Command
                 $password,
                 'UTC',
                 Weekday::Monday,
-                null,
-                verifyEmail: $verifyEmail
+                'EUR',
+                $verifyEmail
             );
         });
         /** @var Organization|null $organization */

app/Enums/CurrencyFormat.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum CurrencyFormat: string
-{
-    use LaravelEnumHelper;
-
-    case ISOCodeBeforeWithSpace = 'iso-code-before-with-space';
-    case ISOCodeAfterWithSpace = 'iso-code-after-with-space';
-
-    case SymbolBefore = 'symbol-before';
-
-    case SymbolAfter = 'symbol-after';
-
-    case SymbolBeforeWithSpace = 'symbol-before-with-space';
-
-    case SymbolAfterWithSpace = 'symbol-after-with-space';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.currency_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/DateFormat.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum DateFormat: string
-{
-    use LaravelEnumHelper;
-
-    case PointSeparatedDMYYYY = 'point-separated-d-m-yyyy';
-    case SlashSeparatedMMDDYYYY = 'slash-separated-mm-dd-yyyy';
-
-    case SlashSeparatedDDMMYYYY = 'slash-separated-dd-mm-yyyy';
-
-    case HyphenSeparatedDDMMYYY = 'hyphen-separated-dd-mm-yyyy';
-
-    case HyphenSeparatedMMDDDYYYY = 'hyphen-separated-mm-dd-yyyy';
-
-    case HyphenSeparatedYYYYMMDD = 'hyphen-separated-yyyy-mm-dd';
-
-    public function toCarbonFormat(): string
-    {
-        return match ($this->value) {
-            self::PointSeparatedDMYYYY->value => 'j.n.Y',
-            self::SlashSeparatedMMDDYYYY->value => 'm/d/Y',
-            self::SlashSeparatedDDMMYYYY->value => 'd/m/Y',
-            self::HyphenSeparatedDDMMYYY->value => 'd-m-Y',
-            self::HyphenSeparatedMMDDDYYYY->value => 'm-d-Y',
-            self::HyphenSeparatedYYYYMMDD->value => 'Y-m-d',
-        };
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.date_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/IntervalFormat.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum IntervalFormat: string
-{
-    use LaravelEnumHelper;
-
-    case Decimal = 'decimal';
-    case HoursMinutes = 'hours-minutes';
-
-    case HoursMinutesColonSeparated = 'hours-minutes-colon-separated';
-
-    case HoursMinutesSecondsColonSeparated = 'hours-minutes-seconds-colon-separated';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.interval_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/NumberFormat.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-/**
- * @info https://en.wikipedia.org/wiki/Decimal_separator
- */
-enum NumberFormat: string
-{
-    use LaravelEnumHelper;
-
-    case ThousandsPointDecimalComma = 'point-comma';
-
-    case ThousandsCommaDecimalPoint = 'comma-point';
-    case ThousandsSpaceDecimalComma = 'space-comma';
-
-    case ThousandsSpaceDecimalPoint = 'space-point';
-
-    case ThousandsApostropheDecimalPoint = 'apostrophe-point';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.number_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/TimeFormat.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum TimeFormat: string
-{
-    use LaravelEnumHelper;
-
-    case TwelveHours = '12-hours';
-    case TwentyFourHours = '24-hours';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.time_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Filament/Resources/AuditResource.php

@@ -13,7 +13,7 @@ use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Str;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 class AuditResource extends Resource
 {
@@ -38,8 +38,8 @@ class AuditResource extends Resource
                     ->maxLength(255),
                 Forms\Components\TextInput::make('auditable_id')
                     ->required(),
-                PrettyJsonField::make('old_values'),
-                PrettyJsonField::make('new_values'),
+                PrettyJson::make('old_values'),
+                PrettyJson::make('new_values'),
                 Forms\Components\Textarea::make('url'),
                 Forms\Components\TextInput::make('ip_address'),
                 Forms\Components\TextInput::make('user_agent')

app/Filament/Resources/FailedJobResource.php

@@ -20,7 +20,7 @@ use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 /**
  * @source https://gitlab.com/amvisor/filament-failed-jobs
@@ -50,7 +50,7 @@ class FailedJobResource extends Resource
 
                 // make text a little bit smaller because often a complete Stack Trace is shown:
                 TextArea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
-                PrettyJsonField::make('payload')->disabled()->columnSpan(4),
+                PrettyJson::make('payload')->disabled()->columnSpan(4),
             ])->columns(4);
     }
 

app/Filament/Resources/OrganizationResource.php

@@ -4,11 +4,6 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Filament\Resources\OrganizationResource\Pages;
 use App\Filament\Resources\OrganizationResource\RelationManagers\InvitationsRelationManager;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
@@ -61,21 +56,6 @@ class OrganizationResource extends Resource
                     ->searchable(['name', 'email'])
                     ->disabledOn(['edit'])
                     ->required(),
-                Select::make('date_format')
-                    ->options(DateFormat::toSelectArray())
-                    ->required(),
-                Select::make('currency_format')
-                    ->options(CurrencyFormat::toSelectArray())
-                    ->required(),
-                Select::make('interval_format')
-                    ->options(IntervalFormat::toSelectArray())
-                    ->required(),
-                Select::make('number_format')
-                    ->options(NumberFormat::toSelectArray())
-                    ->required(),
-                Select::make('time_format')
-                    ->options(TimeFormat::toSelectArray())
-                    ->required(),
                 Forms\Components\Select::make('currency')
                     ->label('Currency')
                     ->options(function (): array {

app/Filament/Resources/ReportResource.php

@@ -18,7 +18,7 @@ use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\ToggleColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 class ReportResource extends Resource
 {
@@ -58,7 +58,7 @@ class ReportResource extends Resource
                 Forms\Components\TextInput::make('share_secret')
                     ->label('Share Secret')
                     ->nullable(),
-                PrettyJsonField::make('properties')
+                PrettyJson::make('properties')
                     ->formatStateUsing(function (ReportPropertiesDto $state, Report $record): string {
                         return $record->getRawOriginal('properties');
                     })

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -24,7 +24,7 @@ class CreateUser extends CreateRecord
             $data['timezone'],
             Weekday::from($data['week_start']),
             $data['currency'],
-            verifyEmail: (bool) $data['is_email_verified']
+            (bool) $data['is_email_verified']
         );
 
         return $user;

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

@@ -1,172 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Enums\Role;
-use App\Models\Organization;
-use App\Service\DashboardService;
-use App\Service\PermissionStore;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ChartController extends Controller
-{
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId weeklyProjectOverview
-     *
-     * @response array<int, array{value: int, name: string, color: string}>
-     */
-    public function weeklyProjectOverview(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
-
-        return response()->json($weeklyProjectOverview);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId latestTasks
-     *
-     * @response array<int, array{task_id: string, name: string, description: string|null, status: bool, time_entry_id: string|null}>
-     */
-    public function latestTasks(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $latestTasks = $dashboardService->latestTasks($user, $organization);
-
-        return response()->json($latestTasks);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId lastSevenDays
-     *
-     * @response array<int, array{ date: string, duration: int, history: array<int> }>
-     */
-    public function lastSevenDays(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
-
-        return response()->json($lastSevenDays);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId latestTeamActivity
-     *
-     * @response array<int, array{member_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
-     */
-    public function latestTeamActivity(Organization $organization, DashboardService $dashboardService, PermissionStore $permissionStore): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:all');
-
-        $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
-
-        return response()->json($latestTeamActivity);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId dailyTrackedHours
-     *
-     * @response array<int, array{date: string, duration: int}>
-     */
-    public function dailyTrackedHours(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
-
-        return response()->json($dailyTrackedHours);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyTime
-     *
-     * @response int
-     */
-    public function totalWeeklyTime(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
-
-        return response()->json($totalWeeklyTime);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyBillableTime
-     *
-     * @response int
-     */
-    public function totalWeeklyBillableTime(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
-
-        return response()->json($totalWeeklyBillableTime);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyBillableAmount
-     *
-     * @response array{value: int, currency: string}
-     */
-    public function totalWeeklyBillableAmount(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-        if (! $showBillableRate) {
-            throw new AuthorizationException('You do not have permission to view billable rates.');
-        }
-
-        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
-
-        return response()->json($totalWeeklyBillableAmount);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId weeklyHistory
-     *
-     * @response array<int, array{date: string, duration: int}>
-     */
-    public function weeklyHistory(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
-
-        return response()->json($weeklyHistory);
-    }
-}

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

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Http\Controllers\Controller;
-use App\Service\CurrencyService;
-use Brick\Money\Currency;
-use Brick\Money\ISOCurrencyProvider;
-use Illuminate\Http\JsonResponse;
-
-class CurrencyController extends Controller
-{
-    /**
-     * Get all currencies
-     *
-     * @response array{code: string, name: string, symbol: string}[]
-     *
-     * @operationId getCurrencies
-     */
-    public function index(): JsonResponse
-    {
-        $currencyService = app(CurrencyService::class);
-
-        $currencies = array_values(array_map(
-            fn (Currency $currency): array => [
-                'code' => $currency->getCurrencyCode(),
-                'name' => $currency->getName(),
-                'symbol' => $currencyService->getCurrencySymbol($currency->getCurrencyCode()),
-            ],
-            ISOCurrencyProvider::getInstance()->getAvailableCurrencies()
-        ));
-
-        return response()->json($currencies);
-    }
-}

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

@@ -114,8 +114,6 @@ class MemberController extends Controller
      * Make a member a placeholder member
      *
      * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization|ChangingRoleOfPlaceholderIsNotAllowed
-     *
-     * @operationId makePlaceholder
      */
     public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse
     {
@@ -136,8 +134,6 @@ class MemberController extends Controller
     }
 
     /**
-     * Merge one member into another
-     *
      * @throws AuthorizationException
      * @throws OnlyPlaceholdersCanBeMergedIntoAnotherMember
      * @throws \Throwable

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

@@ -40,35 +40,15 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:update');
 
-        if ($request->getName() !== null) {
-            $organization->name = $request->getName();
-        }
-        if ($request->getEmployeesCanSeeBillableRates() !== null) {
-            $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
-        }
-        if ($request->getNumberFormat() !== null) {
-            $organization->number_format = $request->getNumberFormat();
-        }
-        if ($request->getCurrencyFormat() !== null) {
-            $organization->currency_format = $request->getCurrencyFormat();
-        }
-        if ($request->getDateFormat() !== null) {
-            $organization->date_format = $request->getDateFormat();
-        }
-        if ($request->getIntervalFormat() !== null) {
-            $organization->interval_format = $request->getIntervalFormat();
-        }
-        if ($request->getTimeFormat() !== null) {
-            $organization->time_format = $request->getTimeFormat();
-        }
-        $hasBillableRate = $request->has('billable_rate');
-        if ($hasBillableRate) {
-            $oldBillableRate = $organization->billable_rate;
-            $organization->billable_rate = $request->getBillableRate();
+        $organization->name = $request->input('name');
+        $oldBillableRate = $organization->billable_rate;
+        if ($request->has('employees_can_see_billable_rates')) {
+            $organization->employees_can_see_billable_rates = $request->validated('employees_can_see_billable_rates');
         }
+        $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
-        if ($hasBillableRate && $oldBillableRate !== $request->getBillableRate()) {
+        if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 

app/Http/Controllers/Api/V1/Public/ReportController.php

@@ -73,7 +73,6 @@ class ReportController extends Controller
             false,
             $report->properties->start,
             $report->properties->end,
-            true
         );
         $historyData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
             $timeEntriesQuery->clone(),
@@ -84,7 +83,6 @@ class ReportController extends Controller
             true,
             $report->properties->start,
             $report->properties->end,
-            true
         );
 
         return new DetailedWithDataReportResource($report, $data, $historyData);

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\ExportFormat;
-use App\Enums\Role;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
@@ -27,7 +26,6 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Service\LocalizationService;
 use App\Service\ReportExport\TimeEntriesDetailedCsvExport;
 use App\Service\ReportExport\TimeEntriesDetailedExport;
 use App\Service\ReportExport\TimeEntriesReportExport;
@@ -182,7 +180,6 @@ class TimeEntryController extends Controller
         }
         $user = $this->user();
         $timezone = $user->timezone;
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
         $timeEntriesQuery->with([
@@ -195,7 +192,6 @@ class TimeEntryController extends Controller
         $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
-        $localizationService = LocalizationService::forOrganization($organization);
         if ($format === ExportFormat::CSV) {
             $export = new TimeEntriesDetailedCsvExport(config('filesystems.private'), $folderPath, $filename, $timeEntriesQuery, 1000, $timezone);
             $export->export();
@@ -215,8 +211,7 @@ class TimeEntryController extends Controller
                 $user->week_start,
                 false,
                 null,
-                null,
-                $showBillableRate
+                null
             );
             $html = Blade::render($viewFile, [
                 'timeEntries' => $timeEntriesQuery->get(),
@@ -225,7 +220,6 @@ class TimeEntryController extends Controller
                 'currency' => $organization->currency,
                 'start' => $request->getStart()->timezone($timezone),
                 'end' => $request->getEnd()->timezone($timezone),
-                'localization' => $localizationService,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf-footer.blade.php'));
             if ($footerViewFile === false) {
@@ -260,7 +254,7 @@ class TimeEntryController extends Controller
                 ->putFileAs($folderPath, new File($tempFolder->path($filenameTemp)), $filename);
         } else {
             Excel::store(
-                new TimeEntriesDetailedExport($timeEntriesQuery, $format, $timezone, $localizationService),
+                new TimeEntriesDetailedExport($timeEntriesQuery, $format, $timezone),
                 $path,
                 config('filesystems.private'),
                 $format->getExportPackageType(),
@@ -291,18 +285,18 @@ class TimeEntryController extends Controller
      *          grouped_data: null|array<array{
      *              key: string|null,
      *              seconds: int,
-     *              cost: int|null,
+     *              cost: int,
      *              grouped_type: string|null,
      *              grouped_data: null|array<array{
      *                  key: string|null,
      *                  seconds: int,
-     *                  cost: int|null,
+     *                  cost: int,
      *                  grouped_type: null,
      *                  grouped_data: null
      *              }>
      *          }>,
      *          seconds: int,
-     *          cost: int|null
+     *          cost: int
      *      }
      * }
      *
@@ -318,7 +312,6 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:view:all');
         }
         $user = $this->user();
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
@@ -332,8 +325,7 @@ class TimeEntryController extends Controller
             $user->week_start,
             $request->getFillGapsInTimeGroups(),
             $request->getStart(),
-            $request->getEnd(),
-            $showBillableRate
+            $request->getEnd()
         );
 
         return [
@@ -367,7 +359,6 @@ class TimeEntryController extends Controller
         }
         $debug = $request->getDebug();
         $user = $this->user();
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();
@@ -381,8 +372,7 @@ class TimeEntryController extends Controller
             $user->week_start,
             false,
             $request->getStart(),
-            $request->getEnd(),
-            $showBillableRate
+            $request->getEnd()
         );
         $dataHistoryChart = $timeEntryAggregationService->getAggregatedTimeEntries(
             $timeEntriesAggregateQuery->clone(),
@@ -392,12 +382,10 @@ class TimeEntryController extends Controller
             $user->week_start,
             true,
             $request->getStart(),
-            $request->getEnd(),
-            $showBillableRate
+            $request->getEnd()
         );
         $currency = $organization->currency;
         $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
-        $localizationService = LocalizationService::forOrganization($organization);
 
         $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
@@ -423,11 +411,9 @@ class TimeEntryController extends Controller
                 'currency' => $currency,
                 'group' => $group,
                 'subGroup' => $subGroup,
-                'timezone' => $timezone,
                 'start' => $request->getStart()->timezone($timezone),
                 'end' => $request->getEnd()->timezone($timezone),
                 'debug' => $debug,
-                'localization' => $localizationService,
             ]);
             $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf-footer.blade.php'));
             if ($footerViewFile === false) {

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

@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Resources\V1\User\UserResource;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserController extends Controller
 {
@@ -18,7 +19,7 @@ class UserController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function me(): UserResource
+    public function me(): JsonResource
     {
         $user = $this->user();
 

app/Http/Controllers/Web/DashboardController.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
-use App\Enums\Role;
 use App\Service\DashboardService;
 use App\Service\PermissionStore;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -20,14 +19,30 @@ class DashboardController extends Controller
     {
         $user = $this->user();
         $organization = $this->currentOrganization();
+        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
+        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
+        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
+        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
+        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
+        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
+        $latestTasks = $dashboardService->latestTasks($user, $organization);
+        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
 
         $latestTeamActivity = null;
         if ($permissionStore->has($organization, 'time-entries:view:all')) {
             $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
         }
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
-        return Inertia::render('Dashboard');
+        return Inertia::render('Dashboard', [
+            'weeklyProjectOverview' => $weeklyProjectOverview,
+            'latestTasks' => $latestTasks,
+            'lastSevenDays' => $lastSevenDays,
+            'latestTeamActivity' => $latestTeamActivity,
+            'dailyTrackedHours' => $dailyTrackedHours,
+            'totalWeeklyTime' => $totalWeeklyTime,
+            'totalWeeklyBillableTime' => $totalWeeklyBillableTime,
+            'totalWeeklyBillableAmount' => $totalWeeklyBillableAmount,
+            'weeklyHistory' => $weeklyHistory,
+        ]);
     }
 }

app/Http/Middleware/HandleInertiaRequests.php

@@ -40,7 +40,6 @@ class HandleInertiaRequests extends Middleware
     public function share(Request $request): array
     {
         $hasBilling = Module::has('Billing') && Module::isEnabled('Billing');
-        $hasInvoicing = Module::has('Invoicing') && Module::isEnabled('Invoicing');
 
         /** @var BillingContract $billing */
         $billing = app(BillingContract::class);
@@ -49,7 +48,6 @@ class HandleInertiaRequests extends Middleware
 
         return array_merge(parent::share($request), [
             'has_billing_extension' => $hasBilling,
-            'has_invoicing_extension' => $hasInvoicing,
             'billing' => $billing !== null && $currentOrganization !== null ? [
                 'has_subscription' => $billing->hasSubscription($currentOrganization),
                 'has_trial' => $billing->hasTrial($currentOrganization),

app/Http/Requests/V1/ApiToken/ApiTokenStoreRequest.php

@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ApiToken;
 
-use App\Http\Requests\V1\BaseFormRequest;
+use Illuminate\Foundation\Http\FormRequest;
 
-class ApiTokenStoreRequest extends BaseFormRequest
+class ApiTokenStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/BaseFormRequest.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class BaseFormRequest extends FormRequest
-{
-
-    /**
-     * @param bool $bigInt
-     * @return list<string>
-     */
-    protected function moneyRules(bool $bigInt = false): array
-    {
-        $rules = [
-            'integer',
-            'min:0',
-        ];
-        if ($bigInt) {
-            $rules[] = 'max:9223372036854775807';
-        } else {
-            $rules[] = 'max:2147483647';
-        }
-
-        return $rules;
-    }
-}

app/Http/Requests/V1/Client/ClientIndexRequest.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Client;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
-class ClientIndexRequest extends BaseFormRequest
+class ClientIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Client/ClientStoreRequest.php

@@ -4,17 +4,17 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Client;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ClientStoreRequest extends BaseFormRequest
+class ClientStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Client/ClientUpdateRequest.php

@@ -4,18 +4,18 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Client;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  * @property Client|null $client Client from model binding
  */
-class ClientUpdateRequest extends BaseFormRequest
+class ClientUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Import/ImportRequest.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Import;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
-class ImportRequest extends BaseFormRequest
+class ImportRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Invitation/InvitationIndexRequest.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Invitation;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * @property Organization $organization
  */
-class InvitationIndexRequest extends BaseFormRequest
+class InvitationIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Invitation/InvitationStoreRequest.php

@@ -5,18 +5,18 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\Invitation;
 
 use App\Enums\Role;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization
  */
-class InvitationStoreRequest extends BaseFormRequest
+class InvitationStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Member/MemberIndexRequest.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Member;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * @property Organization $organization
  */
-class MemberIndexRequest extends BaseFormRequest
+class MemberIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Member/MemberMergeIntoRequest.php

@@ -4,17 +4,17 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Member;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization
  */
-class MemberMergeIntoRequest extends BaseFormRequest
+class MemberMergeIntoRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Member/MemberUpdateRequest.php

@@ -5,15 +5,15 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\Member;
 
 use App\Enums\Role;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
 /**
  * @property Organization $organization
  */
-class MemberUpdateRequest extends BaseFormRequest
+class MemberUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -27,12 +27,12 @@ class MemberUpdateRequest extends BaseFormRequest
                 'string',
                 Rule::enum(Role::class),
             ],
-            'billable_rate' => array_merge(
-                [
-                    'nullable',
-                ],
-                $this->moneyRules()
-            ),
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
         ];
     }
 

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -4,98 +4,44 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Organization;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
-use Illuminate\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class OrganizationUpdateRequest extends BaseFormRequest
+class OrganizationUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|ValidationRule>>
      */
     public function rules(): array
     {
         return [
             'name' => [
+                'required',
                 'string',
                 'max:255',
             ],
-            'billable_rate' => array_merge(
-                [
-                    'nullable',
-                ],
-                $this->moneyRules()
-            ),
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
-            'number_format' => [
-                Rule::enum(NumberFormat::class),
-            ],
-            'currency_format' => [
-                Rule::enum(CurrencyFormat::class),
-            ],
-            'date_format' => [
-                Rule::enum(DateFormat::class),
-            ],
-            'interval_format' => [
-                Rule::enum(IntervalFormat::class),
-            ],
-            'time_format' => [
-                Rule::enum(TimeFormat::class),
-            ],
         ];
     }
 
-    public function getName(): ?string
-    {
-        return $this->has('name') ? (string) $this->input('name') : null;
-    }
-
-    public function getNumberFormat(): ?NumberFormat
-    {
-        return $this->has('number_format') ? NumberFormat::from($this->input('number_format')) : null;
-    }
-
-    public function getCurrencyFormat(): ?CurrencyFormat
-    {
-        return $this->has('currency_format') ? CurrencyFormat::from($this->input('currency_format')) : null;
-    }
-
-    public function getDateFormat(): ?DateFormat
-    {
-        return $this->has('date_format') ? DateFormat::from($this->input('date_format')) : null;
-    }
-
-    public function getIntervalFormat(): ?IntervalFormat
-    {
-        return $this->has('interval_format') ? IntervalFormat::from($this->input('interval_format')) : null;
-    }
-
-    public function getTimeFormat(): ?TimeFormat
-    {
-        return $this->has('time_format') ? TimeFormat::from($this->input('time_format')) : null;
-    }
-
     public function getBillableRate(): ?int
     {
         $input = $this->input('billable_rate');
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
-
-    public function getEmployeesCanSeeBillableRates(): ?bool
-    {
-        return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
-    }
 }

app/Http/Requests/V1/Project/ProjectIndexRequest.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Project;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
-class ProjectIndexRequest extends BaseFormRequest
+class ProjectIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Project/ProjectStoreRequest.php

@@ -4,21 +4,20 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Project;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Str;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ProjectStoreRequest extends BaseFormRequest
+class ProjectStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -28,7 +27,6 @@ class ProjectStoreRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
-            // Name of the project, the name needs to be unique per client and organization
             'name' => [
                 'required',
                 'string',
@@ -36,13 +34,7 @@ class ProjectStoreRequest extends BaseFormRequest
                 'max:255',
                 UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
-                    $clientId = $this->input('client_id');
-                    if (! is_string($clientId) || ! Str::isUuid($clientId)) {
-                        $clientId = null;
-                    }
-
-                    return $builder->whereBelongsTo($this->organization, 'organization')
-                        ->where('client_id', $clientId);
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 })->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
@@ -55,15 +47,14 @@ class ProjectStoreRequest extends BaseFormRequest
                 'required',
                 'boolean',
             ],
-            'billable_rate' => array_merge(
-                [
-                    'nullable',
-                ],
-                $this->moneyRules()
-            ),
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
             // ID of the client
             'client_id' => [
-                'present',
                 'nullable',
                 ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */

app/Http/Requests/V1/Project/ProjectUpdateRequest.php

@@ -4,14 +4,13 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Project;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Str;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
@@ -19,7 +18,7 @@ use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
  * @property Organization $organization Organization from model binding
  * @property Project|null $project Project from model binding
  */
-class ProjectUpdateRequest extends BaseFormRequest
+class ProjectUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -35,13 +34,7 @@ class ProjectUpdateRequest extends BaseFormRequest
                 'max:255',
                 UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
-                    $clientId = $this->input('client_id');
-                    if (! is_string($clientId) || ! Str::isUuid($clientId)) {
-                        $clientId = null;
-                    }
-
-                    return $builder->whereBelongsTo($this->organization, 'organization')
-                        ->where('client_id', $clientId);
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 })->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
@@ -61,18 +54,18 @@ class ProjectUpdateRequest extends BaseFormRequest
                 'boolean',
             ],
             'client_id' => [
-                'present',
                 'nullable',
                 ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
                 })->uuid(),
             ],
-            'billable_rate' => array_merge([
+            'billable_rate' => [
                 'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
             ],
-                $this->moneyRules()
-            ),
             // Estimated time in seconds
             'estimated_time' => [
                 'nullable',

app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php

@@ -4,17 +4,17 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ProjectMemberStoreRequest extends BaseFormRequest
+class ProjectMemberStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -31,12 +31,12 @@ class ProjectMemberStoreRequest extends BaseFormRequest
                     return $builder->whereBelongsTo($this->organization, 'organization');
                 })->uuid(),
             ],
-            'billable_rate' => array_merge(
-                [
-                    'nullable',
-                ],
-                $this->moneyRules()
-            ),
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
         ];
     }
 

app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ProjectMemberUpdateRequest extends BaseFormRequest
+class ProjectMemberUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -21,12 +21,12 @@ class ProjectMemberUpdateRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
-            'billable_rate' => array_merge(
-                [
-                    'nullable',
-                ],
-                $this->moneyRules()
-            ),
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
         ];
     }
 

app/Http/Requests/V1/Report/ReportStoreRequest.php

@@ -7,17 +7,17 @@ namespace App\Http\Requests\V1\Report;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\Weekday;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\Rule as LegacyValidationRule;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ReportStoreRequest extends BaseFormRequest
+class ReportStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -40,7 +40,7 @@ class ReportStoreRequest extends BaseFormRequest
                 'required',
                 'boolean',
             ],
-            // After this date the report will be automatically set to private (is_public=false) (Format: "Y-m-d\TH:i:s\Z", UTC timezone, Example: "2000-02-22T14:58:59Z")
+            // After this date the report will be automatically set to private (is_public=false) (ISO 8601 format, UTC timezone)
             'public_until' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i:s\Z',

app/Http/Requests/V1/Report/ReportUpdateRequest.php

@@ -4,15 +4,15 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Report;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class ReportUpdateRequest extends BaseFormRequest
+class ReportUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Tag/TagStoreRequest.php

@@ -4,17 +4,17 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Tag;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\Tag;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TagStoreRequest extends BaseFormRequest
+class TagStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Tag/TagUpdateRequest.php

@@ -4,18 +4,18 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Tag;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\Tag;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  * @property Tag|null $tag Tag from model binding
  */
-class TagUpdateRequest extends BaseFormRequest
+class TagUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Task/TaskIndexRequest.php

@@ -4,19 +4,19 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Task;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Service\PermissionStore;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TaskIndexRequest extends BaseFormRequest
+class TaskIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Task/TaskStoreRequest.php

@@ -4,19 +4,19 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Task;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TaskStoreRequest extends BaseFormRequest
+class TaskStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/Task/TaskUpdateRequest.php

@@ -4,18 +4,18 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Task;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  * @property Task|null $task Task from model binding
  */
-class TaskUpdateRequest extends BaseFormRequest
+class TaskUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php

@@ -7,7 +7,6 @@ namespace App\Http\Requests\V1\TimeEntry;
 use App\Enums\ExportFormat;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
@@ -17,6 +16,7 @@ use App\Models\Task;
 use App\Models\User;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
@@ -24,7 +24,7 @@ use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 /**
  * @property Organization $organization
  */
-class TimeEntryAggregateExportRequest extends BaseFormRequest
+class TimeEntryAggregateExportRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\TimeEntryAggregationType;
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
@@ -15,6 +14,7 @@ use App\Models\Task;
 use App\Models\User;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
@@ -22,7 +22,7 @@ use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 /**
  * @property Organization $organization
  */
-class TimeEntryAggregateRequest extends BaseFormRequest
+class TimeEntryAggregateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryDestroyMultipleRequest.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TimeEntryDestroyMultipleRequest extends BaseFormRequest
+class TimeEntryDestroyMultipleRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
@@ -13,12 +12,13 @@ use App\Models\Tag;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization
  */
-class TimeEntryIndexRequest extends BaseFormRequest
+class TimeEntryIndexRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -12,12 +11,13 @@ use App\Models\Tag;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TimeEntryStoreRequest extends BaseFormRequest
+class TimeEntryStoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -59,12 +59,12 @@ class TimeEntryStoreRequest extends BaseFormRequest
                         ->where('project_id', $this->input('project_id'));
                 })->uuid()->withMessage(__('validation.task_belongs_to_project')),
             ],
-            // Start of time entry (Format: "Y-m-d\TH:i:s\Z", UTC timezone, Example: "2000-02-22T14:58:59Z")
+            // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
                 'required',
                 'date_format:Y-m-d\TH:i:s\Z',
             ],
-            // End of time entry (Format: "Y-m-d\TH:i:s\Z", UTC timezone, Example: "2000-02-22T14:58:59Z")
+            // End of time entry (ISO 8601 format, UTC timezone)
             'end' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i:s\Z',

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -12,12 +11,13 @@ use App\Models\Tag;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TimeEntryUpdateMultipleRequest extends BaseFormRequest
+class TimeEntryUpdateMultipleRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -12,12 +11,13 @@ use App\Models\Tag;
 use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
  */
-class TimeEntryUpdateRequest extends BaseFormRequest
+class TimeEntryUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -59,11 +59,11 @@ class TimeEntryUpdateRequest extends BaseFormRequest
                         ->where('project_id', $this->input('project_id'));
                 })->uuid()->withMessage(__('validation.task_belongs_to_project')),
             ],
-            // Start of time entry (Format: "Y-m-d\TH:i:s\Z", UTC timezone, Example: "2000-02-22T14:58:59Z")
+            // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
                 'date_format:Y-m-d\TH:i:s\Z',
             ],
-            // End of time entry (Format: "Y-m-d\TH:i:s\Z", UTC timezone, Example: "2000-02-22T14:58:59Z")
+            // End of time entry (ISO 8601 format, UTC timezone)
             'end' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i:s\Z',

app/Http/Resources/V1/BaseResource.php

@@ -12,10 +12,6 @@ abstract class BaseResource extends JsonResource
     protected function formatDateTime(?Carbon $carbon): ?string
     {
         return $carbon?->toIso8601ZuluString();
-    }
 
-    protected function formatDate(?Carbon $carbon): ?string
-    {
-        return $carbon?->format('Y-m-d');
     }
 }

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -4,14 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Resources\V1\Organization;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Http\Resources\V1\BaseResource;
 use App\Models\Organization;
-use App\Service\CurrencyService;
 use Illuminate\Http\Request;
 
 /**
@@ -40,8 +34,6 @@ class OrganizationResource extends BaseResource
      */
     public function toArray(Request $request): array
     {
-        $currencyService = app(CurrencyService::class);
-
         return [
             /** @var string $id ID */
             'id' => $this->resource->id,
@@ -55,18 +47,6 @@ class OrganizationResource extends BaseResource
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
-            /** @var string $currency_symbol Currency symbol */
-            'currency_symbol' => $currencyService->getCurrencySymbol($this->resource->currency),
-            /** @var NumberFormat $number_format Number format */
-            'number_format' => $this->resource->number_format->value,
-            /** @var CurrencyFormat $currency_format Currency format */
-            'currency_format' => $this->resource->currency_format->value,
-            /** @var DateFormat $date_format Date format */
-            'date_format' => $this->resource->date_format->value,
-            /** @var IntervalFormat $interval_format Interval format */
-            'interval_format' => $this->resource->interval_format->value,
-            /** @var TimeFormat $time_format Time format */
-            'time_format' => $this->resource->time_format->value,
         ];
     }
 }

app/Http/Resources/V1/Report/DetailedReportResource.php

@@ -30,7 +30,7 @@ class DetailedReportResource extends BaseResource
             /** @var bool $is_public Whether the report can be accessed via an external link */
             'is_public' => $this->resource->is_public,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->formatDateTime($this->resource->public_until),
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
             /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
             'shareable_link' => $this->resource->getShareableLink(),
             'properties' => [
@@ -41,9 +41,9 @@ class DetailedReportResource extends BaseResource
                 /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
                 'history_group' => $this->resource->properties->historyGroup->value,
                 /** @var string $start Start date of the report */
-                'start' => $this->formatDateTime($this->resource->properties->start),
+                'start' => $this->resource->properties->start->toIso8601ZuluString(),
                 /** @var string $end End date of the report */
-                'end' => $this->formatDateTime($this->resource->properties->end),
+                'end' => $this->resource->properties->end->toIso8601ZuluString(),
                 /** @var bool|null $active Whether the report is active */
                 'active' => $this->resource->properties->active,
                 /** @var array<string>|null $member_ids Filter by multiple member IDs, member IDs are OR combined */
@@ -60,9 +60,9 @@ class DetailedReportResource extends BaseResource
                 'task_ids' => $this->resource->properties->taskIds?->toArray(),
             ],
             /** @var string $created_at Date when the report was created */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
+            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
             /** @var string $updated_at Date when the report was last updated */
-            'updated_at' => $this->formatDateTime($this->resource->updated_at),
+            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
         ];
     }
 }

app/Http/Resources/V1/Report/DetailedWithDataReportResource.php

@@ -4,14 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Resources\V1\Report;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Http\Resources\V1\BaseResource;
 use App\Models\Report;
-use App\Service\CurrencyService;
 use Illuminate\Http\Request;
 
 /**
@@ -24,20 +18,20 @@ use Illuminate\Http\Request;
  *              description: string|null,
  *              color: string|null,
  *              seconds: int,
- *              cost: int|null,
+ *              cost: int,
  *              grouped_type: string|null,
  *              grouped_data: null|array<array{
  *                  key: string|null,
  *                  description: string|null,
  *                  color: string|null,
  *                  seconds: int,
- *                  cost: int|null,
+ *                  cost: int,
  *                  grouped_type: null,
  *                  grouped_data: null
  *              }>
  *          }>,
  *          seconds: int,
- *          cost: int|null
+ *          cost: int
  *    }
  */
 class DetailedWithDataReportResource extends BaseResource
@@ -70,29 +64,15 @@ class DetailedWithDataReportResource extends BaseResource
      */
     public function toArray(Request $request): array
     {
-        $currencyService = app(CurrencyService::class);
-
         return [
             /** @var string $name Name */
             'name' => $this->resource->name,
             /** @var string|null $email Description */
             'description' => $this->resource->description,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->formatDateTime($this->resource->public_until),
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->organization->currency,
-            /** @var NumberFormat $number_format Number format */
-            'number_format' => $this->resource->organization->number_format->value,
-            /** @var CurrencyFormat $currency_format Currency format */
-            'currency_format' => $this->resource->organization->currency_format->value,
-            /** @var string $currency_symbol Currency symbol */
-            'currency_symbol' => $currencyService->getCurrencySymbol($this->resource->organization->currency),
-            /** @var DateFormat $date_format Date format */
-            'date_format' => $this->resource->organization->date_format->value,
-            /** @var IntervalFormat $interval_format Interval format */
-            'interval_format' => $this->resource->organization->interval_format->value,
-            /** @var TimeFormat $time_format Time format */
-            'time_format' => $this->resource->organization->time_format->value,
             'properties' => [
                 /** @var string $group Type of first grouping */
                 'group' => $this->resource->properties->group->value,
@@ -101,9 +81,9 @@ class DetailedWithDataReportResource extends BaseResource
                 /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
                 'history_group' => $this->resource->properties->historyGroup->value,
                 /** @var string $start Start date of the report */
-                'start' => $this->formatDateTime($this->resource->properties->start),
+                'start' => $this->resource->properties->start->toIso8601ZuluString(),
                 /** @var string $end End date of the report */
-                'end' => $this->formatDateTime($this->resource->properties->end),
+                'end' => $this->resource->properties->end->toIso8601ZuluString(),
             ],
             /** @var array{
              *        grouped_type: string|null,

app/Http/Resources/V1/Report/ReportResource.php

@@ -30,13 +30,13 @@ class ReportResource extends BaseResource
             /** @var bool $is_public Whether the report can be accessed via an external link */
             'is_public' => $this->resource->is_public,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->formatDateTime($this->resource->public_until),
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
             /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
             'shareable_link' => $this->resource->getShareableLink(),
             /** @var string $created_at Date when the report was created */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
+            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
             /** @var string $updated_at Date when the report was last updated */
-            'updated_at' => $this->formatDateTime($this->resource->updated_at),
+            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
         ];
     }
 }

app/Models/Organization.php

@@ -4,11 +4,6 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationFactory;
@@ -23,6 +18,7 @@ use Illuminate\Support\Str;
 use Laravel\Jetstream\Events\TeamCreated;
 use Laravel\Jetstream\Events\TeamDeleted;
 use Laravel\Jetstream\Events\TeamUpdated;
+use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Team as JetstreamTeam;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
@@ -41,11 +37,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property Collection<int, User> $realUsers
  * @property-read Collection<int, OrganizationInvitation> $teamInvitations
  * @property Member $membership
- * @property NumberFormat $number_format
- * @property CurrencyFormat $currency_format
- * @property DateFormat $date_format
- * @property IntervalFormat $interval_format
- * @property TimeFormat $time_format
  *
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()
@@ -69,11 +60,6 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
-        'number_format' => NumberFormat::class,
-        'currency_format' => CurrencyFormat::class,
-        'date_format' => DateFormat::class,
-        'interval_format' => IntervalFormat::class,
-        'time_format' => TimeFormat::class,
     ];
 
     /**
@@ -103,6 +89,7 @@ class Organization extends JetstreamTeam implements AuditableContract
      * @var array<string, mixed>
      */
     protected $attributes = [
+        'currency' => 'EUR',
     ];
 
     /**

app/Providers/JetstreamServiceProvider.php

@@ -80,8 +80,6 @@ class JetstreamServiceProvider extends ServiceProvider
         Jetstream::defaultApiTokenPermissions([]);
 
         Jetstream::role(Role::Owner->value, 'Owner', [
-            'charts:view:own',
-            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -133,18 +131,9 @@ class JetstreamServiceProvider extends ServiceProvider
             'reports:create',
             'reports:update',
             'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
         ])->description('Owner users can perform any action. There is only one owner per organization.');
 
         Jetstream::role(Role::Admin->value, 'Administrator', [
-            'charts:view:own',
-            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -184,26 +173,16 @@ class JetstreamServiceProvider extends ServiceProvider
             'invitations:resend',
             'invitations:remove',
             'members:view',
-            'members:invite-placeholder',
-            'members:make-placeholder',
-            'members:merge-into',
             'members:update',
+            'members:invite-placeholder',
+            'members:merge-into',
             'reports:view',
             'reports:create',
             'reports:update',
             'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
         ])->description('Administrator users can perform any action, except accessing the billing dashboard.');
 
         Jetstream::role(Role::Manager->value, 'Manager', [
-            'charts:view:own',
-            'charts:view:all',
             'projects:view',
             'projects:view:all',
             'projects:create',
@@ -241,17 +220,9 @@ class JetstreamServiceProvider extends ServiceProvider
             'reports:create',
             'reports:update',
             'reports:delete',
-            'invoices:view',
-            'invoices:create',
-            'invoices:update',
-            'invoices:download',
-            'invoices:delete',
-            'invoice-settings:view',
-            'invoice-settings:update',
         ])->description('Managers have full access to all projects, time entries, ect. but cannot manage the organization (add/remove member, edit the organization, ect.).');
 
         Jetstream::role(Role::Employee->value, 'Employee', [
-            'charts:view:own',
             'projects:view',
             'tags:view',
             'tasks:view',

app/Service/CurrencyService.php

@@ -1,377 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use Brick\Money\Money;
-
-class CurrencyService
-{
-    /**
-     * @source https://gist.github.com/stephenfrank/a8245c2486f3e546107c5363706ac93e
-     *
-     * @const array<string, array<{ symbol: string }>>
-     */
-    private const array CURRENCIES = [
-        'ALL' => [
-            'symbol' => 'L',
-        ],
-        'AFN' => [
-            'symbol' => '؋',
-        ],
-        'ARS' => [
-            'symbol' => '$',
-        ],
-        'AWG' => [
-            'symbol' => 'ƒ',
-        ],
-        'AUD' => [
-            'symbol' => '$',
-        ],
-        'AZN' => [
-            'symbol' => '₼',
-        ],
-        'BSD' => [
-            'symbol' => '$',
-        ],
-        'BBD' => [
-            'symbol' => '$',
-        ],
-        'BDT' => [
-            'symbol' => '৳',
-        ],
-        'BYR' => [
-            'symbol' => 'Br',
-        ],
-        'BZD' => [
-            'symbol' => 'BZ$',
-        ],
-        'BMD' => [
-            'symbol' => '$',
-        ],
-        'BOB' => [
-            'symbol' => '$b',
-        ],
-        'BAM' => [
-            'symbol' => 'KM',
-        ],
-        'BWP' => [
-            'symbol' => 'P',
-        ],
-        'BGN' => [
-            'symbol' => 'лв',
-        ],
-        'BRL' => [
-            'symbol' => 'R$',
-        ],
-        'BND' => [
-            'symbol' => '$',
-        ],
-        'KHR' => [
-            'symbol' => '៛',
-        ],
-        'CAD' => [
-            'symbol' => '$',
-        ],
-        'KYD' => [
-            'symbol' => '$',
-        ],
-        'CLP' => [
-            'symbol' => '$',
-        ],
-        'CNY' => [
-            'symbol' => '¥',
-        ],
-        'COP' => [
-            'symbol' => '$',
-        ],
-        'CRC' => [
-            'symbol' => '₡',
-        ],
-        'HRK' => [
-            'symbol' => 'kn',
-        ],
-        'CUP' => [
-            'symbol' => '₱',
-        ],
-        'CZK' => [
-            'symbol' => 'Kč',
-        ],
-        'DKK' => [
-            'symbol' => 'kr',
-        ],
-        'DOP' => [
-            'symbol' => 'RD$',
-        ],
-        'XCD' => [
-            'symbol' => '$',
-        ],
-        'EGP' => [
-            'symbol' => '£',
-        ],
-        'SVC' => [
-            'symbol' => '$',
-        ],
-        'EEK' => [
-            'symbol' => 'kr',
-        ],
-        'EUR' => [
-            'symbol' => '€',
-        ],
-        'FKP' => [
-            'symbol' => '£',
-        ],
-        'FJD' => [
-            'symbol' => '$',
-        ],
-        'GHC' => [
-            'symbol' => '₵',
-        ],
-        'GIP' => [
-            'symbol' => '£',
-        ],
-        'GTQ' => [
-            'symbol' => 'Q',
-        ],
-        'GGP' => [
-            'symbol' => '£',
-        ],
-        'GYD' => [
-            'symbol' => '$',
-        ],
-        'HNL' => [
-            'symbol' => 'L',
-        ],
-        'HKD' => [
-            'symbol' => '$',
-        ],
-        'HUF' => [
-            'symbol' => 'Ft',
-        ],
-        'ISK' => [
-            'symbol' => 'kr',
-        ],
-        'INR' => [
-            'symbol' => '₹',
-        ],
-        'IDR' => [
-            'symbol' => 'Rp',
-        ],
-        'IRR' => [
-            'symbol' => '﷼',
-        ],
-        'IMP' => [
-            'symbol' => '£',
-        ],
-        'ILS' => [
-            'symbol' => '₪',
-        ],
-        'JMD' => [
-            'symbol' => 'J$',
-        ],
-        'JPY' => [
-            'symbol' => '¥',
-        ],
-        'JEP' => [
-            'symbol' => '£',
-        ],
-        'KZT' => [
-            'symbol' => 'лв',
-        ],
-        'KPW' => [
-            'symbol' => '₩',
-        ],
-        'KRW' => [
-            'symbol' => '₩',
-        ],
-        'KGS' => [
-            'symbol' => 'лв',
-        ],
-        'LAK' => [
-            'symbol' => '₭',
-        ],
-        'LVL' => [
-            'symbol' => 'Ls',
-        ],
-        'LBP' => [
-            'symbol' => '£',
-        ],
-        'LRD' => [
-            'symbol' => '$',
-        ],
-        'LTL' => [
-            'symbol' => 'Lt',
-        ],
-        'MKD' => [
-            'symbol' => 'ден',
-        ],
-        'MYR' => [
-            'symbol' => 'RM',
-        ],
-        'MUR' => [
-            'symbol' => '₨',
-        ],
-        'MXN' => [
-            'symbol' => '$',
-        ],
-        'MNT' => [
-            'symbol' => '₮',
-        ],
-        'MZN' => [
-            'symbol' => 'MT',
-        ],
-        'NAD' => [
-            'symbol' => '$',
-        ],
-        'NPR' => [
-            'symbol' => '₨',
-        ],
-        'ANG' => [
-            'symbol' => 'ƒ',
-        ],
-        'NZD' => [
-            'symbol' => '$',
-        ],
-        'NIO' => [
-            'symbol' => 'C$',
-        ],
-        'NGN' => [
-            'symbol' => '₦',
-        ],
-        'NOK' => [
-            'symbol' => 'kr',
-        ],
-        'OMR' => [
-            'symbol' => '﷼',
-        ],
-        'PKR' => [
-            'symbol' => '₨',
-        ],
-        'PAB' => [
-            'symbol' => 'B/.',
-        ],
-        'PYG' => [
-            'symbol' => 'Gs',
-        ],
-        'PEN' => [
-            'symbol' => 'S/.',
-        ],
-        'PHP' => [
-            'symbol' => '₱',
-        ],
-        'PLN' => [
-            'symbol' => 'zł',
-        ],
-        'QAR' => [
-            'symbol' => '﷼',
-        ],
-        'RON' => [
-            'symbol' => 'lei',
-        ],
-        'RUB' => [
-            'symbol' => '₽',
-        ],
-        'SHP' => [
-            'symbol' => '£',
-        ],
-        'SAR' => [
-            'symbol' => '﷼',
-        ],
-        'RSD' => [
-            'symbol' => 'Дин.',
-        ],
-        'SCR' => [
-            'symbol' => '₨',
-        ],
-        'SGD' => [
-            'symbol' => '$',
-        ],
-        'SBD' => [
-            'symbol' => '$',
-        ],
-        'SOS' => [
-            'symbol' => 'S',
-        ],
-        'ZAR' => [
-            'symbol' => 'R',
-        ],
-        'LKR' => [
-            'symbol' => '₨',
-        ],
-        'SEK' => [
-            'symbol' => 'kr',
-        ],
-        'CHF' => [
-            'symbol' => 'CHF',
-        ],
-        'SRD' => [
-            'symbol' => '$',
-        ],
-        'SYP' => [
-            'symbol' => '£',
-        ],
-        'TWD' => [
-            'symbol' => 'NT$',
-        ],
-        'THB' => [
-            'symbol' => '฿',
-        ],
-        'TTD' => [
-            'symbol' => 'TT$',
-        ],
-        'TRY' => [
-            'symbol' => '₺',
-        ],
-        'TRL' => [
-            'symbol' => '₤',
-        ],
-        'TVD' => [
-            'symbol' => '$',
-        ],
-        'UAH' => [
-            'symbol' => '₴',
-        ],
-        'GBP' => [
-            'symbol' => '£',
-        ],
-        'UGX' => [
-            'symbol' => 'USh',
-        ],
-        'USD' => [
-            'symbol' => '$',
-        ],
-        'UYU' => [
-            'symbol' => '$U',
-        ],
-        'UZS' => [
-            'symbol' => 'лв',
-        ],
-        'VEF' => [
-            'symbol' => 'Bs',
-        ],
-        'VND' => [
-            'symbol' => '₫',
-        ],
-        'YER' => [
-            'symbol' => '﷼',
-        ],
-        'ZWD' => [
-            'symbol' => 'Z$',
-        ],
-    ];
-
-    public function getCurrencySymbolForMoney(Money $money): string
-    {
-        return $this->getCurrencySymbol($money->getCurrency()->getCurrencyCode());
-    }
-
-    public function getCurrencySymbol(string $currencyCode): string
-    {
-        if (isset(self::CURRENCIES[$currencyCode]['symbol'])) {
-            return self::CURRENCIES[$currencyCode]['symbol'];
-        }
-
-        return $currencyCode;
-    }
-}

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -37,9 +37,9 @@ class ClockifyProjectsImporter extends DefaultImporter
                 if ($record['Project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
+                        'client_id' => $clientId,
                         'color' => $this->colorService->getRandomColor(),
                         'is_billable' => $record['Billability'] === 'Yes',
                         'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -83,9 +83,9 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 if ($record['Project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
+                        'client_id' => $clientId,
                         'color' => $this->colorService->getRandomColor(),
                         'is_billable' => false,
                     ]);
@@ -124,59 +124,34 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 $timeEntry->is_imported = true;
 
                 // Start
-                $start = null;
                 try {
-                    $startDateStr = $record['Start Date'];
-                    $startTimeStr = $record['Start Time'];
-                    $startStr = $startDateStr.' '.$startTimeStr;
-                    $matches = [];
-                    $checkResult = preg_match('/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4}) ([0-9]{1,2}):([0-9]{1,2})(:[0-9]{1,2})? (AM|PM)$/', $startStr, $matches);
-
-                    if ($checkResult === 1) {
-                        if ((int) $matches[1] > 12) {
-                            throw new ImportException('Start date ("'.$startDateStr.'") is invalid, please select the correct date format before exporting from Clockify');
-                        }
-                        if ($matches[6] === '') {
-                            $start = Carbon::createFromFormat('m/d/Y h:i A', $startStr, $timezone);
-                        } else {
-                            $start = Carbon::createFromFormat('m/d/Y H:i:s A', $startStr, $timezone);
-                        }
+                    if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['Start Time']) === 1) {
+                        $start = Carbon::createFromFormat('m/d/Y h:i A', $record['Start Date'].' '.$record['Start Time'], $timezone);
+                    } else {
+                        $start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], $timezone);
                     }
                 } catch (InvalidFormatException) {
-                    throw new ImportException('Start date ("'.$startDateStr.'") or time ("'.$startTimeStr.'") are invalid');
+                    throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
                 }
                 if ($start === null) {
-                    throw new ImportException('Start date ("'.$startDateStr.'") or time ("'.$startTimeStr.'") are invalid');
+                    throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
                 }
                 $timeEntry->start = $start->utc();
 
                 // End
-                $end = null;
                 try {
-                    $endDateStr = $record['End Date'];
-                    $endTimeStr = $record['End Time'];
-                    $endStr = $endDateStr.' '.$endTimeStr;
-                    $matches = [];
-                    $checkResult = preg_match('/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4}) ([0-9]{1,2}):([0-9]{1,2})(:[0-9]{1,2})? (AM|PM)$/', $endStr, $matches);
-
-                    if ($checkResult === 1) {
-                        if ((int) $matches[1] > 12) {
-                            throw new ImportException('Start date ("'.$endDateStr.'") is invalid, please select the correct date format before exporting from Clockify');
-                        }
-                        if ($matches[6] === '') {
-                            $end = Carbon::createFromFormat('m/d/Y h:i A', $endStr, $timezone);
-                        } else {
-                            $end = Carbon::createFromFormat('m/d/Y H:i:s A', $endStr, $timezone);
-                        }
+                    if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['End Time']) === 1) {
+                        $end = Carbon::createFromFormat('m/d/Y h:i A', $record['End Date'].' '.$record['End Time'], $timezone);
+                    } else {
+                        $end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], $timezone);
                     }
                 } catch (InvalidFormatException) {
-                    throw new ImportException('End date ("'.$endDateStr.'") or time ("'.$endTimeStr.'") are invalid');
+                    throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
                 }
                 if ($end === null) {
-                    throw new ImportException('End date ("'.$endDateStr.'") or time ("'.$endTimeStr.'") are invalid');
+                    throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
                 }
                 $timeEntry->end = $end->utc();
-
                 $timeEntry->billable_rate = $this->billableRateService->getBillableRateForTimeEntryWithGivenRelations(
                     $timeEntry,
                     $projectMember,

app/Service/Import/Importers/DefaultImporter.php

@@ -97,7 +97,7 @@ abstract class DefaultImporter implements ImporterContract
                 'in:placeholder',
             ],
         ]);
-        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'client_id', 'organization_id'], true, function (Builder $builder) {
+        $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
             /** @var Builder<Project> $builder */
             return $builder->where('organization_id', $this->organization->id);
         }, validate: [
@@ -114,11 +114,6 @@ abstract class DefaultImporter implements ImporterContract
                 'integer',
                 'max:2147483647',
             ],
-            'client_id' => [
-                'nullable',
-                'string',
-                'uuid',
-            ],
         ], beforeSave: function (Project $project): void {
             if ($project->billable_rate === 0) {
                 $project->billable_rate = null;

app/Service/Import/Importers/GenericProjectsImporter.php

@@ -10,7 +10,6 @@ use Exception;
 use Illuminate\Support\Carbon;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
-use Override;
 
 class GenericProjectsImporter extends DefaultImporter
 {
@@ -24,7 +23,7 @@ class GenericProjectsImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[Override]
+    #[\Override]
     public function importData(string $data, string $timezone): void
     {
         try {
@@ -55,12 +54,12 @@ class GenericProjectsImporter extends DefaultImporter
                     }
                     $this->projectImportHelper->getKey([
                         'name' => $record['name'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
                         'color' => isset($record['color']) && $record['color'] !== '' ? $record['color'] : app(ColorService::class)->getRandomColor(),
                         'billable_rate' => isset($record['billable_rate']) && $record['billable_rate'] !== '' ? (int) $record['billable_rate'] : null,
                         'is_public' => isset($record['is_public']) && $record['is_public'] === 'true',
+                        'client_id' => $clientId,
                         'is_billable' => isset($record['billable_default']) && $record['billable_default'] === 'true',
                         'estimated_time' => isset($record['estimated_time']) && $record['estimated_time'] !== '' && is_numeric($record['estimated_time']) && ((int) $record['estimated_time'] !== 0) ? (int) $record['estimated_time'] : null,
                         'archived_at' => $archivedAt,
@@ -91,13 +90,13 @@ class GenericProjectsImporter extends DefaultImporter
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getName(): string
     {
         return __('importer.generic_projects.name');
     }
 
-    #[Override]
+    #[\Override]
     public function getDescription(): string
     {
         return __('importer.generic_projects.description');

app/Service/Import/Importers/GenericTimeEntriesImporter.php

@@ -99,9 +99,9 @@ class GenericTimeEntriesImporter extends DefaultImporter
                 if ($record['project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
+                        'client_id' => $clientId,
                         'is_billable' => false,
                         'color' => $this->colorService->getRandomColor(),
                     ]);

app/Service/Import/Importers/HarvestProjectsImporter.php

@@ -60,10 +60,10 @@ class HarvestProjectsImporter extends DefaultImporter
                     $billableHours = $billableHoursField !== '' && is_numeric($billableHoursField) ? (int) ((float) $billableHoursField) : null;
                     $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
                         'color' => $this->colorService->getRandomColor(),
+                        'client_id' => $clientId,
                         'estimated_time' => $estimatedTime,
                         'is_billable' => $billableHours > 0,
                     ]);

app/Service/Import/Importers/HarvestTimeEntriesImporter.php

@@ -78,9 +78,9 @@ class HarvestTimeEntriesImporter extends DefaultImporter
                 if ($record['Project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
+                        'client_id' => $clientId,
                         'color' => $this->colorService->getRandomColor(),
                         'is_billable' => true,
                     ]);

app/Service/Import/Importers/SolidtimeImporter.php

@@ -176,12 +176,12 @@ class SolidtimeImporter extends DefaultImporter
 
                 $this->projectImportHelper->getKey([
                     'name' => $project['name'],
-                    'client_id' => $clientId,
                     'organization_id' => $this->organization->getKey(),
                 ], [
                     'color' => $project['color'],
                     'billable_rate' => $project['billable_rate'] === '' ? null : (int) $project['billable_rate'],
                     'is_public' => $project['is_public'] === 'true',
+                    'client_id' => $clientId,
                     'is_billable' => $project['is_billable'] === 'true',
                     'archived_at' => $project['archived_at'] !== '' ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $project['archived_at'], 'UTC') : null,
                 ], $project['id']);

app/Service/Import/Importers/TogglDataImporter.php

@@ -137,9 +137,9 @@ class TogglDataImporter extends DefaultImporter
 
                 $projectId = $this->projectImportHelper->getKey([
                     'name' => $project->name,
-                    'client_id' => $clientId,
                     'organization_id' => $this->organization->getKey(),
                 ], [
+                    'client_id' => $clientId,
                     'color' => $project->color,
                     'is_billable' => $project->billable,
                     'is_public' => ! $project->is_private,

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -83,9 +83,9 @@ class TogglTimeEntriesImporter extends DefaultImporter
                 if ($record['Project'] !== '') {
                     $projectId = $this->projectImportHelper->getKey([
                         'name' => $record['Project'],
-                        'client_id' => $clientId,
                         'organization_id' => $this->organization->id,
                     ], [
+                        'client_id' => $clientId,
                         'is_billable' => false,
                         'color' => $this->colorService->getRandomColor(),
                     ]);

app/Service/LocalizationService.php

@@ -1,155 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
-use App\Models\Organization;
-use Brick\Math\BigDecimal;
-use Brick\Money\Money;
-use Carbon\CarbonInterface;
-use Carbon\CarbonInterval;
-
-class LocalizationService
-{
-    private CurrencyFormat $currencyFormat;
-
-    private IntervalFormat $intervalFormat;
-
-    private DateFormat $dateFormat;
-
-    private TimeFormat $timeFormat;
-
-    private NumberFormat $numberFormat;
-
-    public function __construct(CurrencyFormat $currencyFormat, DateFormat $dateFormat, TimeFormat $timeFormat, NumberFormat $numberFormat, IntervalFormat $intervalFormat)
-    {
-        $this->currencyFormat = $currencyFormat;
-        $this->dateFormat = $dateFormat;
-        $this->timeFormat = $timeFormat;
-        $this->numberFormat = $numberFormat;
-        $this->intervalFormat = $intervalFormat;
-    }
-
-    public static function forOrganization(Organization $organization): self
-    {
-        return new LocalizationService(
-            $organization->currency_format,
-            $organization->date_format,
-            $organization->time_format,
-            $organization->number_format,
-            $organization->interval_format
-        );
-    }
-
-    public function formatNumber(BigDecimal|float $number): string
-    {
-        $numberFloat = $number instanceof BigDecimal ? $number->toFloat() : $number;
-
-        if ($this->numberFormat === NumberFormat::ThousandsPointDecimalComma) {
-            return number_format($numberFloat, 2, ',', '.');
-        } elseif ($this->numberFormat === NumberFormat::ThousandsSpaceDecimalPoint) {
-            return number_format($numberFloat, 2, '.', ' ');
-        } elseif ($this->numberFormat === NumberFormat::ThousandsCommaDecimalPoint) {
-            return number_format($numberFloat, 2, '.', ',');
-        } elseif ($this->numberFormat === NumberFormat::ThousandsSpaceDecimalComma) {
-            return number_format($numberFloat, 2, ',', ' ');
-        } elseif ($this->numberFormat === NumberFormat::ThousandsApostropheDecimalPoint) {
-            return number_format($numberFloat, 2, '.', '\'');
-        }
-    }
-
-    public function formatNumberWithoutTrailingZeros(BigDecimal|float $number): string
-    {
-        $number = $this->formatNumber($number);
-
-        $number = rtrim($number, '0');
-        $number = rtrim($number, '.');
-        $number = rtrim($number, ',');
-
-        return $number;
-    }
-
-    public function formatInterval(CarbonInterval $interval): string
-    {
-        if ($this->intervalFormat === IntervalFormat::Decimal) {
-            $interval->cascade();
-
-            return $this->formatNumber($interval->totalHours).' h';
-        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutes) {
-            $interval->cascade();
-
-            return ((int) floor($interval->totalHours)).'h '.$interval->format('%I').'m';
-        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesColonSeparated) {
-            $interval->cascade();
-
-            return ((int) floor($interval->totalHours)).':'.$interval->format('%I');
-        } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesSecondsColonSeparated) {
-            $interval->cascade();
-
-            return ((int) floor($interval->totalHours)).':'.$interval->format('%I:%S');
-        }
-    }
-
-    public function formatCurrency(Money $money): string
-    {
-        $currencyService = app(CurrencyService::class);
-        if ($this->currencyFormat === CurrencyFormat::ISOCodeAfterWithSpace) {
-            return $this->formatNumber($money->getAmount()).' '.$money->getCurrency()->getCurrencyCode();
-        } elseif ($this->currencyFormat === CurrencyFormat::ISOCodeBeforeWithSpace) {
-            return $money->getCurrency()->getCurrencyCode().' '.$this->formatNumber($money->getAmount());
-        } elseif ($this->currencyFormat === CurrencyFormat::SymbolAfter) {
-            return $this->formatNumber($money->getAmount()).$currencyService->getCurrencySymbolForMoney($money);
-        } elseif ($this->currencyFormat === CurrencyFormat::SymbolBefore) {
-            return $currencyService->getCurrencySymbolForMoney($money).$this->formatNumber($money->getAmount());
-        } elseif ($this->currencyFormat === CurrencyFormat::SymbolBeforeWithSpace) {
-            return $currencyService->getCurrencySymbolForMoney($money).' '.$this->formatNumber($money->getAmount());
-        } elseif ($this->currencyFormat === CurrencyFormat::SymbolAfterWithSpace) {
-            return $this->formatNumber($money->getAmount()).' '.$currencyService->getCurrencySymbolForMoney($money);
-        }
-    }
-
-    public function formatTime(CarbonInterface $time): string
-    {
-        if ($this->timeFormat === TimeFormat::TwelveHours) {
-            return $time->format('h:i a'); // Examples: "11:01 am", "1:02 am"
-        } elseif ($this->timeFormat === TimeFormat::TwentyFourHours) {
-            return $time->format('H:i'); // Examples: "23:01", "01:02"
-        }
-    }
-
-    public function formatDate(CarbonInterface $date): string
-    {
-        return $date->format($this->dateFormat->toCarbonFormat());
-    }
-
-    public function setDateFormat(DateFormat $dateFormat): void
-    {
-        $this->dateFormat = $dateFormat;
-    }
-
-    public function setCurrencyFormat(CurrencyFormat $currencyFormat): void
-    {
-        $this->currencyFormat = $currencyFormat;
-    }
-
-    public function setIntervalFormat(IntervalFormat $intervalFormat): void
-    {
-        $this->intervalFormat = $intervalFormat;
-    }
-
-    public function setTimeFormat(TimeFormat $timeFormat): void
-    {
-        $this->timeFormat = $timeFormat;
-    }
-
-    public function setNumberFormat(NumberFormat $numberFormat): void
-    {
-        $this->numberFormat = $numberFormat;
-    }
-}

app/Service/OrganizationService.php

@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\Role;
-use App\Enums\TimeFormat;
-use App\Models\Organization;
-use App\Models\User;
-
-class OrganizationService
-{
-    public function createOrganization(
-        string $name,
-        User $owner,
-        bool $personalOrganization,
-        ?string $currency = null,
-        ?NumberFormat $numberFormat = null,
-        ?CurrencyFormat $currencyFormat = null,
-        ?DateFormat $dateFormat = null,
-        ?IntervalFormat $intervalFormat = null,
-        ?TimeFormat $timeFormat = null,
-    ): Organization {
-
-        $organization = new Organization;
-        $organization->name = $name;
-        $organization->personal_team = $personalOrganization;
-        if ($currency === null) {
-            $currency = config('app.localization.default_currency');
-        }
-        $organization->currency = $currency;
-        if ($numberFormat === null) {
-            $numberFormat = NumberFormat::from(config('app.localization.default_number_format'));
-        }
-        $organization->number_format = $numberFormat;
-        if ($currencyFormat === null) {
-            $currencyFormat = CurrencyFormat::from(config('app.localization.default_currency_format'));
-        }
-        $organization->currency_format = $currencyFormat;
-        if ($dateFormat === null) {
-            $dateFormat = DateFormat::from(config('app.localization.default_date_format'));
-        }
-        $organization->date_format = $dateFormat;
-        if ($intervalFormat === null) {
-            $intervalFormat = IntervalFormat::from(config('app.localization.default_interval_format'));
-        }
-        $organization->interval_format = $intervalFormat;
-        if ($timeFormat === null) {
-            $timeFormat = TimeFormat::from(config('app.localization.default_time_format'));
-        }
-        $organization->time_format = $timeFormat;
-        $organization->owner()->associate($owner);
-        $organization->save();
-
-        $organization->users()->attach(
-            $owner, [
-                'role' => Role::Owner->value,
-            ]
-        );
-
-        return $organization;
-    }
-}

app/Service/ReportExport/TimeEntriesDetailedExport.php

@@ -6,7 +6,7 @@ namespace App\Service\ReportExport;
 
 use App\Enums\ExportFormat;
 use App\Models\TimeEntry;
-use App\Service\LocalizationService;
+use App\Service\IntervalService;
 use Illuminate\Database\Eloquent\Builder;
 use LogicException;
 use Maatwebsite\Excel\Concerns\Exportable;
@@ -37,17 +37,14 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
 
     private string $timezone;
 
-    private LocalizationService $localizationService;
-
     /**
      * @param  Builder<TimeEntry>  $builder
      */
-    public function __construct(Builder $builder, ExportFormat $exportFormat, string $timezone, LocalizationService $localizationService)
+    public function __construct(Builder $builder, ExportFormat $exportFormat, string $timezone)
     {
         $this->builder = $builder;
         $this->exportFormat = $exportFormat;
         $this->timezone = $timezone;
-        $this->localizationService = $localizationService;
     }
 
     /**
@@ -116,6 +113,7 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
      */
     public function map($model): array
     {
+        $interval = app(IntervalService::class);
         $duration = $model->getDuration();
 
         if ($this->exportFormat === ExportFormat::XLSX) {
@@ -127,7 +125,7 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $model->user->name,
                 Date::dateTimeToExcel($model->start->timezone($this->timezone)),
                 $model->end !== null ? Date::dateTimeToExcel($model->end->timezone($this->timezone)) : null,
-                $duration !== null ? $this->localizationService->formatInterval($duration) : null,
+                $duration !== null ? $interval->format($duration) : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),
@@ -141,7 +139,7 @@ class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumn
                 $model->user->name,
                 $model->start->timezone($this->timezone)->format('Y-m-d H:i:s'),
                 $model->end?->timezone($this->timezone)?->format('Y-m-d H:i:s'),
-                $duration !== null ? $this->localizationService->formatInterval($duration) : null,
+                $duration !== null ? (int) floor($duration->totalHours).':'.$duration->format('%I:%S') : null,
                 $duration?->totalHours,
                 $model->billable ? 'Yes' : 'No',
                 $model->tagsRelation->pluck('name')->implode(', '),

app/Service/ReportExport/TimeEntriesReportExport.php

@@ -22,18 +22,18 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
      *        grouped_data: null|array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int|null,
+     *            cost: int,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int|null,
+     *                cost: int,
      *                grouped_type: null,
      *                grouped_data: null
      *            }>
      *        }>,
      *        seconds: int,
-     *        cost: int|null
+     *        cost: int
      *  }
      */
     private array $data;
@@ -52,18 +52,18 @@ class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsv
      *         grouped_data: null|array<array{
      *             key: string|null,
      *             seconds: int,
-     *             cost: int|null,
+     *             cost: int,
      *             grouped_type: string|null,
      *             grouped_data: null|array<array{
      *                 key: string|null,
      *                 seconds: int,
-     *                 cost: int|null,
+     *                 cost: int,
      *                 grouped_type: null,
      *                 grouped_data: null
      *             }>
      *         }>,
      *         seconds: int,
-     *         cost: int|null
+     *         cost: int
      *   } $data
      */
     public function __construct(array $data, ExportFormat $exportFormat, string $currency, TimeEntryAggregationType $group, TimeEntryAggregationType $subGroup)

app/Service/TimeEntryAggregationService.php

@@ -27,21 +27,21 @@ class TimeEntryAggregationService
      *       grouped_data: null|array<array{
      *           key: string|null,
      *           seconds: int,
-     *           cost: int|null,
+     *           cost: int,
      *           grouped_type: string|null,
      *           grouped_data: null|array<array{
      *               key: string|null,
      *               seconds: int,
-     *               cost: int|null,
+     *               cost: int,
      *               grouped_type: null,
      *               grouped_data: null
      *           }>
      *       }>,
      *       seconds: int,
-     *       cost: int|null
+     *       cost: int
      * }
      */
-    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
+    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end): array
     {
         $fillGapsInTimeGroupsIsPossible = $fillGapsInTimeGroups && $start !== null && $end !== null;
         $group1Select = null;
@@ -96,7 +96,7 @@ class TimeEntryAggregationService
                         $group2Response[] = [
                             'key' => $group2 === '' ? null : (string) $group2,
                             'seconds' => (int) $aggregate->get(0)->aggregate,
-                            'cost' => $showBillableRate ? (int) $aggregate->get(0)->cost : null,
+                            'cost' => (int) $aggregate->get(0)->cost,
                             'grouped_type' => null,
                             'grouped_data' => null,
                         ];
@@ -113,7 +113,7 @@ class TimeEntryAggregationService
                 $group1Response[] = [
                     'key' => $group1 === '' ? null : (string) $group1,
                     'seconds' => $group2ResponseSum,
-                    'cost' => $showBillableRate ? $group2ResponseCost : null,
+                    'cost' => $group2ResponseCost,
                     'grouped_type' => $group2Type?->value,
                     'grouped_data' => $group2Response,
                 ];
@@ -133,7 +133,7 @@ class TimeEntryAggregationService
 
         return [
             'seconds' => $group1ResponseSum,
-            'cost' => $showBillableRate ? $group1ResponseCost : null,
+            'cost' => $group1ResponseCost,
             'grouped_type' => $group1Type?->value,
             'grouped_data' => $group1Response,
         ];
@@ -148,25 +148,25 @@ class TimeEntryAggregationService
      *           description: string|null,
      *           color: string|null,
      *           seconds: int,
-     *           cost: int|null,
+     *           cost: int,
      *           grouped_type: string|null,
      *           grouped_data: null|array<array{
      *               key: string|null,
      *               description: string|null,
      *               color: string|null,
      *               seconds: int,
-     *               cost: int|null,
+     *               cost: int,
      *               grouped_type: null,
      *               grouped_data: null
      *           }>
      *       }>,
      *       seconds: int,
-     *       cost: int|null
+     *       cost: int
      * }
      */
-    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
+    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end): array
     {
-        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end, $showBillableRate);
+        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end);
 
         $keysGroup1 = [];
         $keysGroup2 = [];
@@ -280,20 +280,6 @@ class TimeEntryAggregationService
                     'color' => null,
                 ];
             }
-        } elseif ($type === TimeEntryAggregationType::Description) {
-            foreach ($keys as $key) {
-                $descriptorMap[$key] = [
-                    'description' => $key,
-                    'color' => null,
-                ];
-            }
-        } elseif ($type === TimeEntryAggregationType::Billable) {
-            foreach ($keys as $key) {
-                $descriptorMap[$key] = [
-                    'description' => $key === '0' ? 'Non-billable' : 'Billable',
-                    'color' => null,
-                ];
-            }
         }
 
         return $descriptorMap;
@@ -303,12 +289,12 @@ class TimeEntryAggregationService
      * @param array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int|null,
+     *            cost: int,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int|null,
+     *                cost: int,
      *                grouped_type: null|mixed,
      *                grouped_data: null|mixed
      *            }>
@@ -316,12 +302,12 @@ class TimeEntryAggregationService
      * @return array<array{
      *            key: string|null,
      *            seconds: int,
-     *            cost: int|null,
+     *            cost: int,
      *            grouped_type: string|null,
      *            grouped_data: null|array<array{
      *                key: string|null,
      *                seconds: int,
-     *                cost: int|null,
+     *                cost: int,
      *                grouped_type: null|mixed,
      *                grouped_data: null|mixed
      *            }>

app/Service/UserService.php

@@ -4,12 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
 use App\Enums\Role;
-use App\Enums\TimeFormat;
 use App\Enums\Weekday;
 use App\Events\AfterCreateOrganization;
 use App\Models\Member;
@@ -22,20 +17,8 @@ use Illuminate\Support\Facades\Hash;
 
 class UserService
 {
-    public function createUser(
-        string $name,
-        string $email,
-        string $password,
-        string $timezone,
-        Weekday $weekStart,
-        ?string $currency,
-        ?NumberFormat $numberFormat = null,
-        ?CurrencyFormat $currencyFormat = null,
-        ?DateFormat $dateFormat = null,
-        ?IntervalFormat $intervalFormat = null,
-        ?TimeFormat $timeFormat = null,
-        bool $verifyEmail = false
-    ): User {
+    public function createUser(string $name, string $email, string $password, string $timezone, Weekday $weekStart, string $currency, bool $verifyEmail = false): User
+    {
         $user = new User;
         $user->name = $name;
         $user->email = $email;
@@ -47,16 +30,17 @@ class UserService
         }
         $user->save();
 
-        $organization = app(OrganizationService::class)->createOrganization(
-            $this->getOrganizationNameForUserName($user->name),
-            $user,
-            true,
-            $currency,
-            $numberFormat,
-            $currencyFormat,
-            $dateFormat,
-            $intervalFormat,
-            $timeFormat,
+        $organization = new Organization;
+        $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
+        $organization->personal_team = true;
+        $organization->currency = $currency;
+        $organization->owner()->associate($user);
+        $organization->save();
+
+        $organization->users()->attach(
+            $user, [
+                'role' => Role::Owner->value,
+            ]
         );
 
         $user->ownedTeams()->save($organization);
@@ -94,11 +78,14 @@ class UserService
         }
 
         // Create a new organization
-        $organization = app(OrganizationService::class)->createOrganization(
-            $this->getOrganizationNameForUserName($user->name),
-            $user,
-            true
-        );
+        $organization = new Organization;
+        $organization->name = $user->name."'s Organization";
+        $organization->personal_team = true;
+        $organization->user_id = $user->id;
+        $organization->save();
+
+        // Attach the user to the organization
+        $organization->users()->attach($user, ['role' => Role::Owner->value]);
 
         // Set the organization as the user's current organization
         $user->currentOrganization()->associate($organization);
@@ -107,11 +94,6 @@ class UserService
         AfterCreateOrganization::dispatch($organization);
     }
 
-    public function getOrganizationNameForUserName(string $username): string
-    {
-        return explode(' ', $username, 2)[0]."'s Organization";
-    }
-
     public function makeSureUserHasCurrentOrganization(User $user): void
     {
         if ($user->currentOrganization !== null) {

components.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://shadcn-vue.com/schema.json",
-  "style": "new-york",
-  "typescript": true,
-  "tailwind": {
-    "config": "tailwind.config.js",
-    "css": "resources/css/app.css",
-    "baseColor": "neutral",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "aliases": {
-    "components": "@/components",
-    "composables": "@/composables",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib"
-  },
-  "iconLibrary": "lucide"
-}

composer.json

@@ -16,7 +16,6 @@
         "guzzlehttp/guzzle": "^7.2",
         "inertiajs/inertia-laravel": "^1.0",
         "korridor/laravel-computed-attributes": "^3.1",
-        "korridor/laravel-has-many-sync": "^3.1",
         "korridor/laravel-model-validation-rules": "^3.0",
         "laravel/framework": "^11.16.0",
         "laravel/jetstream": "^5.0",
@@ -25,7 +24,6 @@
         "laravel/tinker": "^2.8",
         "league/csv": "^9.16.0",
         "league/flysystem-aws-s3-v3": "^3.0",
-        "league/iso3166": "^4.3",
         "maatwebsite/excel": "^3.1",
         "novadaemon/filament-pretty-json": "^2.2",
         "nwidart/laravel-modules": "^11.0.11",

config/app.php

@@ -2,11 +2,6 @@
 
 declare(strict_types=1);
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\ServiceProvider;
 
@@ -143,15 +138,6 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
-    'localization' => [
-        'default_currency' => env('LOCALIZATION_DEFAULT_CURRENCY', 'EUR'),
-        'default_number_format' => env('LOCALIZATION_DEFAULT_NUMBER_FORMAT', NumberFormat::ThousandsPointDecimalComma->value),
-        'default_currency_format' => env('LOCALIZATION_DEFAULT_CURRENCY_FORMAT', CurrencyFormat::ISOCodeAfterWithSpace->value),
-        'default_date_format' => env('LOCALIZATION_DEFAULT_DATE_FORMAT', DateFormat::HyphenSeparatedYYYYMMDD->value),
-        'default_time_format' => env('LOCALIZATION_DEFAULT_TIME_FORMAT', TimeFormat::TwentyFourHours->value),
-        'default_interval_format' => env('LOCALIZATION_DEFAULT_INTERVAL_FORMAT', IntervalFormat::HoursMinutes->value),
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | Maintenance Mode Driver

database/factories/OrganizationFactory.php

@@ -4,11 +4,6 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -32,11 +27,6 @@ class OrganizationFactory extends Factory
             'user_id' => User::factory(),
             'personal_team' => true,
             'employees_can_see_billable_rates' => false,
-            'number_format' => $this->faker->randomElement(NumberFormat::values()),
-            'currency_format' => $this->faker->randomElement(CurrencyFormat::values()),
-            'date_format' => $this->faker->randomElement(DateFormat::values()),
-            'interval_format' => $this->faker->randomElement(IntervalFormat::values()),
-            'time_format' => $this->faker->randomElement(TimeFormat::values()),
         ];
     }
 

database/migrations/2025_04_03_101827_add_localization_columns_to_organizations_table.php

@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->string('number_format')->default(config('app.localization.default_number_format'))->nullable(false);
-            $table->string('currency_format')->default(config('app.localization.default_currency_format'))->nullable(false);
-            $table->string('date_format')->default(config('app.localization.default_date_format'))->nullable(false);
-            $table->string('interval_format')->default(config('app.localization.default_interval_format'))->nullable(false);
-            $table->string('time_format')->default(config('app.localization.default_time_format'))->nullable(false);
-        });
-
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->string('number_format')->default(null)->nullable(false)->change();
-            $table->string('currency_format')->default(null)->nullable(false)->change();
-            $table->string('date_format')->default(null)->nullable(false)->change();
-            $table->string('interval_format')->default(null)->nullable(false)->change();
-            $table->string('time_format')->default(null)->nullable(false)->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('number_format');
-            $table->dropColumn('currency_format');
-            $table->dropColumn('date_format');
-            $table->dropColumn('interval_format');
-            $table->dropColumn('time_format');
-        });
-    }
-};

database/migrations/2025_04_25_202047_change_data_type_for_spent_time_columns.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('projects', function (Blueprint $table): void {
-            $table->bigInteger('spent_time')->unsigned()->default(0)->change();
-        });
-        Schema::table('tasks', function (Blueprint $table): void {
-            $table->bigInteger('spent_time')->unsigned()->default(0)->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('projects', function (Blueprint $table): void {
-            $table->integer('spent_time')->unsigned()->default(0)->change();
-        });
-        Schema::table('tasks', function (Blueprint $table): void {
-            $table->integer('spent_time')->unsigned()->default(0)->change();
-        });
-    }
-};

database/migrations/2025_05_06_152804_fix_typos_in_organizations_table_format_columns.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        // date_format
-        DB::statement("update organizations set date_format = 'point-separated-d-m-yyyy' where date_format = 'point-seperated-d-m-yyyy'");
-        DB::statement("update organizations set date_format = 'slash-separated-mm-dd-yyyy' where date_format = 'slash-seperated-mm-dd-yyyy'");
-        DB::statement("update organizations set date_format = 'slash-separated-dd-mm-yyyy' where date_format = 'slash-seperated-dd-mm-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-separated-dd-mm-yyyy'where date_format = 'hyphen-seperated-dd-mm-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-separated-mm-dd-yyyy' where date_format = 'hyphen-seperated-mm-dd-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-separated-yyyy-mm-dd' where date_format = 'hyphen-seperated-yyyy-mm-dd'");
-
-        // interval_format
-        DB::statement("update organizations set interval_format = 'hours-minutes-colon-separated' where interval_format = 'hours-minutes-colon-seperated'");
-        DB::statement("update organizations set interval_format = 'hours-minutes-seconds-colon-separated' where interval_format = 'hours-minutes-seconds-colon-seperated'");
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // date_format
-        DB::statement("update organizations set date_format = 'point-seperated-d-m-yyyy' where date_format = 'point-separated-d-m-yyyy'");
-        DB::statement("update organizations set date_format = 'slash-seperated-mm-dd-yyyy' where date_format = 'slash-separated-mm-dd-yyyy'");
-        DB::statement("update organizations set date_format = 'slash-seperated-dd-mm-yyyy' where date_format = 'slash-separated-dd-mm-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-seperated-dd-mm-yyyy'where date_format = 'hyphen-separated-dd-mm-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-seperated-mm-dd-yyyy' where date_format = 'hyphen-separated-mm-dd-yyyy'");
-        DB::statement("update organizations set date_format = 'hyphen-seperated-yyyy-mm-dd' where date_format = 'hyphen-separated-yyyy-mm-dd'");
-
-        // interval_format
-        DB::statement("update organizations set interval_format = 'hours-minutes-colon-seperated' where interval_format = 'hours-minutes-colon-separated'");
-        DB::statement("update organizations set interval_format = 'hours-minutes-seconds-colon-seperated' where interval_format = 'hours-minutes-seconds-colon-separated'");
-    }
-};

docker-compose.yml

@@ -109,7 +109,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.51.1-jammy
+        image: mcr.microsoft.com/playwright:v1.50.0-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:

e2e/auth.spec.ts

@@ -36,7 +36,7 @@ test('can register and delete account', async ({ page }) => {
     await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
     await page.getByRole('button', { name: 'Delete Account' }).click();
     await page.getByPlaceholder('Password').fill(password);
-    await page.getByRole('button', { name: 'Delete Account' }).click();
+    await page.getByRole('button', { name: 'Delete Account' }).nth(1).click();
     await page.waitForURL(PLAYWRIGHT_BASE_URL + '/login');
     await page.goto(PLAYWRIGHT_BASE_URL + '/login');
     await page.getByLabel('Email').fill(email);

e2e/clients.spec.ts

@@ -16,7 +16,7 @@ test('test that creating and deleting a new client via the modal works', async (
     await page.getByRole('button', { name: 'Create Client' }).click();
     await page.getByPlaceholder('Client Name').fill(newClientName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Client' }).click(),
+        page.getByRole('button', { name: 'Create Client' }).nth(1).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/clients') &&
@@ -56,12 +56,12 @@ test('test that archiving and unarchiving clients works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Client' }).click();
     await page.getByLabel('Client Name').fill(newClientName);
 
-    await page.getByRole('button', { name: 'Create Client' }).click();
+    await page.getByRole('button', { name: 'Create Client' }).nth(1).click();
     await expect(page.getByText(newClientName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Archive').click(),
+        page.getByRole('button').getByText('Archive').first().click(),
         expect(page.getByText(newClientName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -71,7 +71,7 @@ test('test that archiving and unarchiving clients works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Unarchive').click(),
+        page.getByRole('button').getByText('Unarchive').first().click(),
         expect(page.getByText(newClientName)).not.toBeVisible(),
     ]);
     await Promise.all([

e2e/members.spec.ts

@@ -82,7 +82,7 @@ test('test that organization billable rate can be updated with all existing time
     await goToMembersPage(page);
     const newBillableRate = Math.round(Math.random() * 10000);
     await page.getByRole('row').first().getByRole('button').click();
-    await page.getByRole('menuitem').getByText('Edit').click();
+    await page.getByRole('button').getByText('Edit').first().click();
     await page.getByText('Organization Default Rate').click();
     await page.getByText('Custom Rate').click();
     await page

e2e/organization.spec.ts

@@ -7,29 +7,6 @@ async function goToOrganizationSettings(page) {
     await page.getByText('Organization Settings').click();
 }
 
-async function createTimeEntry(page, duration: string) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-    await page.getByRole('button', { name: 'Manual time entry' }).click();
-
-    // Fill in the time entry details
-    await page.getByTestId('time_entry_description').fill('Test time entry');
-
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await Promise.all([
-        page.getByRole('button', { name: 'Create Time Entry' }).click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/time-entries') &&
-                response.request().method() === 'POST' &&
-                response.status() === 201
-        ),
-    ]);
-}
-
 test('test that organization name can be updated', async ({ page }) => {
     await goToOrganizationSettings(page);
     await page.getByLabel('Organization Name').fill('NEW ORG NAME');
@@ -50,11 +27,9 @@ test('test that organization billable rate can be updated with all existing time
         .getByLabel('Organization Billable Rate')
         .fill(newBillableRate.toString());
     await page
-        .locator('form')
-        .filter({ hasText: 'Organization Billable' })
-        .getByRole('button', { name: 'Save' })
+        .locator('button')
+        .filter({ hasText: /^Save$/ })
         .click();
-
     await Promise.all([
         page
             .getByRole('button', { name: 'Yes, update existing time entries' })
@@ -76,173 +51,4 @@ test('test that organization billable rate can be updated with all existing time
     ]);
 });
 
-test('test that organization format settings can be updated', async ({
-    page,
-}) => {
-    await goToOrganizationSettings(page);
-
-    // Test number format
-    await page.getByLabel('Number Format').click();
-    await page.getByRole('option', { name: '1,111.11' }).click();
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Number Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.number_format === 'comma-point'
-        ),
-    ]);
-
-    // Test currency format
-    await page.getByLabel('Currency Format').click();
-    await page.getByRole('option', { name: '111 EUR' }).click();
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Currency Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.currency_format ===
-                    'iso-code-after-with-space'
-        ),
-    ]);
-
-    // Test date format
-    await page.getByLabel('Date Format').click();
-    await page.getByRole('option', { name: 'DD/MM/YYYY' }).click();
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Date Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.date_format ===
-                    'slash-separated-dd-mm-yyyy'
-        ),
-    ]);
-
-    // Test time format
-    await page.getByLabel('Time Format').click();
-    await page.getByRole('option', { name: '24-hour clock' }).click();
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Time Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.time_format === '24-hours'
-        ),
-    ]);
-
-    // Test interval format
-    await page.getByLabel('Time Duration Format').click();
-    await page.getByRole('option', { name: '12:03', exact: true }).click();
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Time Duration Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.interval_format ===
-                    'hours-minutes-colon-separated'
-        ),
-    ]);
-});
-
-test('test that format settings are reflected in the dashboard', async ({
-    page,
-}) => {
-    // check that 0h 00min is displayed
-    await expect(
-        page.getByText('0h 00min', { exact: true }).nth(0)
-    ).toBeVisible();
-
-    // First set the format settings
-    await goToOrganizationSettings(page);
-
-    // Set number format to comma-point
-    await page.getByLabel('Number Format').click();
-    await page.getByRole('option', { name: '1,111.11' }).click();
-
-    // Set currency format to symbol-after
-    await page.getByLabel('Currency Format').click();
-    await page.getByRole('option', { name: '111€' }).click();
-
-    // Set interval format to hours-minutes-colon-separated
-    await page.getByLabel('Time Duration Format').click();
-    await page.getByRole('option', { name: '12:03', exact: true }).click();
-
-    // Set date format to DD/MM/YYYY
-    await page.getByLabel('Date Format').click();
-    await page.getByRole('option', { name: 'DD/MM/YYYY' }).click();
-
-    await Promise.all([
-        page
-            .locator('form')
-            .filter({ hasText: 'Time Duration Format' })
-            .getByRole('button', { name: 'Save' })
-            .click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/organizations/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200 &&
-                (await response.json()).data.interval_format ===
-                    'hours-minutes-colon-separated' &&
-                (await response.json()).data.currency_format ===
-                    'symbol-after' &&
-                (await response.json()).data.number_format === 'comma-point'
-        ),
-    ]);
-
-    await createTimeEntry(page, '00:00');
-
-    // Go to dashboard and check the formats
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-
-    // Check billable amount format (number and currency)
-    await expect(page.getByText('0.00€')).toBeVisible();
-
-    // check that 00:00 is displayed
-    await expect(page.getByText('0:00', { exact: true }).nth(0)).toBeVisible();
-    // check that 0h 00min is not displayed
-    await expect(
-        page.getByText('0h 00min', { exact: true }).nth(0)
-    ).not.toBeVisible();
-
-    // check that the current date is displayed in the dd/mm/yyyy format on the time page
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-    await expect(
-        page
-            .getByText(new Date().toLocaleDateString('en-GB'), { exact: true })
-            .nth(0)
-    ).toBeVisible();
-});
-
-// TODO: Test 12-hour clock format
+// TODO: Add Test for import

e2e/project-members.spec.ts

@@ -1,9 +1,7 @@
 import { expect, Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
-import { formatCentsWithOrganizationDefaults } from './utils/money';
-import type { CurrencyFormat } from '../resources/js/packages/ui/src/utils/money';
-import { NumberFormat } from '@/packages/ui/src/utils/number';
+import { formatCents } from '../resources/js/packages/ui/src/utils/money';
 
 async function goToProjectsOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
@@ -19,7 +17,7 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByText(newProjectName).click();
@@ -37,7 +35,8 @@ test('test that updating project member billable rate works for existing time en
         .getByRole('button')
         .click();
     await page
-        .getByRole('menuitem', { name: 'Edit Project Member' })
+        .getByRole('button', { name: 'Edit Project Member' })
+        .first()
         .click();
     await page.getByLabel('Billable Rate').fill(newBillableRate.toString());
     await page.getByRole('button', { name: 'Update Project Member' }).click();
@@ -63,6 +62,6 @@ test('test that updating project member billable rate works for existing time en
         page
             .getByRole('row')
             .first()
-            .getByText(formatCentsWithOrganizationDefaults(newBillableRate * 100))
+            .getByText(formatCents(newBillableRate * 100, 'EUR'))
     ).toBeVisible();
 });

e2e/projects.spec.ts

@@ -1,8 +1,7 @@
 import { expect, Page } from '@playwright/test';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
 import { test } from '../playwright/fixtures';
-import { formatCentsWithOrganizationDefaults } from './utils/money';
-import type { CurrencyFormat } from '../resources/js/packages/ui/src/utils/money';
+import { formatCents } from '../resources/js/packages/ui/src/utils/money';
 
 async function goToProjectsOverview(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
@@ -18,7 +17,7 @@ test('test that creating and deleting a new project via the modal works', async
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.getByRole('button', { name: 'Create Project' }).nth(1).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/projects') &&
@@ -63,12 +62,12 @@ test('test that archiving and unarchiving projects works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Archive').first().click(),
+        page.getByRole('button').getByText('Archive').first().click(),
         expect(page.getByText(newProjectName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -78,7 +77,7 @@ test('test that archiving and unarchiving projects works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Unarchive').first().click(),
+        page.getByRole('button').getByText('Unarchive').first().click(),
         expect(page.getByText(newProjectName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -97,11 +96,11 @@ test('test that updating billable rate works with existing time entries', async
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByRole('row').first().getByRole('button').click();
-    await page.getByRole('menuitem').getByText('Edit').first().click();
+    await page.getByRole('button').getByText('Edit').first().click(),
         await page.getByText('Non-Billable').click();
     await page.getByText('Custom Rate').click();
     await page
@@ -132,7 +131,7 @@ test('test that updating billable rate works with existing time entries', async
         page
             .getByRole('row')
             .first()
-            .getByText(formatCentsWithOrganizationDefaults(newBillableRate * 100))
+            .getByText(formatCents(newBillableRate * 100, 'EUR'))
     ).toBeVisible();
 });
 

e2e/reporting.spec.ts

@@ -1,210 +1,5 @@
-import { expect, Page } from '@playwright/test';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { test } from '../playwright/fixtures';
+// TODO: Test filter
 
+// TODO: Test date range
 
-
-async function goToTimeOverview(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/time');
-}
-
-async function goToReporting(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting');
-}
-
-async function goToReportingDetailed(page: Page) {
-    await page.goto(PLAYWRIGHT_BASE_URL + '/reporting/detailed');
-}
-
-async function createTimeEntryWithProject(page: Page, projectName: string, duration: string) {
-    // First create the project through the Projects page
-    await page.goto(PLAYWRIGHT_BASE_URL + '/projects');
-    await page.getByRole('button', { name: 'Create Project' }).click();
-    await page.getByLabel('Project Name').fill(projectName);
-    await page.getByRole('dialog').getByRole('button', { name: 'Create Project' }).click();
-
-    // Wait for the project to be created and visible in the list
-    await page.getByText(projectName).waitFor({ state: 'visible' });
-
-    // Then create the time entry
-    await goToTimeOverview(page);
-    await page.getByRole('button', { name: 'Manual time entry' }).click();
-
-    // Fill in the time entry details
-    await page.getByTestId('time_entry_description').fill(`Time entry for ${projectName}`);
-
-    await page.getByRole('button', { name: 'No Project' }).click();
-    await page.getByText(projectName).click();
-
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await Promise.all([
-        page.getByRole('button', { name: 'Create Time Entry' }).click(),
-        page.waitForResponse(response => response.url().includes('/time-entries') && response.status() === 201)
-    ]);
-}
-
-async function createTimeEntryWithTag(page: Page, tagName: string, duration: string) {
-    await goToTimeOverview(page);
-    await page.getByRole('button', { name: 'Manual time entry' }).click();
-
-    // Fill in the time entry details
-    await page.getByTestId('time_entry_description').fill(`Time entry with tag ${tagName}`);
-
-    // Add tag
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await page.getByText('Create new tag').click();
-    await page.getByPlaceholder('Tag Name').fill(tagName);
-    await page.getByRole('button', { name: 'Create Tag' }).click();
-    await page.waitForLoadState('networkidle');
-
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await page.getByRole('button', { name: 'Create Time Entry' }).click();
-}
-
-async function createTimeEntryWithBillableStatus(page: Page, isBillable: boolean, duration: string) {
-    await goToTimeOverview(page);
-    await page.getByRole('button', { name: 'Manual time entry' }).click();
-
-    // Fill in the time entry details
-    await page.getByTestId('time_entry_description').fill(`Time entry ${isBillable ? 'billable' : 'non-billable'}`);
-
-    // Set billable status
-    await page.getByRole('button', { name: 'Non-Billable' }).click();
-    if (!isBillable) {
-        await page.getByRole('option', { name: 'Non Billable', exact: true }).click();
-    } else {
-        await page.getByRole('option', { name: 'Billable', exact: true }).click();
-    }
-
-    // Set duration
-    await page.locator('[role="dialog"] input[name="Duration"]').fill(duration);
-    await page.locator('[role="dialog"] input[name="Duration"]').press('Tab');
-
-    // Submit the time entry
-    await page.getByRole('button', { name: 'Create Time Entry' }).click();
-}
-
-test('test that project filtering works in reporting', async ({ page }) => {
-    const project1 = 'Test Project 1 ' + Math.floor(Math.random() * 10000);
-    const project2 = 'Test Project 2 ' + Math.floor(Math.random() * 10000);
-
-    // Create time entries for both projects
-    await createTimeEntryWithProject(page, project1, '1h');
-    await createTimeEntryWithProject(page, project2, '2h');
-
-    // Go to reporting and filter by project1
-    await goToReporting(page);
-    await page.getByRole('button', { name: 'Project' }).nth(0).click();
-    await page.getByText(project1).click();
-
-    await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
-        page.waitForResponse(response => response.url().includes('/time-entries/aggregate') && response.status() === 200)
-    ]);
-    await page.waitForLoadState('networkidle');
-
-    // Verify only project1 time entries are shown
-    await expect(page.getByText(project1)).toBeVisible();
-    await expect(page.getByText(project2)).not.toBeVisible();
-});
-
-test('test that tag filtering works in reporting', async ({ page }) => {
-    const tag1 = 'Test Tag 1 ' + Math.floor(Math.random() * 10000);
-    const tag2 = 'Test Tag 2 ' + Math.floor(Math.random() * 10000);
-
-    // Create time entries with different tags
-    await createTimeEntryWithTag(page, tag1, '1h');
-    await createTimeEntryWithTag(page, tag2, '2h');
-
-    // Go to reporting and filter by tag1
-    await goToReporting(page);
-    // wait for all requests to finish
-    await page.waitForLoadState('networkidle');
-
-    await page.getByRole('button', { name: 'Tags' }).click();
-    await page.getByText(tag1).click();
-
-    await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
-        page.waitForResponse(response => response.url().includes('/time-entries/aggregate') && response.status() === 200)
-    ]);
-
-    // Verify only time entries with tag1 are shown
-    await expect(page.getByText('1h 00min').first()).toBeVisible();
-});
-
-test('test that billable status filtering works in reporting', async ({ page }) => {
-    // Create billable and non-billable time entries
-    await createTimeEntryWithBillableStatus(page, true, '1h');
-    await createTimeEntryWithBillableStatus(page, false, '2h');
-
-    // Go to reporting and filter by billable
-    await goToReporting(page);
-
-    await page.getByRole('button', { name: 'Billable' }).click();
-    await page.getByRole('option', { name: 'Billable', exact: true }).click();
-
-    await Promise.all([
-        // escape
-        page.keyboard.press('Escape'),
-        // wait for API request to finish
-        page.waitForResponse(response => response.url().includes('/time-entries/aggregate') && response.status() === 200)
-    ]);
-    await page.waitForLoadState('networkidle');
-
-    await expect(page.getByText('1h 00min').first()).toBeVisible();
-});
-
-
-test('test that detailed view shows time entries correctly', async ({ page }) => {
-    const projectName = 'Detailed View Project ' + Math.floor(Math.random() * 10000);
-
-    // Create a time entry
-    await createTimeEntryWithProject(page, projectName, '1h');
-
-    // Go to detailed reporting view
-    await goToReportingDetailed(page);
-
-    // Verify the time entry is shown with all details
-    await expect(page.getByText(projectName, { exact: true })).toBeVisible();
-    await expect(page.locator('input[name="Duration"]')).toHaveValue('1h 00min');
-    await expect(page.getByText('Time entry for ' + projectName, { exact: true })).toBeVisible();
-});
-
-test('test that updating duration in detailed view works correctly', async ({ page }) => {
-    const projectName = 'Duration Update Project ' + Math.floor(Math.random() * 10000);
-    const initialDuration = '1h';
-    const updatedDuration = '2h 30min';
-
-    // Create a time entry with initial duration
-    await createTimeEntryWithProject(page, projectName, initialDuration);
-
-    // Go to detailed reporting view
-    await goToReportingDetailed(page);
-
-    // Find and update the duration
-    const durationInput = page.locator('input[name="Duration"]').first();
-    await durationInput.click();
-    await durationInput.fill(updatedDuration);
-    await durationInput.press('Enter');
-
-    // Wait for the update to be processed
-    await page.waitForLoadState('networkidle');
-
-    // Verify the new duration is displayed
-    await expect(durationInput).toHaveValue(updatedDuration);
-});
-
-// TODO: test that date range filtering works in reporting
+// TODO: Test grouping and sub-grouping

e2e/tags.spec.ts

@@ -15,7 +15,7 @@ test('test that creating and deleting a new client via the modal works', async (
     await page.getByRole('button', { name: 'Create Tag' }).click();
     await page.getByPlaceholder('Tag Name').fill(newTagName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Tag' }).click(),
+        page.getByRole('button', { name: 'Create Tag' }).nth(1).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/tags') &&

e2e/tasks.spec.ts

@@ -16,7 +16,7 @@ test('test that creating and deleting a new tag in a new project works', async (
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
     await Promise.all([
-        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.getByRole('button', { name: 'Create Project' }).nth(1).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/projects') &&
@@ -41,7 +41,7 @@ test('test that creating and deleting a new tag in a new project works', async (
     await page.getByPlaceholder('Task Name').fill(newTaskName);
 
     await Promise.all([
-        page.getByRole('button', { name: 'Create Task' }).click(),
+        page.getByRole('button', { name: 'Create Task' }).nth(1).click(),
         page.waitForResponse(
             async (response) =>
                 response.url().includes('/tasks') &&
@@ -107,20 +107,20 @@ test('test that archiving and unarchiving tasks works', async ({ page }) => {
     await page.getByRole('button', { name: 'Create Project' }).click();
     await page.getByLabel('Project Name').fill(newProjectName);
 
-    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByRole('button', { name: 'Create Project' }).nth(1).click();
     await expect(page.getByText(newProjectName)).toBeVisible();
 
     await page.getByText(newProjectName).click();
 
     await page.getByRole('button', { name: 'Create Task' }).click();
     await page.getByPlaceholder('Task Name').fill(newTaskName);
-    await page.getByRole('button', { name: 'Create Task' }).click();
+    await page.getByRole('button', { name: 'Create Task' }).nth(1).click();
 
     await expect(page.getByRole('table')).toContainText(newTaskName);
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Mark as done').first().click(),
+        page.getByRole('button').getByText('Mark as done').first().click(),
         expect(page.getByText(newTaskName)).not.toBeVisible(),
     ]);
     await Promise.all([
@@ -130,7 +130,7 @@ test('test that archiving and unarchiving tasks works', async ({ page }) => {
 
     await page.getByRole('row').first().getByRole('button').click();
     await Promise.all([
-        page.getByRole('menuitem').getByText('Mark as active').first().click(),
+        page.getByRole('button').getByText('Mark as active').first().click(),
         expect(page.getByText(newTaskName)).not.toBeVisible(),
     ]);
     await Promise.all([

e2e/time.spec.ts

@@ -218,7 +218,9 @@ test('test that updating a the duration in the overview works on blur', async ({
     const newTimeEntry = timeEntryRows.first();
     await assertThatTimeEntryRowIsStopped(newTimeEntry);
     await page.waitForTimeout(1500);
-    const timeEntryDurationInput = newTimeEntry.locator('input[name="Duration"]');
+    const timeEntryDurationInput = newTimeEntry.getByTestId(
+        'time_entry_duration_input'
+    );
     await timeEntryDurationInput.fill('20min');
 
     await Promise.all([
@@ -236,7 +238,9 @@ test('test that updating a the duration in the overview works on blur', async ({
         timeEntryDurationInput.press('Tab'),
     ]);
 
-    await expect(timeEntryDurationInput).toHaveValue('0h 20min');
+    await expect(
+        newTimeEntry.getByTestId('time_entry_duration_input')
+    ).toHaveValue('0h 20min');
 });
 
 // Test that start stop button stops running timer

e2e/timetracker.spec.ts

@@ -136,7 +136,6 @@ test('test that starting and updating the time while running works', async ({
     await Promise.all([
         page.waitForResponse(async (response) => {
             return (
-                response.url().includes('/time-entries') &&
                 response.status() === 200 &&
                 (await response.headerValue('Content-Type')) ===
                     'application/json' &&

e2e/utils/currentTimeEntry.ts

@@ -18,7 +18,6 @@ export function newTimeEntryResponse(
 ) {
     return page.waitForResponse(async (response) => {
         return (
-            response.url().includes('/time-entries') &&
             response.status() === status &&
             (await response.headerValue('Content-Type')) ===
                 'application/json' &&