Updated invoicing extension

.env.example

@@ -5,8 +5,7 @@ APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
 APP_FORCE_HTTPS=false
-# Supported values: on, off, invite-only (true/false are supported for backwards compatibility)
-APP_ENABLE_REGISTRATION=on
+APP_ENABLE_REGISTRATION=true
 SUPER_ADMINS=admin@example.com
 PAGINATION_PER_PAGE_DEFAULT=500
 

.github/workflows/build-onpremise.yml

@@ -141,7 +141,7 @@ jobs:
             ${{ env.DOCKER_REPO }}
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
@@ -195,7 +195,7 @@ jobs:
           merge-multiple: true
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}

.github/workflows/build-private.yml

@@ -177,7 +177,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: rg.fr-par.scw.cloud/solidtime
           username: nologin

.github/workflows/build-public.yml

@@ -117,13 +117,13 @@ jobs:
             ${{ env.GHCR_REPO }}
 
       - name: "Login to Docker Hub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -177,13 +177,13 @@ jobs:
           merge-multiple: true
 
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GHCR"
-        uses: docker/login-action@v4.5.2
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

app/Actions/Fortify/CreateNewUser.php

@@ -4,11 +4,9 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
-use App\Enums\RegistrationMode;
 use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
 use App\Models\User;
-use App\Service\InvitationService;
 use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
 use App\Service\UserService;
@@ -33,14 +31,13 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input): User
     {
-        $registrationMode = RegistrationMode::fromConfig(config('app.enable_registration'));
-        if ($registrationMode === RegistrationMode::Off) {
+        if (! config('app.enable_registration')) {
             throw ValidationException::withMessages([
                 'email' => [__('Registration is disabled.')],
             ]);
         }
 
-        $validated = Validator::make($input, [
+        Validator::make($input, [
             'name' => [
                 'required',
                 'string',
@@ -63,20 +60,6 @@ class CreateNewUser implements CreatesNewUsers
             ],
         ])->validate();
 
-        if ($registrationMode === RegistrationMode::InviteOnly) {
-            $invitationService = app(InvitationService::class);
-            $email = (string) $validated['email'];
-            if (! $invitationService->hasAcceptedInvitationForEmail($email)) {
-                $message = $invitationService->hasPendingInvitationForEmail($email)
-                    ? __('Please accept the organization invitation sent to your email address before registering.')
-                    : __('Registration is only available to invited users.');
-
-                throw ValidationException::withMessages([
-                    'email' => [$message],
-                ]);
-            }
-        }
-
         $timezone = null;
         if (array_key_exists('timezone', $input) && is_string($input['timezone'])) {
             if (app(TimezoneService::class)->isValid($input['timezone'])) {

app/Auth/ActiveUserProvider.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Auth;
-
-use Illuminate\Auth\EloquentUserProvider;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * User provider that only resolves non-placeholder users.
- *
- * Placeholder users are created by imports and when members are removed from an
- * organization. They can share an email address with a real user, so resolving a user by
- * email can return a placeholder instead of the real account. The login flow filters them
- * out explicitly, but the password broker and the guard credential checks (for example the
- * password confirmation) resolve users through the configured user provider.
- *
- * Registered as the "eloquent" provider driver in the AuthServiceProvider, so it replaces the
- * built-in one for every provider in config/auth.php.
- */
-class ActiveUserProvider extends EloquentUserProvider
-{
-    /**
-     * @param  Model|null  $model
-     * @return Builder<Model>
-     */
-    #[\Override]
-    protected function newModelQuery($model = null): Builder
-    {
-        $query = parent::newModelQuery($model);
-        $query->getQuery()->where('is_placeholder', '=', false);
-
-        return $query;
-    }
-}

app/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommand.php

@@ -51,8 +51,7 @@ class TimeEntrySendStillRunningMailsCommand extends Command
             ])
             ->whereHas('user', function (Builder $query): void {
                 /** @var Builder<User> $query */
-                $query->where('is_placeholder', '=', false)
-                    ->where('send_time_entry_still_running_email', '=', true);
+                $query->where('is_placeholder', '=', false);
             })
             ->orderBy('created_at', 'asc')
             ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails): void {

app/Enums/RegistrationMode.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-enum RegistrationMode: string
-{
-    case On = 'on';
-    case InviteOnly = 'invite-only';
-    case Off = 'off';
-
-    public static function fromConfig(mixed $value): self
-    {
-        if ($value === true) {
-            return self::On;
-        }
-
-        if ($value === false || $value === null) {
-            return self::Off;
-        }
-
-        return match (strtolower(trim((string) $value))) {
-            '1', 'on', 'true' => self::On,
-            'invite-only' => self::InviteOnly,
-            default => self::Off,
-        };
-    }
-}

app/Exceptions/Api/ApiException.php

@@ -60,6 +60,7 @@ abstract class ApiException extends Exception
      */
     public function report(): bool
     {
+        // TODO: temporary activated
         return false;
     }
 }

app/Exceptions/Api/CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers extends ApiException
 {
     public const string KEY = 'can_not_delete_user_who_is_owner_of_organization_with_multiple_members';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/CanNotRemoveOwnerFromOrganization.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class CanNotRemoveOwnerFromOrganization extends ApiException
 {
     public const string KEY = 'can_not_remove_owner_from_organization';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ChangingRoleOfPlaceholderIsNotAllowed.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ChangingRoleOfPlaceholderIsNotAllowed extends ApiException
 {
     public const string KEY = 'changing_role_of_placeholder_is_not_allowed';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ChangingRoleToPlaceholderIsNotAllowed.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ChangingRoleToPlaceholderIsNotAllowed extends ApiException
 {
     public const string KEY = 'changing_role_to_placeholder_is_not_allowed';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/EntityStillInUseApiException.php

@@ -19,16 +19,6 @@ class EntityStillInUseApiException extends ApiException
 
     public const string KEY = 'entity_still_in_use';
 
-    /**
-     * Report the exception.
-     *
-     * @return bool true means the exception handler will not report it again
-     */
-    public function report(): bool
-    {
-        return true;
-    }
-
     /**
      * Get the translated message for the exception.
      */

app/Exceptions/Api/FeatureIsNotAvailableInFreePlanApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class FeatureIsNotAvailableInFreePlanApiException extends ApiException
 {
     public const string KEY = 'feature_is_not_available_in_free_plan';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/InactiveUserCanNotBeUsedApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class InactiveUserCanNotBeUsedApiException extends ApiException
 {
     public const string KEY = 'inactive_user_can_not_be_used';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/InvitationForTheEmailAlreadyExistsApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class InvitationForTheEmailAlreadyExistsApiException extends ApiException
 {
     public const string KEY = 'invitation_for_the_email_already_exists';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OnlyOwnerCanChangeOwnership.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OnlyOwnerCanChangeOwnership extends ApiException
 {
     public const string KEY = 'only_owner_can_change_ownership';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OnlyPlaceholdersCanBeMergedIntoAnotherMember.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OnlyPlaceholdersCanBeMergedIntoAnotherMember extends ApiException
 {
     public const string KEY = 'only_placeholders_can_be_merged_into_another_member';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OrganizationHasNoSubscriptionButMultipleMembersException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OrganizationHasNoSubscriptionButMultipleMembersException extends ApiException
 {
     public const string KEY = 'organization_has_no_subscription_but_multiple_members';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OrganizationNeedsAtLeastOneOwner.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OrganizationNeedsAtLeastOneOwner extends ApiException
 {
     public const string KEY = 'organization_needs_at_least_one_owner';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/OverlappingTimeEntryApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class OverlappingTimeEntryApiException extends ApiException
 {
     public const string KEY = 'overlapping_time_entry';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException extends ApiException
 {
     public const string KEY = 'this_placeholder_can_not_be_invited_use_the_merge_tool_instead_api_exception';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/TimeEntryCanNotBeRestartedApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class TimeEntryCanNotBeRestartedApiException extends ApiException
 {
     public const string KEY = 'time_entry_can_not_be_restarted';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/TimeEntryStillRunningApiException.php

@@ -7,14 +7,4 @@ namespace App\Exceptions\Api;
 class TimeEntryStillRunningApiException extends ApiException
 {
     public const string KEY = 'time_entry_still_running';
-
-    /**
-     * Report the exception.
-     *
-     * @return bool true means the exception handler will not report it again
-     */
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserIsAlreadyMemberOfOrganizationApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserIsAlreadyMemberOfOrganizationApiException extends ApiException
 {
     public const string KEY = 'user_is_already_member_of_organization';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserIsAlreadyMemberOfProjectApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserIsAlreadyMemberOfProjectApiException extends ApiException
 {
     public const string KEY = 'user_is_already_member_of_project';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserNotPlaceholderApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserNotPlaceholderApiException extends ApiException
 {
     public const string KEY = 'user_not_placeholder';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Api/UserResendEmailVerificationNoPendingEmailApiException.php

@@ -7,9 +7,4 @@ namespace App\Exceptions\Api;
 class UserResendEmailVerificationNoPendingEmailApiException extends ApiException
 {
     public const string KEY = 'user_resend_email_verification_no_pending_email';
-
-    public function report(): bool
-    {
-        return true;
-    }
 }

app/Exceptions/Handler.php

@@ -7,7 +7,6 @@ namespace App\Exceptions;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use League\OAuth2\Server\Exception\OAuthServerException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -35,10 +34,6 @@ class Handler extends ExceptionHandler
             //
         });
 
-        $this->dontReportWhen(fn (Throwable $e): bool => $e instanceof OAuthServerException
-            && $e->getErrorType() === 'access_denied'
-            && $e->getHttpStatusCode() === 401);
-
         // A request on an untrusted host (see App\Http\Middleware\TrustHosts)
         // otherwise renders as a bare "Bad request." 400. Show a message that
         // says how to fix it instead. The framework has already converted the

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

@@ -124,10 +124,6 @@ class UserController extends Controller
             $user->week_start = $request->getWeekStart();
         }
 
-        if ($request->getSendTimeEntryStillRunningEmail() !== null) {
-            $user->send_time_entry_still_running_email = $request->getSendTimeEntryStillRunningEmail();
-        }
-
         $user->save();
 
         if ($emailToVerify !== null) {

app/Http/Controllers/Web/OrganizationInvitationController.php

@@ -36,7 +36,6 @@ class OrganizationInvitationController extends Controller
             }
 
             return redirect(route('register'))
-                ->with('registration_email', $email)
                 ->with('bannerText', __('Please create an account to finish joining the :organization organization.', [
                     'organization' => $organization->name,
                 ]))

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

@@ -24,7 +24,6 @@ class ImportRequest extends BaseFormRequest
             'data' => [
                 'required',
                 'string',
-                'max:'.config('import.max_data_size'),
             ],
         ];
     }

app/Http/Requests/V1/User/UserUpdateRequest.php

@@ -58,9 +58,6 @@ class UserUpdateRequest extends BaseFormRequest
             'week_start' => [
                 Rule::enum(Weekday::class),
             ],
-            'send_time_entry_still_running_email' => [
-                'boolean',
-            ],
         ];
     }
 
@@ -84,13 +81,6 @@ class UserUpdateRequest extends BaseFormRequest
         return $this->has('week_start') ? Weekday::from($this->input('week_start')) : null;
     }
 
-    public function getSendTimeEntryStillRunningEmail(): ?bool
-    {
-        return $this->has('send_time_entry_still_running_email')
-            ? $this->boolean('send_time_entry_still_running_email')
-            : null;
-    }
-
     public function hasPhotoKey(): bool
     {
         return $this->has('photo');

app/Http/Resources/V1/User/UserResource.php

@@ -36,8 +36,6 @@ class UserResource extends BaseResource
             'timezone' => $this->resource->timezone,
             /** @var Weekday $week_start Starting day of the week */
             'week_start' => $this->resource->week_start->value,
-            /** @var bool $send_time_entry_still_running_email Whether to email the user when a time entry has been running for more than 8 hours */
-            'send_time_entry_still_running_email' => $this->resource->send_time_entry_still_running_email,
         ];
     }
 }

app/Models/User.php

@@ -38,14 +38,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string|null $pending_email
  * @property Carbon|null $email_verified_at
  * @property string|null $password
- * @property string|null $remember_token
  * @property string|null $two_factor_secret
- * @property string|null $two_factor_recovery_codes
- * @property Carbon|null $two_factor_confirmed_at
  * @property string $timezone
  * @property bool $is_placeholder
  * @property Weekday $week_start
- * @property bool $send_time_entry_still_running_email
  * @property string|null $profile_photo_path
  * @property-read Organization|null $currentOrganization
  * @property-read string $profile_photo_url
@@ -112,7 +108,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         'is_admin' => 'boolean',
         'is_placeholder' => 'boolean',
         'week_start' => Weekday::class,
-        'send_time_entry_still_running_email' => 'boolean',
     ];
 
     /**
@@ -122,7 +117,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
      */
     protected $attributes = [
         'week_start' => Weekday::Monday,
-        'send_time_entry_still_running_email' => true,
     ];
 
     /**
@@ -153,9 +147,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
 
     public function canAccessPanel(Panel $panel): bool
     {
-        return $this->is_placeholder === false
-            && in_array($this->email, config('auth.super_admins', []), true)
-            && $this->hasVerifiedEmail();
+        return in_array($this->email, config('auth.super_admins', []), true) && $this->hasVerifiedEmail();
     }
 
     public function isMemberOfOrganization(Organization $organization): bool

app/Providers/AuthServiceProvider.php

@@ -4,14 +4,11 @@ declare(strict_types=1);
 
 namespace App\Providers;
 
-use App\Auth\ActiveUserProvider;
 use App\Models\Passport\AuthCode;
 use App\Models\Passport\Client;
 use App\Models\Passport\RefreshToken;
 use App\Models\Passport\Token;
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Auth;
 use Laravel\Passport\Passport;
 
 class AuthServiceProvider extends ServiceProvider
@@ -29,13 +26,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        // Replaces the built-in eloquent user provider, so that no authentication flow can
-        // resolve a placeholder user. The driver name is kept, because Passport recognizes
-        // only providers that are configured with the driver "eloquent".
-        Auth::provider('eloquent', function (Application $app, array $config): ActiveUserProvider {
-            return new ActiveUserProvider($app->make('hash'), $config['model']);
-        });
-
         // define scopes for passport tokens
         Passport::tokensCan([
             'create' => 'Create resources',

app/Providers/FortifyServiceProvider.php

@@ -45,7 +45,6 @@ class FortifyServiceProvider extends ServiceProvider
 
         Fortify::registerView(function () {
             return Inertia::render('Auth/Register', [
-                'email' => session('registration_email', ''),
                 'terms_url' => config('auth.terms_url'),
                 'privacy_policy_url' => config('auth.privacy_policy_url'),
                 'newsletter_consent' => config('auth.newsletter_consent'),

app/Service/Import/ImportService.php

@@ -9,8 +9,11 @@ use App\Service\Import\Importers\ImporterContract;
 use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
 use App\Service\Import\Importers\ReportDto;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class ImportService
 {
@@ -22,6 +25,8 @@ class ImportService
         /** @var ImporterContract $importer */
         $importer = app(ImporterProvider::class)->getImporter($importerType);
         $importer->init($organization);
+        Storage::disk(config('filesystems.default'))
+            ->put('import/'.Carbon::now()->toDateString().'-'.$organization->getKey().'-'.Str::uuid(), $data);
 
         $lock = Cache::lock('import:'.$organization->getKey(), config('octane.max_execution_time', 60) + 1);
 

app/Service/Import/Importers/SolidtimeImporter.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Str;
 use League\Csv\Reader;
 use Override;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ZipArchive;
 
 class SolidtimeImporter extends DefaultImporter
 {
@@ -33,10 +34,16 @@ class SolidtimeImporter extends DefaultImporter
         $temporaryDirectoryZip = null;
         $temporaryDirectory = null;
         try {
+            $zip = new ZipArchive;
             $temporaryDirectoryZip = TemporaryDirectory::make();
             file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
+            $res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);
+            if ($res !== true) {
+                throw new ImportException('Invalid ZIP, error code: '.$res);
+            }
             $temporaryDirectory = TemporaryDirectory::make();
-            app(ZipImportHelper::class)->extract($temporaryDirectoryZip->path('import.zip'), $temporaryDirectory->path());
+            $zip->extractTo($temporaryDirectory->path());
+            $zip->close();
 
             if (! file_exists($temporaryDirectory->path('meta.json'))) {
                 throw new ImportException('File "meta.json" missing in ZIP');

app/Service/Import/Importers/TogglDataImporter.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Str;
 use Override;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 use ValueError;
+use ZipArchive;
 
 class TogglDataImporter extends DefaultImporter
 {
@@ -25,10 +26,16 @@ class TogglDataImporter extends DefaultImporter
         $temporaryDirectoryZip = null;
         $temporaryDirectory = null;
         try {
+            $zip = new ZipArchive;
             $temporaryDirectoryZip = TemporaryDirectory::make();
             file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
+            $res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);
+            if ($res !== true) {
+                throw new ImportException('Invalid ZIP, error code: '.$res);
+            }
             $temporaryDirectory = TemporaryDirectory::make();
-            app(ZipImportHelper::class)->extract($temporaryDirectoryZip->path('import.zip'), $temporaryDirectory->path());
+            $zip->extractTo($temporaryDirectory->path());
+            $zip->close();
             if (! file_exists($temporaryDirectory->path('clients.json'))) {
                 throw new ImportException('File "clients.json" missing in ZIP');
             }

app/Service/Import/Importers/ZipImportHelper.php

@@ -1,129 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use ZipArchive;
-
-/**
- * Extracts uploaded ZIP archives with limits on file count, total uncompressed
- * size and entry paths, so a small malicious archive can not fill the disk
- * (decompression bomb) or write outside the target directory (zip slip).
- */
-class ZipImportHelper
-{
-    private const int CHUNK_SIZE = 1024 * 1024;
-
-    /**
-     * @throws ImportException
-     */
-    public function extract(string $zipPath, string $targetPath): void
-    {
-        $zip = new ZipArchive;
-        $res = $zip->open($zipPath, ZipArchive::RDONLY);
-        if ($res !== true) {
-            throw new ImportException('Invalid ZIP, error code: '.$res);
-        }
-
-        try {
-            $maxFiles = (int) config('import.zip_max_files');
-            $maxUncompressedSize = (int) config('import.zip_max_uncompressed_size');
-
-            if ($zip->numFiles > $maxFiles) {
-                throw new ImportException('ZIP contains too many files, maximum is '.$maxFiles);
-            }
-
-            // Check the sizes declared in the archive before writing anything to disk
-            $declaredSize = 0;
-            for ($index = 0; $index < $zip->numFiles; $index++) {
-                $stat = $zip->statIndex($index);
-                if ($stat === false) {
-                    throw new ImportException('Invalid ZIP entry');
-                }
-                $this->validateEntryName($stat['name']);
-                $declaredSize += $stat['size'];
-                if ($declaredSize > $maxUncompressedSize) {
-                    throw new ImportException('ZIP uncompressed size exceeds the maximum of '.$maxUncompressedSize.' bytes');
-                }
-            }
-
-            // The declared sizes can be forged, so the written bytes are counted as well
-            $writtenSize = 0;
-            for ($index = 0; $index < $zip->numFiles; $index++) {
-                $stat = $zip->statIndex($index);
-                if ($stat === false) {
-                    throw new ImportException('Invalid ZIP entry');
-                }
-                $name = $stat['name'];
-                $entryPath = $targetPath.DIRECTORY_SEPARATOR.$name;
-
-                if (str_ends_with($name, '/')) {
-                    $this->ensureDirectoryExists($entryPath);
-
-                    continue;
-                }
-                $this->ensureDirectoryExists(dirname($entryPath));
-
-                $stream = $zip->getStreamIndex($index);
-                if ($stream === false) {
-                    throw new ImportException('ZIP entry "'.$name.'" can not be read');
-                }
-                $target = fopen($entryPath, 'wb');
-                if ($target === false) {
-                    fclose($stream);
-                    throw new ImportException('ZIP entry "'.$name.'" can not be extracted');
-                }
-                try {
-                    while (! feof($stream)) {
-                        $chunk = fread($stream, self::CHUNK_SIZE);
-                        if ($chunk === false) {
-                            throw new ImportException('ZIP entry "'.$name.'" can not be read');
-                        }
-                        $writtenSize += strlen($chunk);
-                        if ($writtenSize > $maxUncompressedSize) {
-                            throw new ImportException('ZIP uncompressed size exceeds the maximum of '.$maxUncompressedSize.' bytes');
-                        }
-                        fwrite($target, $chunk);
-                    }
-                } finally {
-                    fclose($target);
-                    fclose($stream);
-                }
-            }
-        } finally {
-            $zip->close();
-        }
-    }
-
-    /**
-     * @throws ImportException
-     */
-    private function validateEntryName(string $name): void
-    {
-        if ($name === '' || str_contains($name, "\0") || str_contains($name, '\\') || str_starts_with($name, '/')) {
-            throw new ImportException('ZIP contains an invalid file path: "'.$name.'"');
-        }
-        if (preg_match('/^[a-zA-Z]:/', $name) === 1) {
-            throw new ImportException('ZIP contains an invalid file path: "'.$name.'"');
-        }
-        foreach (explode('/', rtrim($name, '/')) as $segment) {
-            if ($segment === '' || $segment === '..') {
-                throw new ImportException('ZIP contains an invalid file path: "'.$name.'"');
-            }
-        }
-    }
-
-    /**
-     * @throws ImportException
-     */
-    private function ensureDirectoryExists(string $path): void
-    {
-        if (is_dir($path)) {
-            return;
-        }
-        if (! mkdir($path, 0700, true) && ! is_dir($path)) {
-            throw new ImportException('Directory "'.$path.'" can not be created');
-        }
-    }
-}

app/Service/InvitationService.php

@@ -18,22 +18,6 @@ use Illuminate\Support\Facades\Mail;
 
 class InvitationService
 {
-    public function hasAcceptedInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNotNull('accepted_at')
-            ->exists();
-    }
-
-    public function hasPendingInvitationForEmail(string $email): bool
-    {
-        return OrganizationInvitation::query()
-            ->whereRaw('lower(email) = ?', [strtolower($email)])
-            ->whereNull('accepted_at')
-            ->exists();
-    }
-
     /**
      * @throws UserIsAlreadyMemberOfOrganizationApiException|InvitationForTheEmailAlreadyExistsApiException
      */

app/Service/MemberService.php

@@ -218,16 +218,7 @@ class MemberService
 
         $placeholderUser = $user->replicate();
         $placeholderUser->is_placeholder = true;
-        // Reset authentication relevant properties on the placeholder user
-        $placeholderUser->password = null;
-        $placeholderUser->remember_token = null;
-        $placeholderUser->two_factor_secret = null;
-        $placeholderUser->two_factor_recovery_codes = null;
-        $placeholderUser->two_factor_confirmed_at = null;
-        $placeholderUser->email_verified_at = null;
-        $placeholderUser->pending_email = null;
-        $placeholderUser->current_team_id = null;
-        $placeholderUser->profile_photo_path = null;
+        $placeholderUser->current_team_id = $member->organization_id;
         $placeholderUser->save();
 
         $member->user()->associate($placeholderUser);

app/Service/PermissionStore.php

@@ -80,10 +80,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],
@@ -151,10 +147,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],
@@ -211,10 +203,6 @@ class PermissionStore
                 'invoices:update',
                 'invoices:download',
                 'invoices:delete',
-                'invoice-recipients:view',
-                'invoice-recipients:create',
-                'invoice-recipients:update',
-                'invoice-recipients:delete',
                 'invoice-settings:view',
                 'invoice-settings:update',
             ],

config/app.php

@@ -100,7 +100,7 @@ return [
 
     'force_https' => (bool) env('APP_FORCE_HTTPS', false),
 
-    'enable_registration' => env('APP_ENABLE_REGISTRATION', 'off'),
+    'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
 
     'local_email_verification' => (bool) env('APP_LOCAL_EMAIL_VERIFICATION', false),
 

config/import.php

@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Import payload limit
-    |--------------------------------------------------------------------------
-    |
-    | Maximum length of the base64 encoded "data" field of an import request in
-    | bytes. Requests with a larger payload are rejected with a validation error.
-    |
-    */
-
-    'max_data_size' => (int) (env('IMPORT_MAX_DATA_SIZE') ?: 50 * 1024 * 1024),
-
-    /*
-    |--------------------------------------------------------------------------
-    | ZIP extraction limits
-    |--------------------------------------------------------------------------
-    |
-    | Limits applied to ZIP based importers before and during extraction to
-    | protect the instance against decompression bombs. The uncompressed size
-    | is the sum of all files in the archive in bytes.
-    |
-    */
-
-    'zip_max_files' => (int) (env('IMPORT_ZIP_MAX_FILES') ?: 100),
-
-    'zip_max_uncompressed_size' => (int) (env('IMPORT_ZIP_MAX_UNCOMPRESSED_SIZE') ?: 500 * 1024 * 1024),
-
-];

database/migrations/2026_08_31_000001_add_send_time_entry_still_running_email_to_users_table.php

@@ -1,24 +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
-{
-    public function up(): void
-    {
-        Schema::table('users', function (Blueprint $table): void {
-            $table->boolean('send_time_entry_still_running_email')->default(true)->after('week_start');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('users', function (Blueprint $table): void {
-            $table->dropColumn('send_time_entry_still_running_email');
-        });
-    }
-};

database/migrations/2026_09_16_000001_remove_credentials_from_placeholder_users.php

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    /**
-     * Placeholder users used to be created as a full copy of the user they were made from,
-     * which included the credentials and the account state of that user. A placeholder is a
-     * stand-in for a person in one organization, not an account, and the row shares the email
-     * address with the real account, so these values are removed from the placeholders that
-     * already exist. The organization a placeholder belongs to is recorded on its member row.
-     */
-    public function up(): void
-    {
-        DB::table('users')
-            ->where('is_placeholder', '=', true)
-            ->where(function (Builder $builder): void {
-                $builder->whereNotNull('password')
-                    ->orWhereNotNull('remember_token')
-                    ->orWhereNotNull('two_factor_secret')
-                    ->orWhereNotNull('two_factor_recovery_codes')
-                    ->orWhereNotNull('two_factor_confirmed_at')
-                    ->orWhereNotNull('email_verified_at')
-                    ->orWhereNotNull('pending_email')
-                    ->orWhereNotNull('current_team_id')
-                    ->orWhereNotNull('profile_photo_path');
-            })
-            ->update([
-                'password' => null,
-                'remember_token' => null,
-                'two_factor_secret' => null,
-                'two_factor_recovery_codes' => null,
-                'two_factor_confirmed_at' => null,
-                'email_verified_at' => null,
-                'pending_email' => null,
-                'current_team_id' => null,
-                'profile_photo_path' => null,
-            ]);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        //
-    }
-};

e2e/calendar.spec.ts

@@ -252,19 +252,19 @@ test('test that calendar page loads and displays time entries', async ({ page, c
 test('test that calendar navigation buttons work', async ({ page }) => {
     await goToCalendar(page);
     await expect(page.locator('.fc')).toBeVisible();
-    await expect(page.getByTestId('calendar-title')).toContainText('This Week');
 
-    // Navigate between named periods.
+    // Click the "next" button to navigate forward
+    await page.getByRole('button', { name: 'Next' }).click();
+    await expect(page.locator('.fc')).toBeVisible();
+
+    // Click the "prev" button to navigate back
     await page.getByRole('button', { name: 'Previous' }).click();
-    await expect(page.getByTestId('calendar-title')).toContainText('Last Week');
-    await page.getByRole('button', { name: 'Next' }).click();
-    await expect(page.getByTestId('calendar-title')).toContainText('This Week');
+    await expect(page.locator('.fc')).toBeVisible();
 
-    // Navigate forward first, then use the range button to return to today.
+    // Navigate forward first, then click today
     await page.getByRole('button', { name: 'Next' }).click();
-    await expect(page.getByTestId('calendar-title')).toContainText('Next Week');
     await page.getByRole('button', { name: 'today' }).click();
-    await expect(page.getByTestId('calendar-title')).toContainText('This Week');
+    await expect(page.locator('.fc')).toBeVisible();
 });
 
 test('test that editing time entry description via calendar modal works', async ({ page, ctx }) => {

e2e/invitation-registration-prefill.spec.ts

@@ -1,32 +0,0 @@
-import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import { getInvitationAcceptUrl } from './utils/mailpit';
-
-test('prefills the registration email after accepting an invitation', async ({ page, browser }) => {
-    const memberId = `${Date.now()}-${Math.floor(Math.random() * 100000)}`;
-    const memberEmail = `prefill-${memberId}@invitation.test`;
-
-    await page.goto(PLAYWRIGHT_BASE_URL + '/members');
-    await page.getByRole('button', { name: 'Invite Member' }).click();
-    await page.getByPlaceholder('Member Email').fill(memberEmail);
-    await page.getByRole('button', { name: 'Employee' }).click();
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/invitations') &&
-                response.request().method() === 'POST' &&
-                response.status() === 204
-        ),
-        page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-    ]);
-
-    const inviteeContext = await browser.newContext();
-    const inviteePage = await inviteeContext.newPage();
-    const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
-    await inviteePage.goto(acceptUrl);
-    await inviteePage.waitForURL(/\/register$/);
-
-    await expect(inviteePage.getByLabel('Email')).toHaveValue(memberEmail);
-
-    await inviteeContext.close();
-});

e2e/profile.spec.ts

@@ -20,12 +20,6 @@ function profileInformationForm(page: Page) {
         .locator('xpath=ancestor::*[descendant::form][1]');
 }
 
-function notificationSettingsForm(page: Page) {
-    return page
-        .getByRole('heading', { name: 'Notifications', exact: true })
-        .locator('xpath=ancestor::*[descendant::form][1]');
-}
-
 async function saveProfileForm(page: Page): Promise<void> {
     const form = profileInformationForm(page);
     await form.getByRole('button', { name: 'Save' }).click();
@@ -56,22 +50,6 @@ test('week-start change persists across reload', async ({ page }) => {
     await expect(page.getByLabel('Start of the week')).toHaveValue('sunday');
 });
 
-test('still-running email notification setting persists across reload', async ({ page }) => {
-    await goToProfilePage(page);
-    const form = notificationSettingsForm(page);
-    const checkbox = form.getByLabel('Still-running time entry reminders');
-
-    await expect(checkbox).toBeChecked();
-    await checkbox.uncheck();
-    await form.getByRole('button', { name: 'Save' }).click();
-    await expect(form.getByText('Saved.', { exact: true })).toBeVisible();
-
-    await page.reload();
-    await expect(
-        notificationSettingsForm(page).getByLabel('Still-running time entry reminders')
-    ).not.toBeChecked();
-});
-
 test('profile photo can be uploaded, persists across reload, and can be removed', async ({
     page,
 }) => {

e2e/reporting.spec.ts

@@ -18,25 +18,6 @@ import {
 // Each test registers a new user and creates test data via API
 test.describe.configure({ timeout: 30000 });
 
-test('date range picker labels and navigates reporting periods', async ({ page }) => {
-    await goToReporting(page);
-
-    const range = page.getByTestId('date_range_picker_display');
-    const previous = page.getByTestId('date_range_picker_previous');
-    const next = page.getByTestId('date_range_picker_next');
-
-    await expect(range).toContainText('Last 14 Days');
-    await expect(next).toBeDisabled();
-
-    await Promise.all([waitForReportingUpdate(page), previous.click()]);
-    await expect(range).not.toContainText('Last 14 Days');
-
-    // The initial reporting range is still fresh in Vue Query's cache, so returning to it
-    // does not necessarily trigger another aggregate request.
-    await next.click();
-    await expect(range).toContainText('Last 14 Days');
-});
-
 // ──────────────────────────────────────────────────
 // Project Multiselect Dropdown Tests
 // ──────────────────────────────────────────────────

e2e/timesheet.spec.ts

@@ -409,20 +409,20 @@ test('navigating to previous week shows entries from that week', async ({ page,
 test('can navigate forward and return to current week', async ({ page }) => {
     await Promise.all([goToTimesheet(page), waitForTimesheetLoad(page)]);
 
-    // Should show "This Week"
-    await expect(page.getByTestId('timesheet_week_display')).toContainText('This Week');
+    // Should show "This week"
+    await expect(page.getByTestId('timesheet_week_display')).toContainText('This week');
 
     // Go to next week — the text assertions below auto-retry until the
     // header label flips.
     await page.getByTestId('timesheet_next_week').click();
 
-    // Should no longer show "This Week"
-    await expect(page.getByTestId('timesheet_week_display')).not.toContainText('This Week');
+    // Should no longer show "This week"
+    await expect(page.getByTestId('timesheet_week_display')).not.toContainText('This week');
 
     // Go back to this week
     await page.getByTestId('timesheet_week_display').click();
 
-    await expect(page.getByTestId('timesheet_week_display')).toContainText('This Week');
+    await expect(page.getByTestId('timesheet_week_display')).toContainText('This week');
 });
 
 // ──────────────────────────────────────────────────

e2e/timezone-mismatch.spec.ts

@@ -1,89 +0,0 @@
-import { test, expect } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
-import type { Page, TestContext } from '../playwright/fixtures';
-import { getCurrentUserViaApi, updateUserProfileViaApi } from './utils/api';
-
-const BROWSER_TIMEZONE = 'Europe/Vienna';
-const MISMATCHED_TIMEZONE = 'America/New_York';
-
-test.use({ timezoneId: BROWSER_TIMEZONE });
-
-function mismatchModal(page: Page) {
-    return page.getByRole('dialog').filter({ hasText: 'Timezone mismatch detected' });
-}
-
-async function openPageWithTimezoneMismatch(page: Page, ctx: TestContext) {
-    await updateUserProfileViaApi(ctx, { timezone: MISMATCHED_TIMEZONE });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-    await expect(mismatchModal(page)).toBeVisible();
-}
-
-test('timezone mismatch modal saves the device timezone through the users API', async ({
-    page,
-    ctx,
-}) => {
-    await openPageWithTimezoneMismatch(page, ctx);
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 200
-        ),
-        mismatchModal(page).getByRole('button', { name: 'Update timezone' }).click(),
-    ]);
-    await expect(mismatchModal(page)).toBeHidden();
-
-    const user = await getCurrentUserViaApi(ctx);
-    expect(user.timezone).toBe(BROWSER_TIMEZONE);
-
-    // After the automatic reload the timezones match again, so the modal stays gone.
-    await page.waitForLoadState('load');
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-    await expect(mismatchModal(page)).toBeHidden();
-});
-
-test('timezone mismatch modal does not open for a different timezone with the same time', async ({
-    page,
-    ctx,
-}) => {
-    // Berlin and Vienna share the same offset and DST rules, so the times match.
-    await updateUserProfileViaApi(ctx, { timezone: 'Europe/Berlin' });
-    await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
-
-    // Wait until the dashboard is rendered so the modal had its chance to mount.
-    await expect(page.getByTestId('dashboard_view')).toBeVisible();
-    await expect(mismatchModal(page)).toBeHidden();
-});
-
-test('timezone mismatch modal stays open when the update fails', async ({ page, ctx }) => {
-    await openPageWithTimezoneMismatch(page, ctx);
-
-    await page.route('**/api/v1/users/*', (route) => {
-        if (route.request().method() === 'PUT') {
-            return route.fulfill({
-                status: 500,
-                contentType: 'application/json',
-                body: JSON.stringify({ message: 'Server error' }),
-            });
-        }
-        return route.fallback();
-    });
-
-    await Promise.all([
-        page.waitForResponse(
-            (response) =>
-                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'PUT' &&
-                response.status() === 500
-        ),
-        mismatchModal(page).getByRole('button', { name: 'Update timezone' }).click(),
-    ]);
-
-    await expect(mismatchModal(page)).toBeVisible();
-    await expect(page.getByText('Failed to update profile')).toBeVisible();
-
-    const user = await getCurrentUserViaApi(ctx);
-    expect(user.timezone).toBe(MISMATCHED_TIMEZONE);
-});

extensions/manifest.json

@@ -9,6 +9,6 @@
     },
     "Invoicing": {
         "repository": "solidtime-io/extension-invoicing",
-        "ref": "v0.0.6"
+        "ref": "v0.0.3"
     }
 }

package.json

@@ -57,7 +57,7 @@
         "@floating-ui/core": "^1.7.5",
         "@floating-ui/vue": "^1.1.11",
         "@heroicons/vue": "^2.2.0",
-        "@lucide/vue": "^1.28.0",
+        "@lucide/vue": "^1.14.0",
         "@rushstack/eslint-patch": "^1.16.1",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tanstack/vue-form": "^1.32.0",
@@ -67,7 +67,7 @@
         "@tanstack/vue-virtual": "^3.13.24",
         "@vue/eslint-config-prettier": "^10.2.0",
         "@vue/eslint-config-typescript": "^14.7.0",
-        "@vueuse/core": "^14.4.0",
+        "@vueuse/core": "^14.3.0",
         "@vueuse/integrations": "^14.3.0",
         "@zodios/core": "^10.9.6",
         "chroma-js": "^3.2.0",
@@ -79,7 +79,7 @@
         "parse-duration": "^2.1.6",
         "pinia": "^3.0.4",
         "radix-vue": "^1.9.17",
-        "reka-ui": "^2.10.1",
+        "reka-ui": "^2.9.7",
         "tailwind-merge": "^2.6.1",
         "tailwindcss-animate": "^1.0.7",
         "vue-draggable-plus": "^0.6.1",

resources/js/Components/Common/Client/ClientTable.vue

@@ -7,7 +7,7 @@ import { type Client } from '@/packages/api/src';
 import ClientTableRow from '@/Components/Common/Client/ClientTableRow.vue';
 import ClientCreateModal from '@/Components/Common/Client/ClientCreateModal.vue';
 import ClientTableHeading from '@/Components/Common/Client/ClientTableHeading.vue';
-import Pagination from '@/packages/ui/src/Pagination.vue';
+import Pagination from '@/Components/Common/Pagination.vue';
 import { canCreateClients } from '@/utils/permissions';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import {

resources/js/Components/Common/Pagination.vue

@@ -16,8 +16,8 @@ import {
     ChevronRightIcon,
     EllipsisHorizontalIcon,
 } from '@heroicons/vue/20/solid';
-import { buttonVariants } from './Buttons/index';
-import { cn } from './utils/cn';
+import { buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
 import { computed, watch } from 'vue';
 
 const page = defineModel<number>('page', { default: 1 });

resources/js/Components/Common/Project/ProjectTable.vue

@@ -6,11 +6,17 @@ import { computed, ref, watch } from 'vue';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import ProjectTableHeading from '@/Components/Common/Project/ProjectTableHeading.vue';
 import ProjectTableRow from '@/Components/Common/Project/ProjectTableRow.vue';
-import Pagination from '@/packages/ui/src/Pagination.vue';
+import Pagination from '@/Components/Common/Pagination.vue';
 import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 
 export type SortColumn =
-    'name' | 'client_name' | 'spent_time' | 'progress' | 'billable_rate' | 'status' | 'visibility';
+    | 'name'
+    | 'client_name'
+    | 'spent_time'
+    | 'progress'
+    | 'billable_rate'
+    | 'status'
+    | 'visibility';
 export type { SortDirection } from '@/utils/useSortableTable';
 import { canCreateProjects } from '@/utils/permissions';
 import type { CreateProjectBody, Project, Client, CreateClientBody } from '@/packages/api/src';

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

@@ -57,7 +57,7 @@ const { handleApiRequestNotifications } = useNotificationsStore();
 
 const startDate = useSessionStorage<string>(
     'reporting-start-date',
-    getLocalizedDayJs(getDayJsInstance()().format()).subtract(13, 'd').format()
+    getLocalizedDayJs(getDayJsInstance()().format()).subtract(14, 'd').format()
 );
 const endDate = useSessionStorage<string>(
     'reporting-end-date',

resources/js/Components/Common/User/UserTimezoneMismatchModal.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { usePage } from '@inertiajs/vue3';
+import { ref } from 'vue';
+import { useForm, usePage } from '@inertiajs/vue3';
 import type { User } from '@/types/models';
 import TimezoneMismatchModal from '@/packages/ui/src/TimezoneMismatchModal.vue';
-import { useUpdateUserMutation } from '@/utils/useUserQuery';
 
 const show = defineModel('show', { default: false });
+const saving = ref(false);
 
 const page = usePage<{
     auth: {
@@ -12,28 +13,33 @@ const page = usePage<{
     };
 }>();
 
-const updateUser = useUpdateUserMutation();
+function handleUpdate(timezone: string) {
+    saving.value = true;
+    const form = useForm({
+        _method: 'PUT',
+        timezone: timezone,
+        name: page.props.auth.user.name,
+        email: page.props.auth.user.email,
+        week_start: page.props.auth.user.week_start,
+    });
 
-async function handleUpdate(timezone: string) {
-    try {
-        await updateUser.mutateAsync({
-            userId: page.props.auth.user.id,
-            body: { timezone },
-        });
-        show.value = false;
-        // reload the whole page to re-read the timezone update
-        location.reload();
-    } catch {
-        // notification handled by mutation
-    }
+    form.post(route('user-profile-information.update'), {
+        errorBag: 'updateProfileInformation',
+        preserveScroll: true,
+        onSuccess: () => {
+            saving.value = false;
+            show.value = false;
+            location.reload();
+        },
+        onError: () => {
+            saving.value = false;
+        },
+    });
 }
 </script>
 
 <template>
-    <TimezoneMismatchModal
-        v-model:show="show"
-        :saving="updateUser.isPending.value"
-        @update="handleUpdate" />
+    <TimezoneMismatchModal v-model:show="show" :saving="saving" @update="handleUpdate" />
 </template>
 
 <style scoped></style>

resources/js/Components/Dashboard/ActivityGraphCard.vue

@@ -63,7 +63,7 @@ const max = computed(() => {
 });
 
 const backgroundColor = useCssVariable('--theme-color-card-background');
-const borderColor = useCssVariable('--color-border-secondary');
+const borderColor = useCssVariable('--color-border');
 const labelColor = useCssVariable('--color-text-secondary');
 const chartColorRaw = useCssVariable('--theme-color-chart');
 

resources/js/Components/Timesheet/BreakPlacementModal.vue

@@ -146,10 +146,7 @@ const changeSummary = computed<PlanLine[]>(() => {
             { times: range(plan.breakSlot), label: 'Break' },
             { times: range(plan.secondHalf), label: workLabel },
             ...plan.shifted.map((shift) => ({
-                times: moved(
-                    req.otherEntries.find((e) => e.id === shift.id)!,
-                    shift
-                ),
+                times: moved(req.otherEntries.find((e) => e.id === shift.id)!, shift),
                 label: props.entryLabel(shift.id),
             })),
         ];

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -161,7 +161,7 @@ const emit = defineEmits<{
                         :organization-billable-rate="organization?.billable_rate ?? null"
                         :no-project-value="null"
                         align="start"
-                        @changed="(p: string | null, t: string | null) => emit('add-row', p, t)">
+                        @changed="(p, t) => emit('add-row', p, t)">
                         <template #trigger>
                             <Button variant="ghost" size="sm" class="text-text-secondary">
                                 <PlusIcon class="h-4 w-4 mr-1 text-icon-default" />

resources/js/Components/Timesheet/TimesheetHeader.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import DateRangeNavigator from '@/packages/ui/src/Input/DateRangeNavigator.vue';
+import { Button } from '@/packages/ui/src/Buttons';
+import { ChevronLeftIcon, ChevronRightIcon, CalendarIcon } from '@heroicons/vue/20/solid';
 
 defineProps<{
+    isCurrentWeek: boolean;
     weekNumber: number;
-    rangeLabel: string;
+    weekRangeDisplay: string;
     weekTotalFormatted: string;
 }>();
 
@@ -17,16 +19,33 @@ defineEmits<{
 <template>
     <div class="flex flex-wrap items-center justify-between gap-4 mb-4 px-2 sm:px-4 lg:px-6">
         <!-- Left: Week navigation -->
-        <DateRangeNavigator
-            :label="rangeLabel"
-            :secondary-label="`W${weekNumber}`"
-            previous-test-id="timesheet_prev_week"
-            trigger-test-id="timesheet_week_display"
-            next-test-id="timesheet_next_week"
-            trigger-aria-label="Return to current week"
-            @previous="$emit('previous')"
-            @next="$emit('next')"
-            @select="$emit('current')" />
+        <div class="flex items-center gap-2">
+            <Button
+                variant="outline"
+                size="icon"
+                class="h-8 w-8"
+                data-testid="timesheet_prev_week"
+                @click="$emit('previous')">
+                <ChevronLeftIcon class="h-4 w-4" />
+            </Button>
+            <button
+                data-testid="timesheet_week_display"
+                class="flex items-center gap-2 px-3 py-1.5 text-sm font-medium text-text-primary hover:bg-card-background rounded-md transition"
+                @click="$emit('current')">
+                <CalendarIcon class="h-4 w-4 text-icon-default" />
+                <span v-if="isCurrentWeek">This week</span>
+                <span v-else>{{ weekRangeDisplay }}</span>
+                <span class="text-text-tertiary">&middot; W{{ weekNumber }}</span>
+            </button>
+            <Button
+                variant="outline"
+                size="icon"
+                class="h-8 w-8"
+                data-testid="timesheet_next_week"
+                @click="$emit('next')">
+                <ChevronRightIcon class="h-4 w-4" />
+            </Button>
+        </div>
 
         <!-- Right: Week total -->
         <div class="flex items-center gap-2.5">

resources/js/Components/ui/alert-dialog/AlertDialogContent.vue

@@ -25,21 +25,16 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
 <template>
     <AlertDialogPortal>
         <AlertDialogOverlay
-            class="fixed inset-0 z-50 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0">
-            <div class="absolute inset-0 bg-default-background opacity-30" />
-        </AlertDialogOverlay>
-        <div
-            class="fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-14 xl:pt-24 justify-center overflow-auto">
-            <AlertDialogContent
-                v-bind="forwarded"
-                :class="
-                    cn(
-                        'pointer-events-auto bg-default-background grid w-full max-w-lg gap-4 border border-border-tertiary p-6 shadow-lg duration-200 rounded-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
-                        props.class
-                    )
-                ">
-                <slot />
-            </AlertDialogContent>
-        </div>
+            class="fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0" />
+        <AlertDialogContent
+            v-bind="forwarded"
+            :class="
+                cn(
+                    'fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+                    props.class
+                )
+            ">
+            <slot />
+        </AlertDialogContent>
     </AlertDialogPortal>
 </template>

resources/js/Layouts/AppLayout.vue

@@ -253,9 +253,7 @@ const page = usePage<{
                                 v-if="isInvoicingActivated() && canViewInvoices()"
                                 title="Invoices"
                                 :icon="DocumentTextIcon"
-                                :current="
-                                    route().current('invoices') || route().current('invoices.*')
-                                "
+                                :current="route().current('invoices')"
                                 href="/invoices"></NavigationSidebarItem>
                         </ul>
                     </nav>

resources/js/Pages/Auth/Register.vue

@@ -8,13 +8,9 @@ import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
 
-const props = defineProps<{
-    email: string;
-}>();
-
 const form = useForm({
     name: '',
-    email: props.email,
+    email: '',
     password: '',
     password_confirmation: '',
     terms: false,

resources/js/Pages/Profile/Partials/DeleteUserForm.vue

@@ -35,7 +35,8 @@ async function deleteUser() {
     } catch (error) {
         if (error && typeof error === 'object' && 'response' in error) {
             const response = error.response as
-                { status?: number; data?: { errors?: { password?: string[] } } } | undefined;
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
             if (response?.status === 422) {
                 passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
             }

resources/js/Pages/Profile/Partials/NotificationSettingsForm.vue

@@ -1,103 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import ActionMessage from '@/Components/ActionMessage.vue';
-import FormSection from '@/Components/FormSection.vue';
-import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
-import { Checkbox } from '@/packages/ui/src';
-import {
-    Field,
-    FieldContent,
-    FieldDescription,
-    FieldError,
-    FieldLabel,
-} from '@/packages/ui/src/field';
-import { getApiValidationFieldErrors } from '@/utils/apiValidation';
-import { useUpdateUserMutation, useUserQuery } from '@/utils/useUserQuery';
-
-const { user } = useUserQuery();
-const updateUser = useUpdateUserMutation();
-
-const sendTimeEntryStillRunningEmail = ref(true);
-const recentlySaved = ref(false);
-
-watch(
-    user,
-    (currentUser, previousUser) => {
-        if (currentUser && previousUser === undefined) {
-            sendTimeEntryStillRunningEmail.value = currentUser.send_time_entry_still_running_email;
-        }
-    },
-    { immediate: true }
-);
-
-const isUserLoaded = computed(() => user.value !== undefined);
-const isSaveDisabled = computed(() => !isUserLoaded.value || updateUser.isPending.value);
-const fieldErrors = computed<Record<string, string>>(() =>
-    getApiValidationFieldErrors(updateUser.error.value)
-);
-
-async function save() {
-    if (isSaveDisabled.value || !user.value) return;
-
-    if (sendTimeEntryStillRunningEmail.value === user.value.send_time_entry_still_running_email) {
-        flashSaved();
-        return;
-    }
-
-    try {
-        const updatedUser = await updateUser.mutateAsync({
-            userId: user.value.id,
-            body: {
-                send_time_entry_still_running_email: sendTimeEntryStillRunningEmail.value,
-            },
-        });
-        sendTimeEntryStillRunningEmail.value = updatedUser.send_time_entry_still_running_email;
-        flashSaved();
-    } catch {
-        // 422: field errors render below. Other errors: toast handled in the mutation.
-    }
-}
-
-function flashSaved() {
-    recentlySaved.value = true;
-    setTimeout(() => (recentlySaved.value = false), 2000);
-}
-</script>
-
-<template>
-    <FormSection @submitted="save">
-        <template #title>Notifications</template>
-
-        <template #description>Choose which email notifications you want to receive.</template>
-
-        <template #form>
-            <div class="col-span-6 sm:col-span-4">
-                <Field orientation="horizontal">
-                    <Checkbox
-                        id="send_time_entry_still_running_email"
-                        v-model:checked="sendTimeEntryStillRunningEmail"
-                        :disabled="!isUserLoaded" />
-                    <FieldContent>
-                        <FieldLabel for="send_time_entry_still_running_email">
-                            Still-running time entry reminders
-                        </FieldLabel>
-                        <FieldDescription>
-                            Email me when a time entry has been running for more than 8 hours.
-                        </FieldDescription>
-                    </FieldContent>
-                </Field>
-                <FieldError v-if="fieldErrors.send_time_entry_still_running_email">
-                    {{ fieldErrors.send_time_entry_still_running_email }}
-                </FieldError>
-            </div>
-        </template>
-
-        <template #actions>
-            <ActionMessage :on="recentlySaved" class="me-3">Saved.</ActionMessage>
-
-            <PrimaryButton :class="{ 'opacity-25': isSaveDisabled }" :disabled="isSaveDisabled">
-                Save
-            </PrimaryButton>
-        </template>
-    </FormSection>
-</template>

resources/js/Pages/Profile/Show.vue

@@ -9,7 +9,6 @@ import UpdateProfileInformationForm from '@/Pages/Profile/Partials/UpdateProfile
 import type { Session } from '@/types/jetstream';
 import ApiTokensForm from '@/Pages/Profile/Partials/ApiTokensForm.vue';
 import ThemeForm from '@/Pages/Profile/Partials/ThemeForm.vue';
-import NotificationSettingsForm from '@/Pages/Profile/Partials/NotificationSettingsForm.vue';
 
 defineProps<{
     confirmsTwoFactorAuthentication: boolean;
@@ -37,12 +36,6 @@ defineProps<{
                     <SectionBorder />
                 </div>
 
-                <div>
-                    <NotificationSettingsForm />
-
-                    <SectionBorder />
-                </div>
-
                 <div>
                     <UpdatePasswordForm class="mt-10 sm:mt-0" />
 

resources/js/Pages/ReportingDetailed.vue

@@ -9,7 +9,7 @@ import {
     ArrowDownTrayIcon,
     LockClosedIcon,
 } from '@heroicons/vue/20/solid';
-import Pagination from '@/packages/ui/src/Pagination.vue';
+import Pagination from '@/Components/Common/Pagination.vue';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -61,7 +61,7 @@ type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
 
 const startDate = useSessionStorage<string>(
     'reporting-start-date',
-    getLocalizedDayJs(getDayJsInstance()().format()).subtract(13, 'd').format()
+    getLocalizedDayJs(getDayJsInstance()().format()).subtract(14, 'd').format()
 );
 const endDate = useSessionStorage<string>(
     'reporting-end-date',

resources/js/Pages/Teams/Partials/DeleteTeamForm.vue

@@ -38,7 +38,8 @@ const deleteTeam = async () => {
     } catch (error) {
         if (error && typeof error === 'object' && 'response' in error) {
             const response = error.response as
-                { status?: number; data?: { errors?: { password?: string[] } } } | undefined;
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
             if (response?.status === 422) {
                 passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
             }

resources/js/Pages/Timesheet.vue

@@ -30,7 +30,6 @@ import {
     getLocalizedDayJs,
 } from '@/packages/ui/src/utils/time';
 import { getBreakPlacementHint } from '@/packages/ui/src/utils/breakPlacement';
-import { getDateRangeLabel } from '@/packages/ui/src/utils/dateRange';
 import { useTimesheetWeek } from '@/utils/timesheet/useTimesheetWeek';
 import { useTimesheetCellMutations } from '@/utils/timesheet/useTimesheetCellMutations';
 import { useTimesheetRowMutations } from '@/utils/timesheet/useTimesheetRowMutations';
@@ -45,6 +44,7 @@ const {
     weekEnd,
     weekDays,
     weekNumber,
+    isCurrentWeek,
     todayDate,
     goToPreviousWeek,
     goToNextWeek,
@@ -109,9 +109,13 @@ const weekTotalFormatted = computed(() =>
     formatHumanReadableDuration(grandTotal.value, intervalFormat.value, numberFormat.value)
 );
 
-const weekRangeLabel = computed(() =>
-    getDateRangeLabel(weekStart.value, weekStart.value.add(6, 'day'))
-);
+const weekRangeDisplay = computed(() => {
+    const start = weekStart.value;
+    const end = start.add(6, 'day');
+    return start.month() === end.month()
+        ? `${start.format('MMM D')} - ${end.format('D')}`
+        : `${start.format('MMM D')} - ${end.format('MMM D')}`;
+});
 
 // ── Cell / row mutation handlers ──────────────────────────────────
 const {
@@ -204,8 +208,9 @@ async function createTag(name: string): Promise<Tag | undefined> {
     <AppLayout title="Timesheet" data-testid="timesheet_view">
         <div class="pt-5 lg:pt-8 pb-4 lg:pb-6">
             <TimesheetHeader
+                :is-current-week="isCurrentWeek"
                 :week-number="weekNumber"
-                :range-label="weekRangeLabel"
+                :week-range-display="weekRangeDisplay"
                 :week-total-formatted="weekTotalFormatted"
                 @previous="goToPreviousWeek"
                 @next="goToNextWeek"

resources/js/packages/api/src/index.ts

@@ -118,11 +118,6 @@ export type DetailedInvoiceResponse = ZodiosResponseByAlias<SolidTimeApi, 'getIn
 export type DetailedInvoice = DetailedInvoiceResponse['data'];
 
 export type InvoiceIndexEntry = ZodiosResponseByAlias<SolidTimeApi, 'getInvoices'>['data'][0];
-export type InvoiceRecipient = ZodiosResponseByAlias<
-    SolidTimeApi,
-    'getInvoiceRecipients'
->['data'][0];
-export type InvoiceRecipientBody = ZodiosBodyByAlias<SolidTimeApi, 'createInvoiceRecipient'>;
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;
 

resources/js/packages/api/src/openapi.json.client.ts

@@ -45,54 +45,14 @@ const InvitationResource = z
 const InvitationStoreRequest = z
     .object({ email: z.string().email(), role: z.enum(['admin', 'manager', 'employee']) })
     .passthrough();
-const InvoiceRecipientResource = z
-    .object({
-        id: z.string(),
-        organization_id: z.string(),
-        name: z.string(),
-        vatin: z.union([z.string(), z.null()]),
-        address_line_1: z.union([z.string(), z.null()]),
-        address_line_2: z.union([z.string(), z.null()]),
-        address_line_3: z.union([z.string(), z.null()]),
-        address_post_code: z.union([z.string(), z.null()]),
-        address_city: z.union([z.string(), z.null()]),
-        address_country: z.union([z.string(), z.null()]),
-        phone: z.union([z.string(), z.null()]),
-        email: z.union([z.string(), z.null()]),
-        is_archived: z.boolean(),
-        archived_at: z.union([z.string(), z.null()]),
-        invoices_count: z.number().int(),
-        has_non_draft_invoices: z.boolean(),
-        created_at: z.union([z.string(), z.null()]),
-        updated_at: z.union([z.string(), z.null()]),
-    })
-    .passthrough();
-const InvoiceRecipientCollection = z.array(InvoiceRecipientResource);
-const InvoiceRecipientRequest = z
-    .object({
-        name: z.string(),
-        vatin: z.union([z.string(), z.null()]).optional(),
-        address_line_1: z.union([z.string(), z.null()]).optional(),
-        address_line_2: z.union([z.string(), z.null()]).optional(),
-        address_line_3: z.union([z.string(), z.null()]).optional(),
-        address_post_code: z.union([z.string(), z.null()]).optional(),
-        address_city: z.union([z.string(), z.null()]).optional(),
-        address_country: z.union([z.string(), z.null()]).optional(),
-        phone: z.union([z.string(), z.null()]).optional(),
-        email: z.union([z.string(), z.null()]).optional(),
-        is_archived: z.boolean().optional(),
-    })
-    .passthrough();
 const InvoiceResource = z
     .object({
         id: z.string(),
         organization_id: z.string(),
-        invoice_recipient_id: z.string(),
         reference: z.string(),
         seller_name: z.string(),
-        recipient: z.string(),
+        buyer_name: z.string(),
         status: z.string(),
-        status_label: z.string(),
         date: z.string(),
         due_at: z.string(),
         paid_date: z.string(),
@@ -116,7 +76,16 @@ const InvoiceStoreRequest = z
         seller_address_country: z.union([z.string(), z.null()]).optional(),
         seller_phone: z.union([z.string(), z.null()]).optional(),
         seller_email: z.union([z.string(), z.null()]).optional(),
-        invoice_recipient_id: z.string(),
+        buyer_name: z.string(),
+        buyer_vatin: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_1: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_2: z.union([z.string(), z.null()]).optional(),
+        buyer_address_line_3: z.union([z.string(), z.null()]).optional(),
+        buyer_address_post_code: z.union([z.string(), z.null()]).optional(),
+        buyer_address_city: z.union([z.string(), z.null()]).optional(),
+        buyer_address_country: z.union([z.string(), z.null()]).optional(),
+        buyer_phone: z.union([z.string(), z.null()]).optional(),
+        buyer_email: z.union([z.string(), z.null()]).optional(),
         date: z.string(),
         billing_period_start: z.union([z.string(), z.null()]).optional(),
         billing_period_end: z.union([z.string(), z.null()]).optional(),
@@ -161,7 +130,6 @@ const DetailedInvoiceResource = z
     .object({
         id: z.string(),
         organization_id: z.string(),
-        invoice_recipient_id: z.string(),
         reference: z.string(),
         seller_name: z.string(),
         seller_vatin: z.string(),
@@ -173,7 +141,16 @@ const DetailedInvoiceResource = z
         seller_address_country: z.string(),
         seller_phone: z.string(),
         seller_email: z.string(),
-        recipient: InvoiceRecipientResource,
+        buyer_name: z.string(),
+        buyer_vatin: z.string(),
+        buyer_address_line_1: z.string(),
+        buyer_address_line_2: z.string(),
+        buyer_address_line_3: z.string(),
+        buyer_address_post_code: z.string(),
+        buyer_address_city: z.string(),
+        buyer_address_country: z.string(),
+        buyer_phone: z.string(),
+        buyer_email: z.string(),
         paid_date: z.string(),
         due_at: z.string(),
         discount_type: z.string(),
@@ -194,7 +171,7 @@ const DetailedInvoiceResource = z
         entries: z.array(InvoiceEntryResource),
     })
     .passthrough();
-const InvoiceStatus = z.enum(['draft', 'sent', 'paid', 'cancelled']);
+const InvoiceStatus = z.enum(['draft', 'sent', 'cancelled']);
 const InvoiceUpdateRequest = z
     .object({
         status: InvoiceStatus,
@@ -210,7 +187,16 @@ const InvoiceUpdateRequest = z
         seller_address_country: z.union([z.string(), z.null()]),
         seller_phone: z.union([z.string(), z.null()]),
         seller_email: z.union([z.string(), z.null()]),
-        invoice_recipient_id: z.string(),
+        buyer_name: z.string(),
+        buyer_vatin: z.union([z.string(), z.null()]),
+        buyer_address_line_1: z.union([z.string(), z.null()]),
+        buyer_address_line_2: z.union([z.string(), z.null()]),
+        buyer_address_line_3: z.union([z.string(), z.null()]),
+        buyer_address_post_code: z.union([z.string(), z.null()]),
+        buyer_address_city: z.union([z.string(), z.null()]),
+        buyer_address_country: z.union([z.string(), z.null()]),
+        buyer_phone: z.union([z.string(), z.null()]),
+        buyer_email: z.union([z.string(), z.null()]),
         date: z.string(),
         billing_period_start: z.union([z.string(), z.null()]),
         billing_period_end: z.union([z.string(), z.null()]),
@@ -719,7 +705,6 @@ const UserResource = z
         profile_photo_url: z.string(),
         timezone: z.string(),
         week_start: Weekday,
-        send_time_entry_still_running_email: z.boolean(),
     })
     .passthrough();
 const UserUpdateRequest = z
@@ -729,7 +714,6 @@ const UserUpdateRequest = z
         photo: z.union([z.string(), z.null()]),
         timezone: z.string(),
         week_start: Weekday,
-        send_time_entry_still_running_email: z.boolean(),
     })
     .partial()
     .passthrough();
@@ -1911,125 +1895,6 @@ const endpoints = makeApi([
             },
         ],
     },
-    {
-        method: 'get',
-        path: '/v1/organizations/:organization/invoice-recipients',
-        alias: 'getInvoiceRecipients',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientCollection }).passthrough(),
-    },
-    {
-        method: 'post',
-        path: '/v1/organizations/:organization/invoice-recipients',
-        alias: 'createInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'get',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'getInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'put',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'updateInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'post',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient/duplicate',
-        alias: 'duplicateInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'body',
-                type: 'Body',
-                schema: InvoiceRecipientRequest,
-            },
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.object({ data: InvoiceRecipientResource }).passthrough(),
-    },
-    {
-        method: 'delete',
-        path: '/v1/organizations/:organization/invoice-recipients/:invoiceRecipient',
-        alias: 'deleteInvoiceRecipient',
-        requestFormat: 'json',
-        parameters: [
-            {
-                name: 'organization',
-                type: 'Path',
-                schema: z.string(),
-            },
-            {
-                name: 'invoiceRecipient',
-                type: 'Path',
-                schema: z.string(),
-            },
-        ],
-        response: z.void(),
-    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/invoices',
@@ -2046,11 +1911,6 @@ const endpoints = makeApi([
                 type: 'Query',
                 schema: z.number().int().gte(1).lte(2147483647).optional(),
             },
-            {
-                name: 'status',
-                type: 'Query',
-                schema: InvoiceStatus.optional(),
-            },
         ],
         response: z.object({ data: InvoiceCollection }).passthrough(),
         errors: [

resources/js/packages/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solidtime/ui",
-    "version": "0.0.23",
+    "version": "0.0.22",
     "description": "Package containing the solidtime ui components",
     "main": "./dist/solidtime-ui-lib.umd.cjs",
     "module": "./dist/solidtime-ui-lib.js",

resources/js/packages/ui/src/CommandPalette/CommandPalette.vue

@@ -11,7 +11,6 @@ import {
     CommandShortcut,
 } from '../command';
 import { cn } from '../utils/cn';
-import { useDialogFocusRestore } from '../utils/useDialogFocusRestore';
 import type {
     CommandPaletteCommand,
     CommandPaletteGroup,
@@ -37,8 +36,6 @@ const emit = defineEmits<{
     select: [command: CommandPaletteCommand | EntitySearchResult];
 }>();
 
-const { onOpenAutoFocus, onCloseAutoFocus } = useDialogFocusRestore();
-
 // Non-empty groups for rendering
 const nonEmptyGroups = computed(() => props.groups.filter((g) => g.commands.length > 0));
 
@@ -74,9 +71,7 @@ watch(open, (isOpen) => {
                     )
                 ">
                 <DialogContent
-                    class="pointer-events-auto bg-default-background w-full max-w-lg border border-border-tertiary shadow-lg sm:rounded-lg outline-none overflow-hidden p-0 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95"
-                    @open-auto-focus="onOpenAutoFocus"
-                    @close-auto-focus="onCloseAutoFocus">
+                    class="pointer-events-auto bg-default-background w-full max-w-lg border border-border-tertiary shadow-lg sm:rounded-lg outline-none overflow-hidden p-0 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95">
                     <CommandRoot
                         v-model:search-term="searchTerm"
                         class="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">

resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue

@@ -1,12 +1,13 @@
 <script setup lang="ts">
+import { Button } from '..';
+import { ChevronLeft, ChevronRight } from '@lucide/vue';
 import { Tabs, TabsList } from '../tabs';
 import TabBarItem from '../TabBar/TabBarItem.vue';
-import DateRangeNavigator from '../Input/DateRangeNavigator.vue';
 import CalendarSettingsPopover from './CalendarSettingsPopover.vue';
 import type { CalendarSettings } from './calendarSettings';
 
 defineProps<{
-    rangeLabel: string;
+    viewTitle: string;
     activeView: string;
     settings: CalendarSettings;
 }>();
@@ -22,13 +23,31 @@ const emit = defineEmits<{
 
 <template>
     <div class="flex items-center justify-between bg-default-background px-2 py-1.5">
-        <DateRangeNavigator
-            :label="rangeLabel"
-            trigger-test-id="calendar-title"
-            trigger-aria-label="today"
-            @previous="emit('prev')"
-            @next="emit('next')"
-            @select="emit('today')" />
+        <!-- Left: Navigation -->
+        <div class="flex items-center gap-1">
+            <Button
+                variant="outline"
+                size="sm"
+                class="h-8 w-8 p-0"
+                aria-label="Previous"
+                @click="emit('prev')">
+                <ChevronLeft class="h-4 w-4" />
+            </Button>
+            <Button
+                variant="outline"
+                size="sm"
+                class="h-8 w-8 p-0"
+                aria-label="Next"
+                @click="emit('next')">
+                <ChevronRight class="h-4 w-4" />
+            </Button>
+            <Button variant="outline" size="sm" @click="emit('today')"> today </Button>
+        </div>
+
+        <!-- Center: Title -->
+        <span data-testid="calendar-title" class="text-base font-semibold text-foreground">{{
+            viewTitle
+        }}</span>
 
         <!-- Right: View switcher + Settings -->
         <div class="flex items-center gap-1">

resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue

@@ -138,7 +138,7 @@ const {
 const {
     activeView,
     viewDays,
-    rangeLabel,
+    viewTitle,
     emitDatesChange,
     handlePrev,
     handleNext,
@@ -514,7 +514,7 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
 
         <template v-if="!loading">
             <CalendarToolbar
-                :range-label="rangeLabel"
+                :view-title="viewTitle"
                 :active-view="activeView"
                 :settings="calendarSettings"
                 @prev="handlePrev"

resources/js/packages/ui/src/FullCalendar/useCalendarNavigation.ts

@@ -2,7 +2,6 @@ import { computed, ref } from 'vue';
 import type { Dayjs } from 'dayjs';
 import { getLocalizedDayJs } from '../utils/time';
 import { getWeekStartDayNumber } from '../utils/settings';
-import { getDateRangeLabel } from '../utils/dateRange';
 
 export function useCalendarNavigation(callbacks: {
     onDatesChange: (payload: { start: Dayjs; end: Dayjs }) => void;
@@ -35,10 +34,24 @@ export function useCalendarNavigation(callbacks: {
         return days;
     });
 
-    const rangeLabel = computed(() => {
+    const viewTitle = computed(() => {
+        if (activeView.value === 'timeGridDay') {
+            return currentDate.value.format('MMMM YYYY');
+        }
+
         const days = viewDays.value;
         if (days.length === 0) return '';
-        return getDateRangeLabel(days[0]!, days[days.length - 1]!);
+
+        const first = days[0]!;
+        const last = days[days.length - 1]!;
+
+        if (first.year() !== last.year()) {
+            return `${first.format('MMM YYYY')} \u2013 ${last.format('MMM YYYY')}`;
+        }
+        if (first.month() !== last.month()) {
+            return `${first.format('MMM')} \u2013 ${last.format('MMM YYYY')}`;
+        }
+        return first.format('MMMM YYYY');
     });
 
     function emitDatesChange() {
@@ -86,7 +99,7 @@ export function useCalendarNavigation(callbacks: {
         activeView,
         currentDate,
         viewDays,
-        rangeLabel,
+        viewTitle,
         emitDatesChange,
         handlePrev,
         handleNext,

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

@@ -8,7 +8,7 @@ import {
     TooltipProvider,
     TooltipTrigger,
 } from '@/packages/ui/src/tooltip';
-const active = defineModel<boolean>({ default: false });
+const active = defineModel({ default: false });
 const emit = defineEmits(['changed']);
 function toggleBillable() {
     active.value = !active.value;

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

@@ -1,81 +0,0 @@
-<script setup lang="ts">
-import { ChevronLeft, ChevronRight, CalendarIcon } from '@lucide/vue';
-import { Button } from '../Buttons';
-
-withDefaults(
-    defineProps<{
-        label: string;
-        secondaryLabel?: string;
-        previousDisabled?: boolean;
-        nextDisabled?: boolean;
-        previousTestId?: string;
-        triggerTestId?: string;
-        nextTestId?: string;
-        triggerAriaLabel?: string;
-    }>(),
-    {
-        secondaryLabel: undefined,
-        previousTestId: undefined,
-        triggerTestId: undefined,
-        nextTestId: undefined,
-        triggerAriaLabel: undefined,
-    }
-);
-
-const emit = defineEmits<{
-    previous: [];
-    next: [];
-    select: [];
-}>();
-
-const triggerClass =
-    'h-8 w-[13.5rem] justify-center rounded-none border-l border-r border-border-secondary px-2.5 text-text-primary tabular-nums hover:bg-card-background-active';
-</script>
-
-<template>
-    <div
-        class="tabular-nums inline-flex items-stretch overflow-hidden rounded-md border border-input bg-card-background shadow-xs dark:bg-transparent"
-        role="group"
-        aria-label="Date range navigation">
-        <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            class="h-8 w-8 shrink-0 rounded-none hover:bg-card-background-active"
-            aria-label="Previous"
-            :disabled="previousDisabled"
-            :data-testid="previousTestId"
-            @click="emit('previous')">
-            <ChevronLeft class="h-4 w-4" />
-        </Button>
-
-        <slot name="trigger" :trigger-class="triggerClass">
-            <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                :class="triggerClass"
-                :aria-label="triggerAriaLabel"
-                :data-testid="triggerTestId"
-                @click="emit('select')">
-                <CalendarIcon class="h-4 w-4 shrink-0 text-icon-default" />
-                <span class="min-w-0 truncate">{{ label }}</span>
-                <span v-if="secondaryLabel" class="shrink-0 text-text-tertiary">
-                    &middot; {{ secondaryLabel }}
-                </span>
-            </Button>
-        </slot>
-
-        <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            class="h-8 w-8 shrink-0 rounded-none hover:bg-card-background-active"
-            aria-label="Next"
-            :disabled="nextDisabled"
-            :data-testid="nextTestId"
-            @click="emit('next')">
-            <ChevronRight class="h-4 w-4" />
-        </Button>
-    </div>
-</template>

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

@@ -6,22 +6,22 @@ import { CalendarDate } from '@internationalized/date';
 import { CalendarIcon } from '@lucide/vue';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
-import DateRangeNavigator from './DateRangeNavigator.vue';
-import { getLocalizedDayJs, firstDayIndex, type WeekStartDay } from '@/packages/ui/src/utils/time';
-import { getDateRangeLabel, shiftDateRange, type DateRangeDirection } from '../utils/dateRange';
+import {
+    getDayJsInstance,
+    getLocalizedDayJs,
+    firstDayIndex,
+    type WeekStartDay,
+} from '@/packages/ui/src/utils/time';
 import { type Organization } from '@/packages/api/src';
 import { getUserTimezone } from '@/packages/ui/src/utils/settings';
+import { formatDate } from '@/packages/ui/src/utils/time';
 
 const weekStartsOn = computed((): WeekStartDay => firstDayIndex.value as WeekStartDay);
 
-const props = withDefaults(
-    defineProps<{
-        start: string;
-        end: string;
-        allowFuture?: boolean;
-    }>(),
-    { allowFuture: false }
-);
+const props = defineProps<{
+    start: string;
+    end: string;
+}>();
 
 const emit = defineEmits<{
     (e: 'update:start', value: string): void;
@@ -35,13 +35,10 @@ interface CalendarDateRange {
 }
 
 const today = computed(() => {
-    const now = getLocalizedDayJs();
+    const now = getDayJsInstance()();
     return new CalendarDate(now.year(), now.month() + 1, now.date());
 });
 
-const startDay = computed(() => (props.start ? getLocalizedDayJs(props.start) : undefined));
-const endDay = computed(() => (props.end ? getLocalizedDayJs(props.end) : undefined));
-
 const modelValue = computed<CalendarDateRange>({
     get: () => ({
         start: props.start
@@ -94,7 +91,7 @@ function setLastWeek() {
 }
 
 function setLast14Days() {
-    emit('update:start', getLocalizedDayJs().subtract(13, 'days').startOf('day').format());
+    emit('update:start', getLocalizedDayJs().subtract(14, 'days').format());
     emit('update:end', getLocalizedDayJs().format());
     open.value = false;
 }
@@ -112,14 +109,14 @@ function setLastMonth() {
 }
 
 function setLast30Days() {
-    emit('update:start', getLocalizedDayJs().subtract(29, 'days').startOf('day').format());
+    emit('update:start', getLocalizedDayJs().subtract(30, 'days').format());
     emit('update:end', getLocalizedDayJs().format());
     open.value = false;
 }
 
 function setLast90Days() {
-    emit('update:start', getLocalizedDayJs().subtract(89, 'days').startOf('day').format());
-    emit('update:end', getLocalizedDayJs().format());
+    emit('update:start', getDayJsInstance()().subtract(90, 'days').format());
+    emit('update:end', getDayJsInstance()().format());
     open.value = false;
 }
 
@@ -143,38 +140,6 @@ function setLastYear() {
 
 const organization = inject<ComputedRef<Organization>>('organization');
 
-const displayLabel = computed(() => {
-    if (!startDay.value) return 'Pick a date';
-    if (!endDay.value) {
-        return getDateRangeLabel(startDay.value, startDay.value, {
-            dateFormat: organization?.value?.date_format,
-        });
-    }
-    return getDateRangeLabel(startDay.value, endDay.value, {
-        dateFormat: organization?.value?.date_format,
-    });
-});
-
-const nextRange = computed(() => {
-    if (!startDay.value || !endDay.value) return undefined;
-    return shiftDateRange(startDay.value, endDay.value, 1);
-});
-
-const nextDisabled = computed(
-    () =>
-        !props.allowFuture &&
-        !!nextRange.value &&
-        nextRange.value.start.isAfter(getLocalizedDayJs().endOf('day'))
-);
-
-function navigate(direction: DateRangeDirection) {
-    if (!startDay.value || !endDay.value) return;
-    const shifted = shiftDateRange(startDay.value, endDay.value, direction);
-    emit('update:start', shifted.start.format());
-    emit('update:end', shifted.end.format());
-    emit('submit');
-}
-
 watch(open, (value) => {
     if (value === false) {
         emit('submit');
@@ -183,120 +148,77 @@ watch(open, (value) => {
 </script>
 
 <template>
-    <DateRangeNavigator
-        :label="displayLabel"
-        :next-disabled="nextDisabled"
-        previous-test-id="date_range_picker_previous"
-        trigger-test-id="date_range_picker_display"
-        next-test-id="date_range_picker_next"
-        @previous="navigate(-1)"
-        @next="navigate(1)">
-        <template #trigger="{ triggerClass }">
-            <Popover v-model:open="open">
-                <PopoverTrigger as-child>
-                    <Button
-                        type="button"
-                        variant="ghost"
-                        size="sm"
-                        :class="twMerge(triggerClass, !modelValue.start && 'text-muted-foreground')"
-                        data-testid="date_range_picker_display">
-                        <CalendarIcon class="text-text-quaternary h-4 w-4 shrink-0" />
-                        <span class="min-w-0 truncate">{{ displayLabel }}</span>
-                    </Button>
-                </PopoverTrigger>
-                <PopoverContent class="w-auto p-0">
-                    <div class="flex divide-x divide-border-secondary">
-                        <div
-                            class="text-text-primary text-sm flex flex-col space-y-0.5 items-start py-2 px-2">
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setToday"
-                                >Today</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setThisWeek"
-                                >This Week</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLastWeek"
-                                >Last Week</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLast14Days"
-                                >Last 14 Days</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setThisMonth"
-                                >This Month</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLastMonth"
-                                >Last Month</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLast30Days"
-                                >Last 30 Days</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLast90Days"
-                                >Last 90 Days</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLast12Months"
-                                >Last 12 Months</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setThisYear"
-                                >This Year</Button
-                            >
-                            <Button
-                                variant="ghost"
-                                size="sm"
-                                class="justify-start"
-                                @click="setLastYear"
-                                >Last Year</Button
-                            >
-                        </div>
-                        <div class="pl-2">
-                            <RangeCalendar
-                                v-model="modelValue"
-                                initial-focus
-                                :number-of-months="2"
-                                :max-value="allowFuture ? undefined : today"
-                                :week-starts-on="weekStartsOn" />
-                        </div>
-                    </div>
-                </PopoverContent>
-            </Popover>
-        </template>
-    </DateRangeNavigator>
+    <Popover v-model:open="open">
+        <PopoverTrigger as-child>
+            <Button
+                variant="outline"
+                :class="
+                    twMerge(
+                        'flex w-full items-center justify-between whitespace-nowrap h-[34px] text-start',
+                        !modelValue && 'text-muted-foreground'
+                    )
+                ">
+                <CalendarIcon class="-ml-0.5 text-text-quaternary h-4 w-4" />
+                <template v-if="modelValue.start">
+                    <template v-if="modelValue.end">
+                        {{ formatDate(modelValue.start.toString(), organization?.date_format) }}
+                        -
+                        {{ formatDate(modelValue.end.toString(), organization?.date_format) }}
+                    </template>
+                    <template v-else>
+                        {{ formatDate(modelValue.start.toString(), organization?.date_format) }}
+                    </template>
+                </template>
+                <template v-else> Pick a date </template>
+            </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+            <div class="flex divide-x divide-border-secondary">
+                <div
+                    class="text-text-primary text-sm flex flex-col space-y-0.5 items-start py-2 px-2">
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setToday"
+                        >Today</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setThisWeek"
+                        >This Week</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLastWeek"
+                        >Last Week</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLast14Days"
+                        >Last 14 days</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setThisMonth"
+                        >This Month</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLastMonth"
+                        >Last Month</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLast30Days"
+                        >Last 30 days</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLast90Days"
+                        >Last 90 days</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLast12Months"
+                        >Last 12 months</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setThisYear"
+                        >This year</Button
+                    >
+                    <Button variant="ghost" size="sm" class="justify-start" @click="setLastYear"
+                        >Last year</Button
+                    >
+                </div>
+                <div class="pl-2">
+                    <RangeCalendar
+                        v-model="modelValue"
+                        initial-focus
+                        :number-of-months="2"
+                        :max-value="today"
+                        :week-starts-on="weekStartsOn" />
+                </div>
+            </div>
+        </PopoverContent>
+    </Popover>
 </template>

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

@@ -16,7 +16,7 @@ const props = withDefaults(
 );
 
 const emit = defineEmits(['open', 'submit']);
-const open = defineModel<boolean>({ default: false });
+const open = defineModel({ default: false });
 
 function handleAutofocus(event: Event) {
     if (props.autoFocus === false) {

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

@@ -13,11 +13,11 @@ import { type ComputedRef } from 'vue';
 
 const temporaryCustomTimerEntry = ref<string>('');
 
-const start = defineModel<string>('start', {
+const start = defineModel('start', {
     default: '',
 });
 
-const end = defineModel<string>('end', {
+const end = defineModel('end', {
     default: '',
 });
 

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

@@ -20,7 +20,7 @@ const NONE_ID = 'none';
 const ROW_HEIGHT = 32;
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const props = defineProps<{

resources/js/packages/ui/src/Tag/TagDropdown.vue

@@ -32,7 +32,7 @@ const props = withDefaults(
 );
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const open = ref(false);

resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue

@@ -21,7 +21,7 @@ import TimeEntryRow from '@/packages/ui/src/TimeEntry/TimeEntryRow.vue';
 import type { TimeEntriesGroupedByType } from '@/types/time-entries';
 
 const selectedTimeEntries = defineModel<TimeEntry[]>('selected', {
-    default: () => [],
+    default: [],
 });
 
 const props = withDefaults(

resources/js/packages/ui/src/TimeEntry/TimeEntryRowTagDropdown.vue

@@ -20,7 +20,7 @@ const emit = defineEmits<{
 }>();
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 
 const timeEntryTags = computed<Tag[]>(() => {

resources/js/packages/ui/src/TimeTracker/TimeTrackerTagDropdown.vue

@@ -10,7 +10,7 @@ const emit = defineEmits<{
 }>();
 
 const model = defineModel<string[]>({
-    default: () => [],
+    default: [],
 });
 const iconColorClasses = computed(() => {
     if (model.value.length > 0) {

resources/js/packages/ui/src/TimezoneMismatchModal.vue

@@ -7,7 +7,7 @@ import { getUserTimezone } from './utils/settings';
 import { getDayJsInstance } from './utils/time';
 import { useSessionStorage } from '@vueuse/core';
 
-const show = defineModel<boolean>('show', { default: false });
+const show = defineModel('show', { default: false });
 
 const emit = defineEmits<{
     update: [timezone: string];

resources/js/packages/ui/src/combobox/Combobox.vue

@@ -1,25 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxRootEmits, ComboboxRootProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxRoot, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxRootProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxRootEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <!-- Keep the trigger inside this root. Reka treats anything within the root
-         element as "not outside", so it suppresses its own dismissal for trigger
-         clicks and ComboboxInput's blur-close ignores them. Putting the trigger
-         in a separate Popover instead gives two competing open states, and the
-         popover then closes on mousedown and reopens on the following click. -->
-    <ComboboxRoot v-slot="slotProps" v-bind="forwarded" :class="cn('min-w-0', props.class)">
-        <slot v-bind="slotProps" />
-    </ComboboxRoot>
-</template>

resources/js/packages/ui/src/combobox/ComboboxAnchor.vue

@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxAnchorProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxAnchor, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxAnchorProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <ComboboxAnchor v-bind="forwarded" :class="cn('w-full', props.class)">
-        <slot />
-    </ComboboxAnchor>
-</template>

resources/js/packages/ui/src/combobox/ComboboxInput.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxInputEmits, ComboboxInputProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { Search } from '@lucide/vue';
-import { ComboboxInput, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-defineOptions({
-    inheritAttrs: false,
-});
-
-const props = defineProps<ComboboxInputProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxInputEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <div class="relative items-center border-b border-card-background-separator">
-        <ComboboxInput
-            v-bind="{ ...$attrs, ...forwarded }"
-            :class="
-                cn(
-                    'h-10 w-full border-0 rounded-none bg-transparent pl-9 pr-3 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none focus:ring-0',
-                    props.class
-                )
-            " />
-        <span class="absolute start-0 inset-y-0 flex items-center justify-center px-3">
-            <Search class="size-4 text-text-tertiary" />
-        </span>
-    </div>
-</template>

resources/js/packages/ui/src/combobox/ComboboxItem.vue

@@ -1,27 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxItemEmits, ComboboxItemProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxItem, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxItemProps & { class?: HTMLAttributes['class'] }>();
-const emits = defineEmits<ComboboxItemEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <ComboboxItem
-        v-bind="forwarded"
-        :class="
-            cn(
-                'flex w-full cursor-default items-center rounded-md px-2 py-1.5 text-sm text-text-primary data-[highlighted]:bg-card-background-active',
-                props.class
-            )
-        ">
-        <slot />
-    </ComboboxItem>
-</template>

resources/js/packages/ui/src/combobox/ComboboxList.vue

@@ -1,41 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxContentEmits, ComboboxContentProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxContent, ComboboxPortal, useForwardPropsEmits } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-defineOptions({
-    inheritAttrs: false,
-});
-
-const props = withDefaults(
-    defineProps<ComboboxContentProps & { class?: HTMLAttributes['class'] }>(),
-    {
-        position: 'popper',
-        align: 'start',
-        sideOffset: 4,
-        class: undefined,
-    }
-);
-const emits = defineEmits<ComboboxContentEmits>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-    <ComboboxPortal>
-        <ComboboxContent
-            v-bind="{ ...$attrs, ...forwarded }"
-            :class="
-                cn(
-                    'z-50 w-[--reka-popper-anchor-width] min-w-60 overflow-hidden rounded-lg border border-popover-border bg-popover text-popover-foreground shadow-dropdown outline-none origin-[var(--reka-combobox-content-transform-origin)] data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
-                    props.class
-                )
-            ">
-            <slot />
-        </ComboboxContent>
-    </ComboboxPortal>
-</template>

resources/js/packages/ui/src/combobox/ComboboxSeparator.vue

@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import type { ComboboxSeparatorProps } from 'reka-ui';
-import type { HTMLAttributes } from 'vue';
-import { reactiveOmit } from '@vueuse/core';
-import { ComboboxSeparator, useForwardProps } from 'reka-ui';
-import { cn } from '../utils/cn';
-
-const props = defineProps<ComboboxSeparatorProps & { class?: HTMLAttributes['class'] }>();
-
-const delegatedProps = reactiveOmit(props, 'class');
-
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-    <ComboboxSeparator
-        v-bind="forwarded"
-        :class="cn('my-1 h-px bg-card-background-separator', props.class)" />
-</template>