Add more tests; Add filter in filament resource; Added options for user create command

.env.ci

@@ -1,4 +1,3 @@
-# Application
 APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=
@@ -6,6 +5,7 @@ APP_DEBUG=true
 APP_URL=http://localhost
 APP_FORCE_HTTPS=false
 APP_ENABLE_REGISTRATION=true
+SESSION_SECURE_COOKIE=false
 
 # Logging
 LOG_CHANNEL=stack
@@ -20,39 +20,35 @@ DB_TEST_DATABASE=laravel
 DB_TEST_USERNAME=root
 DB_TEST_PASSWORD=root
 
-# Broadcasting
-BROADCAST_DRIVER=null
-
-# Cache
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-
-# Queue
 QUEUE_CONNECTION=sync
-
-# Session
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
 # Mail
 MAIL_MAILER=log
-MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
 
 # Filesystems
 FILESYSTEM_DISK=local
 PUBLIC_FILESYSTEM_DISK=public
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
-
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
 # Services
 GOTENBERG_URL=http://0.0.0.0:3000
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.env.example

@@ -4,7 +4,7 @@ APP_ENV=local
 APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
-APP_FORCE_HTTPS=false
+AUDITING_ENABLED=true
 APP_ENABLE_REGISTRATION=true
 SUPER_ADMINS=admin@example.com
 PAGINATION_PER_PAGE_DEFAULT=500
@@ -49,9 +49,7 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_NAME="${APP_NAME}"
 
 # Filesystems
 FILESYSTEM_DISK=s3
@@ -64,24 +62,14 @@ S3_URL=http://storage.solidtime.test/local
 S3_ENDPOINT=http://storage.solidtime.test
 S3_USE_PATH_STYLE_ENDPOINT=true
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
-
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
 # Services
 GOTENBERG_URL=http://gotenberg:3000
 
+VITE_HOST_NAME=vite.solidtime.test
+VITE_APP_NAME="${APP_NAME}"
+
 # Local setup
 NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing
 FORWARD_DB_PORT=5432
 FORWARD_WEB_PORT=8083
-VITE_HOST_NAME=vite.solidtime.test
-VITE_APP_NAME="${APP_NAME}"
-#SAIL_XDEBUG_MODE=develop,debug,coverage

.env.production

@@ -5,6 +5,7 @@ VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false
 APP_FORCE_HTTPS=true
+SESSION_SECURE_COOKIE=true
 OCTANE_SERVER=frankenphp
 PAGINATION_PER_PAGE_DEFAULT=500
 

.eslintrc.cjs

@@ -0,0 +1,13 @@
+/* eslint-env node */
+require("@rushstack/eslint-patch/modern-module-resolution")
+
+module.exports = {
+    extends: ['plugin:vue/vue3-essential', '@vue/eslint-config-typescript/recommended', '@vue/eslint-config-prettier'],
+    rules: {
+        'vue/multi-word-component-names': 'off',
+        "@typescript-eslint/no-unused-vars": "off",
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": "error",
+    },
+    plugins: ['unused-imports'],
+}

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -1,47 +0,0 @@
-name: Bug Report
-description: "Report a bug"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before creating a new bug report, please check that there isn't already a similar issue.
-
-  - type: textarea
-    attributes:
-      label: Description
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: "Steps To Reproduce"
-      description: How do you trigger this bug? Please walk us through it step by step.
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: false
-
-  - type: dropdown
-    attributes:
-      label: "Self-hosted or Cloud?"
-      options:
-        - Self-Hosted
-        - solidtime Cloud
-        - Both
-
-  - type: input
-    attributes:
-      label: "Version of solidtime: (for self-hosted)"
-    validations:
-      required: false
-
-  - type: input
-    attributes:
-      label: "solidtime self-hosting guide: (for self-hosted)"
-      description: "Did you use the official guide to self-host solidtime? If yes, which one?"
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 🚀 Feature Request
-    url: https://github.com/solidtime-io/solidtime/discussions/new?category=feature-requests
-    about: Share ideas for new features
-  - name: ❓ Ask a Question
-    url: https://github.com/solidtime-io/solidtime/discussions/new?category=general
-    about: Ask the community for help

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +0,0 @@
-<!--
-This project is early stage. The structure and APIs are still subject to change and not stable.
-Therefore, we do not currently accept any contributions, unless you are a member of the team.
-
-As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
-
-We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
--->

.github/workflows/build-private.yml

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

.github/workflows/build-public.yml

@@ -11,21 +11,10 @@ on:
       - 'docker/prod/**'
   workflow_dispatch:
 
-env:
-  DOCKERHUB_REPO: solidtime/solidtime
-  GHCR_REPO: ghcr.io/solidtime-io/solidtime
-
 name: Build - Public
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-          - runs-on: "ubuntu-24.04-arm"
-            platform: "linux/arm64"
-          - runs-on: "ubuntu-24.04"
-            platform: "linux/amd64"
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read
@@ -40,7 +29,7 @@ jobs:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
       - name: "Get build"
-        id: release-build
+        id: build
         run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
 
       - name: "Get Previous tag (normal push)"
@@ -51,7 +40,7 @@ jobs:
           prefix: "v"
 
       - name: "Get version"
-        id: release-version
+        id: version
         run: |
           if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
             if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
@@ -72,23 +61,21 @@ jobs:
           rm .env.production .env.ci .env.example
 
       - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.release-version.outputs.app_version }}/g' .env
+        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
 
       - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.release-build.outputs.build }}/g' .env
+        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
 
       - name: "Output .env"
         run: cat .env
 
-      - name: "Setup PHP with PECL extension"
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: mbstring, dom, fileinfo, pgsql
-
       - name: "Install dependencies"
-        run: composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+        uses: php-actions/composer@v6
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
+        with:
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
 
       - name: "Use Node.js"
         uses: actions/setup-node@v4
@@ -101,31 +88,29 @@ jobs:
       - name: "Build"
         run: npm run build
 
-      - name: "Prepare"
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: "Docker meta"
-        id: "meta"
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
-
-      - name: "Login to Docker Hub Container Registry"
+      - name: "Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: "Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Docker meta"
+        id: "meta"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            solidtime/solidtime
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: "Set up QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,90 +118,16 @@ jobs:
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
-      - name: "Build and push by digest"
-        id: build
+      - name: "Build and push"
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
           build-args: |
             DOCKER_FILES_BASE_PATH=docker/prod/
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
-      - name: "Export digest"
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: "Upload digest"
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    timeout-minutes: 90
-    needs:
-      - build
-    steps:
-      - name: "Download digests"
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: "Login to Docker Hub"
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: "Login to GHCR"
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
-
-      - name: "Docker meta"
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: "Create manifest list and push"
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
-
-      - name: "Inspect image"
-        run: |
-          docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
-          docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }}

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

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci

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

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:

.github/workflows/phpunit.yml

@@ -63,7 +63,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v4.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -10,6 +10,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Check code style"
-        uses: aglipanci/laravel-pint-action@2.5
+        uses: aglipanci/laravel-pint-action@2.4
         with:
           configPath: "pint.json"

.github/workflows/playwright.yml

@@ -27,47 +27,45 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v4
 
-      - name: "Setup node"
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Setup PHP"
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.3'
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
           coverage: none
 
-      - name: "Run composer install"
+      - name: Run composer install
         run: composer install -n --prefer-dist
 
-      - name: "Prepare Laravel Application"
+      - name: Prepare Laravel Application
         run: |
           cp .env.ci .env
           php artisan key:generate
-          php artisan passport:keys
           php artisan migrate --seed
+          php artisan passport:keys
 
-      - name: "Install dependencies"
+      - name: Install dependencies
         run: npm ci
 
-      - name: "Build Frontend"
+      - name: Build Frontend
         run: npm run build
 
-      - name: "Run Laravel Server"
+      - name: Run Laravel Server
         run: php artisan serve > /dev/null 2>&1 &
 
-      - name: "Install Playwright Browsers"
+      - name: Install Playwright Browsers
         run: npx playwright install --with-deps
 
-      - name: "Run Playwright tests"
+      - name: Run Playwright tests
         run: npx playwright test
         env:
           PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
 
-      - name: "Upload test results"
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-results

app/Actions/Fortify/CreateNewUser.php

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

app/Actions/Jetstream/CreateOrganization.php

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

app/Console/Commands/Admin/UserCreateCommand.php

@@ -57,15 +57,14 @@ class UserCreateCommand extends Command
         }
 
         $user = null;
-        DB::transaction(function () use (&$user, $name, $email, $password, $verifyEmail): void {
+        DB::transaction(function () use (&$user, $name, $email, $password): void {
             $user = app(UserService::class)->createUser(
                 $name,
                 $email,
                 $password,
                 'UTC',
                 Weekday::Monday,
-                null,
-                verifyEmail: $verifyEmail
+                'EUR',
             );
         });
         /** @var Organization|null $organization */
@@ -74,6 +73,10 @@ class UserCreateCommand extends Command
             throw new LogicException('User does not have an organization');
         }
 
+        if ($verifyEmail) {
+            $user->markEmailAsVerified();
+        }
+
         $this->info('Created user "'.$name.'" ("'.$email.'")');
         $this->line('ID: '.$user->getKey());
         $this->line('Name: '.$name);

app/Console/Commands/Correction/CorrectionPlaceholderMembersCommand.php

@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\Correction;
-
-use App\Enums\Role;
-use App\Models\Member;
-use App\Models\User;
-use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Builder;
-
-class CorrectionPlaceholderMembersCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'correction:placeholder-members '.
-        ' { --dry-run : Do not actually save anything to the database, just output what would happen }';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Sets all members who belong to a placeholder user to role placeholder';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $this->comment('Sets all members who belong to a placeholder user to role placeholder...');
-        $dryRun = (bool) $this->option('dry-run');
-        if ($dryRun) {
-            $this->comment('Running in dry-run mode. Nothing will be saved to the database.');
-        }
-
-        $members = Member::query()
-            ->where('role', '!=', Role::Placeholder->value)
-            ->whereHas('user', function (Builder $builder): void {
-                /** @var Builder<User> $builder */
-                $builder->where('is_placeholder', '=', true);
-            })
-            ->get();
-        foreach ($members as $member) {
-            /** @var Member $member */
-            $member->role = Role::Placeholder->value;
-            if (! $dryRun) {
-                $member->save();
-            }
-            $this->line('Set role of member (id='.$member->getKey().') to placeholder');
-        }
-
-        return self::SUCCESS;
-    }
-}

app/Enums/CurrencyFormat.php

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

app/Enums/DateFormat.php

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

app/Enums/IntervalFormat.php

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

app/Enums/NumberFormat.php

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

app/Enums/TimeFormat.php

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

app/Exceptions/Api/ChangingRoleOfPlaceholderIsNotAllowed.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class ChangingRoleOfPlaceholderIsNotAllowed extends ApiException
-{
-    public const string KEY = 'changing_role_of_placeholder_is_not_allowed';
-}

app/Exceptions/Api/OnlyPlaceholdersCanBeMergedIntoAnotherMember.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class OnlyPlaceholdersCanBeMergedIntoAnotherMember extends ApiException
-{
-    public const string KEY = 'only_placeholders_can_be_merged_into_another_member';
-}

app/Exceptions/Api/PersonalAccessClientIsNotConfiguredException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class PersonalAccessClientIsNotConfiguredException extends ApiException
-{
-    public const string KEY = 'personal_access_client_is_not_configured';
-}

app/Exceptions/Api/ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-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';
-}

app/Filament/Resources/OrganizationResource.php

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

app/Filament/Resources/TokenResource.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\TokenResource\Pages;
-use App\Models\Passport\Client;
-use App\Models\Passport\Token;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Filters\TernaryFilter;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-
-class TokenResource extends Resource
-{
-    protected static ?string $model = Token::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-key';
-
-    protected static ?string $navigationGroup = 'Auth';
-
-    protected static ?int $navigationSort = 6;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('id')
-                    ->label('ID')
-                    ->disabled()
-                    ->visibleOn(['update', 'show'])
-                    ->readOnly()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('name')
-                    ->label('Name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\Select::make('user_id')
-                    ->label('User')
-                    ->relationship(name: 'user', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabled()
-                    ->required(),
-                Forms\Components\Select::make('client_id')
-                    ->label('Client')
-                    ->relationship(name: 'client', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->required(),
-                Forms\Components\Toggle::make('revoked')
-                    ->label('Revoked')
-                    ->required(),
-                Forms\Components\DateTimePicker::make('expires_at')
-                    ->label('Expires At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('user.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('client.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('client.personal_access_client')
-                    ->boolean()
-                    ->label('API token?')
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('revoked')
-                    ->boolean()
-                    ->label('Revoked?')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('expires_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                TernaryFilter::make('is_personal_access_client')
-                    ->queries(
-                        true: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', true);
-                            });
-                        },
-                        false: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', false);
-                            });
-                        },
-                        blank: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query;
-                        },
-                    )
-                    ->label('API token?'),
-                TernaryFilter::make('revoked')
-                    ->label('Revoked?'),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-            ])
-            ->bulkActions([
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListTokens::route('/'),
-            'view' => Pages\ViewToken::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ListTokens.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListTokens extends ListRecords
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ViewToken.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewToken extends ViewRecord
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/UserResource.php

@@ -25,7 +25,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
 class UserResource extends Resource
@@ -40,9 +39,6 @@ class UserResource extends Resource
 
     public static function form(Form $form): Form
     {
-        /** @var User|null $record */
-        $record = $form->getRecord();
-
         return $form
             ->columns(1)
             ->schema([
@@ -59,13 +55,6 @@ class UserResource extends Resource
                 Forms\Components\TextInput::make('email')
                     ->label('Email')
                     ->required()
-                    ->rules($record?->is_placeholder ? [] : [
-                        UniqueEloquent::make(User::class, 'email')
-                            ->ignore($record?->getKey()),
-                    ])
-                    ->rule([
-                        'email',
-                    ])
                     ->maxLength(255),
                 Forms\Components\Toggle::make('is_placeholder')
                     ->label('Is Placeholder?')
@@ -73,11 +62,7 @@ class UserResource extends Resource
                     ->disabledOn(['edit']),
                 Forms\Components\DateTimePicker::make('email_verified_at')
                     ->label('Email Verified At')
-                    ->hiddenOn(['create'])
                     ->nullable(),
-                Forms\Components\Toggle::make('is_email_verified')
-                    ->label('Email Verified?')
-                    ->visibleOn(['create']),
                 Forms\Components\Select::make('timezone')
                     ->label('Timezone')
                     ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
@@ -89,16 +74,8 @@ class UserResource extends Resource
                     ->required(),
                 TextInput::make('password')
                     ->password()
-                    ->label('Password')
                     ->dehydrateStateUsing(fn ($state) => Hash::make($state))
                     ->dehydrated(fn ($state) => filled($state))
-                    ->hiddenOn(['create'])
-                    ->required(fn (string $context): bool => $context === 'create')
-                    ->maxLength(255),
-                TextInput::make('password_create')
-                    ->password()
-                    ->label('Password')
-                    ->visibleOn(['create'])
                     ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
                 Forms\Components\Select::make('currency')

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

@@ -20,11 +20,10 @@ class CreateUser extends CreateRecord
         $user = $userService->createUser(
             $data['name'],
             $data['email'],
-            $data['password_create'],
+            $data['password'],
             $data['timezone'],
             Weekday::from($data['week_start']),
             $data['currency'],
-            verifyEmail: (bool) $data['is_email_verified']
         );
 
         return $user;

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

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
-use App\Http\Requests\V1\ApiToken\ApiTokenStoreRequest;
-use App\Http\Resources\V1\ApiToken\ApiTokenCollection;
-use App\Http\Resources\V1\ApiToken\ApiTokenWithAccessTokenResource;
-use App\Models\Passport\Token;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ApiTokenController extends Controller
-{
-    /**
-     * List all api token of the currently authenticated user
-     *
-     * This endpoint is independent of organization.
-     *
-     * @operationId getApiTokens
-     *
-     * @throws AuthorizationException
-     */
-    public function index(): ApiTokenCollection
-    {
-        $user = $this->user();
-
-        $tokens = $user->tokens()
-            ->where('client_id', '=', config('passport.personal_access_client.id'))
-            ->get();
-
-        return new ApiTokenCollection($tokens);
-    }
-
-    /**
-     * Create a new api token for the currently authenticated user
-     *
-     * The response will contain the access token that can be used to send authenticated API requests.
-     * Please note that the access token is only shown in this response and cannot be retrieved later.
-     *
-     * @operationId createApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function store(ApiTokenStoreRequest $request): ApiTokenWithAccessTokenResource
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-
-        $token = $user->createToken($request->getName(), ['*']);
-        /** @var Token $tokenModel */
-        $tokenModel = $token->token;
-
-        return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
-    }
-
-    /**
-     * Revoke an api token
-     *
-     * @operationId revokeApiToken
-     *
-     * @throws AuthorizationException
-     * @throws PersonalAccessClientIsNotConfiguredException
-     */
-    public function revoke(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->revoke();
-
-        return response()->json(null, 204);
-    }
-
-    /**
-     * Delete an api token
-     *
-     * @operationId deleteApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function destroy(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->delete();
-
-        return response()->json(null, 204);
-    }
-}

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

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

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

@@ -7,17 +7,12 @@ namespace App\Http\Controllers\Api\V1;
 use App\Enums\Role;
 use App\Events\MemberMadeToPlaceholder;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
-use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
-use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
-use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
-use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
-use App\Http\Requests\V1\Member\MemberMergeIntoRequest;
 use App\Http\Requests\V1\Member\MemberUpdateRequest;
 use App\Http\Resources\V1\Member\MemberCollection;
 use App\Http\Resources\V1\Member\MemberResource;
@@ -29,8 +24,6 @@ use App\Service\MemberService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
 
 class MemberController extends Controller
 {
@@ -70,7 +63,6 @@ class MemberController extends Controller
      * @throws OrganizationNeedsAtLeastOneOwner
      * @throws OnlyOwnerCanChangeOwnership
      * @throws ChangingRoleToPlaceholderIsNotAllowed
-     * @throws ChangingRoleOfPlaceholderIsNotAllowed
      *
      * @operationId updateMember
      */
@@ -113,9 +105,7 @@ class MemberController extends Controller
     /**
      * Make a member a placeholder member
      *
-     * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization|ChangingRoleOfPlaceholderIsNotAllowed
-     *
-     * @operationId makePlaceholder
+     * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization
      */
     public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse
     {
@@ -124,9 +114,6 @@ class MemberController extends Controller
         if ($member->role === Role::Owner->value) {
             throw new CanNotRemoveOwnerFromOrganization;
         }
-        if ($member->role === Role::Placeholder->value) {
-            throw new ChangingRoleOfPlaceholderIsNotAllowed;
-        }
 
         $memberService->makeMemberToPlaceholder($member);
 
@@ -135,41 +122,10 @@ class MemberController extends Controller
         return response()->json(null, 204);
     }
 
-    /**
-     * Merge one member into another
-     *
-     * @throws AuthorizationException
-     * @throws OnlyPlaceholdersCanBeMergedIntoAnotherMember
-     * @throws \Throwable
-     *
-     * @operationId mergeMember
-     */
-    public function mergeInto(Organization $organization, Member $member, MemberMergeIntoRequest $request, MemberService $memberService): JsonResponse
-    {
-        $this->checkPermission($organization, 'members:merge-into', $member);
-
-        $user = $member->user;
-        if ($member->role !== Role::Placeholder->value || ! $user->is_placeholder) {
-            throw new OnlyPlaceholdersCanBeMergedIntoAnotherMember;
-        }
-        $memberTo = Member::findOrFail($request->getMemberId());
-
-        DB::transaction(function () use ($organization, $member, $user, $memberTo, $memberService): void {
-            $memberService->assignOrganizationEntitiesToDifferentMember($organization, $member, $memberTo);
-            $member->delete();
-            $user->delete();
-        });
-
-        return response()->json(null, 204);
-    }
-
     /**
      * Invite a placeholder member to become a real member of the organization
      *
-     * @throws AuthorizationException
-     * @throws UserNotPlaceholderApiException
-     * @throws UserIsAlreadyMemberOfOrganizationApiException
-     * @throws ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException
+     * @throws AuthorizationException|UserNotPlaceholderApiException
      *
      * @operationId invitePlaceholder
      */
@@ -182,10 +138,6 @@ class MemberController extends Controller
             throw new UserNotPlaceholderApiException;
         }
 
-        if (Str::endsWith($user->email, '@solidtime-import.test')) {
-            throw new ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
-        }
-
         $invitationService->inviteUser($organization, $user->email, Role::Employee);
 
         return response()->json(null, 204);

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

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

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

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

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

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

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

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

app/Http/Controllers/Web/DashboardController.php

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

app/Http/Controllers/Web/HealthCheckController.php

@@ -64,7 +64,6 @@ class HealthCheckController extends Controller
             $response['app_env'] = app()->environment();
             $response['app_timezone'] = config('app.timezone');
             $response['app_force_https'] = config('app.force_https');
-            $response['session_secure'] = config('session.secure');
             $response['trusted_proxies'] = config('trustedproxy.proxies');
             $headers = $request->headers->all();
             if (isset($headers['cookie'])) {

app/Http/Kernel.php

@@ -18,7 +18,7 @@ class Kernel extends HttpKernel
      * @var array<int, class-string|string>
      */
     protected $middleware = [
-        \App\Http\Middleware\ForceHttps::class,
+        // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
         \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,

app/Http/Middleware/ForceHttps.php

@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\URL;
-use Symfony\Component\HttpFoundation\Response;
-
-class ForceHttps
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next, string ...$guards): Response
-    {
-        if (config('app.force_https', false)) {
-            URL::forceScheme('https');
-            $request->server->set('HTTPS', 'on');
-            $request->headers->set('X-Forwarded-Proto', 'https');
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/TrustHosts.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustHosts as Middleware;
+
+class TrustHosts extends Middleware
+{
+    /**
+     * Get the host patterns that should be trusted.
+     *
+     * @return array<int, string|null>
+     */
+    public function hosts(): array
+    {
+        return [
+            $this->allSubdomainsOfApplicationUrl(),
+        ];
+    }
+}

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

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\ApiToken;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ApiTokenStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string>>
-     */
-    public function rules(): array
-    {
-        return [
-            'name' => [
-                'required',
-                'string',
-                'min:1',
-                'max:255',
-            ],
-        ];
-    }
-
-    public function getName(): string
-    {
-        return $this->input('name');
-    }
-}

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

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Member;
-
-use App\Models\Member;
-use App\Models\Organization;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Http\FormRequest;
-use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
-
-/**
- * @property Organization $organization
- */
-class MemberMergeIntoRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
-     */
-    public function rules(): array
-    {
-        return [
-            // ID of the member to which the data should be transferred (destination)
-            'member_id' => [
-                'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<Member> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-            ],
-        ];
-    }
-
-    public function getMemberId(): string
-    {
-        return (string) $this->input('member_id');
-    }
-}

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

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

app/Http/Resources/V1/ApiToken/ApiTokenCollection.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ApiTokenCollection extends ResourceCollection
-{
-    /**
-     * The resource that this resource collects.
-     *
-     * @var string
-     */
-    public $collects = ApiTokenResource::class;
-}

app/Http/Resources/V1/ApiToken/ApiTokenResource.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use App\Http\Resources\V1\BaseResource;
-use App\Models\Passport\Token;
-use Illuminate\Http\Request;
-
-/**
- * @property-read Token $resource
- */
-class ApiTokenResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, string|bool|int|null|array<string>>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            /** @var string $id ID of the API token, this ID is NOT a UUID */
-            'id' => $this->resource->id,
-            /** @var string $name Name of the API token */
-            'name' => $this->resource->name,
-            /** @var bool $revoked Whether the API token is revoked */
-            'revoked' => $this->resource->revoked,
-            /** @var array<string> $scopes List of scopes that the API token has */
-            'scopes' => $this->resource->scopes,
-            /** @var string $created_at When the API token was created (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
-            /** @var string|null $expires_at At what time the API token expires (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'expires_at' => $this->formatDateTime($this->resource->expires_at),
-        ];
-    }
-}

app/Http/Resources/V1/ApiToken/ApiTokenWithAccessTokenResource.php

@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\ApiToken;
-
-use App\Http\Resources\V1\BaseResource;
-use App\Models\Passport\Token;
-use Illuminate\Http\Request;
-
-/**
- * @property-read Token $resource
- */
-class ApiTokenWithAccessTokenResource extends BaseResource
-{
-    private string $accessToken;
-
-    public function __construct(Token $resource, string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-        parent::__construct($resource);
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, string|bool|int|null|array<string>>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            /** @var string $id ID of the API token, this ID is NOT a UUID */
-            'id' => $this->resource->id,
-            /** @var string $name Name of the API token */
-            'name' => $this->resource->name,
-            /** @var bool $revoked Whether the API token is revoked */
-            'revoked' => $this->resource->revoked,
-            /** @var array<string> $scopes List of scopes that the API token has */
-            'scopes' => $this->resource->scopes,
-            /** @var string $created_at When the API token was created (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'created_at' => $this->formatDateTime($this->resource->created_at),
-            /** @var string|null $expires_at At what time the API token expires (ISO 8601 format, UTC timezone, example: 2024-02-26T17:17:17Z) */
-            'expires_at' => $this->formatDateTime($this->resource->expires_at),
-            // Additional fields
-            /** @var string $access_token Access token that can be used to authenticate requests */
-            'access_token' => $this->accessToken,
-        ];
-    }
-}

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

@@ -47,16 +47,6 @@ class OrganizationResource extends BaseResource
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->currency,
-            /** @var string $number_format Number format */
-            'number_format' => $this->resource->number_format->value,
-            /** @var string $currency_format Currency format */
-            'currency_format' => $this->resource->currency_format->value,
-            /** @var string $date_format Date format */
-            'date_format' => $this->resource->date_format->value,
-            /** @var string $interval_format Interval format */
-            'interval_format' => $this->resource->interval_format->value,
-            /** @var string $time_format Time format */
-            'time_format' => $this->resource->time_format->value,
         ];
     }
 }

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

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

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

@@ -18,20 +18,20 @@ use Illuminate\Http\Request;
  *              description: string|null,
  *              color: string|null,
  *              seconds: int,
- *              cost: int|null,
+ *              cost: int,
  *              grouped_type: string|null,
  *              grouped_data: null|array<array{
  *                  key: string|null,
  *                  description: string|null,
  *                  color: string|null,
  *                  seconds: int,
- *                  cost: int|null,
+ *                  cost: int,
  *                  grouped_type: null,
  *                  grouped_data: null
  *              }>
  *          }>,
  *          seconds: int,
- *          cost: int|null
+ *          cost: int
  *    }
  */
 class DetailedWithDataReportResource extends BaseResource
@@ -70,7 +70,7 @@ class DetailedWithDataReportResource extends BaseResource
             /** @var string|null $email Description */
             'description' => $this->resource->description,
             /** @var string|null $public_until Date until the report is public */
-            'public_until' => $this->formatDateTime($this->resource->public_until),
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
             /** @var string $currency Currency code (ISO 4217) */
             'currency' => $this->resource->organization->currency,
             'properties' => [
@@ -81,9 +81,9 @@ class DetailedWithDataReportResource extends BaseResource
                 /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
                 'history_group' => $this->resource->properties->historyGroup->value,
                 /** @var string $start Start date of the report */
-                'start' => $this->formatDateTime($this->resource->properties->start),
+                'start' => $this->resource->properties->start->toIso8601ZuluString(),
                 /** @var string $end End date of the report */
-                'end' => $this->formatDateTime($this->resource->properties->end),
+                'end' => $this->resource->properties->end->toIso8601ZuluString(),
             ],
             /** @var array{
              *        grouped_type: string|null,

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

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

app/Listeners/RemovePlaceholder.php

@@ -6,7 +6,7 @@ namespace App\Listeners;
 
 use App\Models\Member;
 use App\Models\User;
-use App\Service\MemberService;
+use App\Service\UserService;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Jetstream\Events\TeamMemberAdded;
 
@@ -17,11 +17,8 @@ class RemovePlaceholder
      */
     public function handle(TeamMemberAdded $event): void
     {
-        $memberService = app(MemberService::class);
-        $member = Member::query()
-            ->whereBelongsTo($event->team, 'organization')
-            ->whereBelongsTo($event->user, 'user')
-            ->firstOrFail();
+        /** @var UserService $userService */
+        $userService = app(UserService::class);
         $placeholders = Member::query()
             ->whereHas('user', function (Builder $query) use ($event): void {
                 /** @var Builder<User> $query */
@@ -35,7 +32,7 @@ class RemovePlaceholder
         foreach ($placeholders as $placeholder) {
             /** @var Member $placeholder */
             $placeholderUser = $placeholder->user;
-            $memberService->assignOrganizationEntitiesToDifferentMember($event->team, $placeholder, $member);
+            $userService->assignOrganizationEntitiesToDifferentUser($event->team, $placeholderUser, $event->user);
             $placeholder->delete();
             $placeholderUser->delete();
         }

app/Models/Member.php

@@ -7,7 +7,6 @@ namespace App\Models;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\MemberFactory;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -25,8 +24,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property Carbon|null $updated_at
  * @property-read Organization $organization
  * @property-read User $user
- * @property-read Collection<ProjectMember> $projectMembers
- * @property-read Collection<TimeEntry> $timeEntries
  *
  * @method static MemberFactory factory()
  */
@@ -62,14 +59,6 @@ class Member extends JetstreamMembership implements AuditableContract
         return $this->belongsTo(Organization::class, 'organization_id');
     }
 
-    /**
-     * @return HasMany<TimeEntry>
-     */
-    public function timeEntries(): HasMany
-    {
-        return $this->hasMany(TimeEntry::class, 'member_id');
-    }
-
     /**
      * @return HasMany<ProjectMember>
      */

app/Models/Organization.php

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

app/Models/Passport/AuthCode.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\AuthCode as PassportAuthCode;
-
-class AuthCode extends PassportAuthCode {}

app/Models/Passport/Client.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Database\Factories\Passport\ClientFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Laravel\Passport\Client as PassportClient;
-
-/**
- * @property string $id
- * @property string|null $user_id
- * @property string $name
- * @property string|null $secret
- * @property string|null $provider
- * @property string $redirect
- * @property bool $personal_access_client
- * @property bool $password_client
- * @property bool $revoked
- */
-class Client extends PassportClient
-{
-    /** @use HasFactory<ClientFactory> */
-    use HasFactory;
-}

app/Models/Passport/PersonalAccessClient.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\PersonalAccessClient as PassportPersonalAccessClient;
-
-class PersonalAccessClient extends PassportPersonalAccessClient {}

app/Models/Passport/RefreshToken.php

@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\RefreshToken as PassportRefreshToken;
-
-class RefreshToken extends PassportRefreshToken {}

app/Models/Passport/Token.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Database\Factories\Passport\TokenFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
-use Laravel\Passport\Token as PassportToken;
-
-/**
- * @property string $id
- * @property null|string $user_id
- * @property string $client_id
- * @property null|string $name
- * @property array<string> $scopes
- * @property bool $revoked
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property Carbon|null $expires_at
- */
-class Token extends PassportToken
-{
-    /** @use HasFactory<TokenFactory> */
-    use HasFactory;
-
-    /**
-     * Get the client that the token belongs to.
-     *
-     * @return BelongsTo<Client, Token>
-     */
-    public function client(): BelongsTo
-    {
-        return $this->belongsTo(Client::class, 'client_id', 'id');
-    }
-}

app/Models/User.php

@@ -7,7 +7,6 @@ namespace App\Models;
 use App\Enums\Weekday;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
-use App\Models\Passport\Token;
 use Database\Factories\UserFactory;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Panel;
@@ -28,13 +27,14 @@ use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
 use Laravel\Passport\AuthCode;
 use Laravel\Passport\HasApiTokens;
+use Laravel\Passport\Token;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $name
  * @property string $email
- * @property Carbon|null $email_verified_at
+ * @property string|null $email_verified_at
  * @property string|null $password
  * @property string|null $two_factor_secret
  * @property string $timezone
@@ -44,7 +44,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property-read Organization|null $currentOrganization
  * @property-read Organization|null $currentTeam
  * @property-read string $profile_photo_url
- * @property-read Collection<int, Token> $tokens
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property string|null $current_team_id
@@ -197,17 +196,6 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         return $this->hasMany(AuthCode::class);
     }
 
-    /**
-     * Get the access tokens for the user.
-     *
-     * @return HasMany<Token>
-     */
-    public function tokens(): HasMany
-    {
-        return $this->hasMany(Token::class, 'user_id')
-            ->orderBy('created_at', 'desc');
-    }
-
     /**
      * @param  Builder<User>  $builder
      */

app/Providers/AppServiceProvider.php

@@ -9,7 +9,6 @@ use App\Models\FailedJob;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
-use App\Models\Passport\Token;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Tag;
@@ -30,6 +29,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -90,6 +90,12 @@ class AppServiceProvider extends ServiceProvider
             );
         });
 
+        if (config('app.force_https', false)) {
+            URL::forceScheme('https');
+            request()->server->set('HTTPS', 'on');
+            request()->headers->set('X-Forwarded-Proto', 'https');
+        }
+
         $this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {
             return new PermissionStore;
         });
@@ -101,6 +107,5 @@ class AppServiceProvider extends ServiceProvider
         // Routing
         Route::model('member', Member::class);
         Route::model('invitation', OrganizationInvitation::class);
-        Route::model('apiToken', Token::class);
     }
 }

app/Providers/AuthServiceProvider.php

@@ -5,11 +5,6 @@ declare(strict_types=1);
 namespace App\Providers;
 
 use App\Models\Organization;
-use App\Models\Passport\AuthCode;
-use App\Models\Passport\Client;
-use App\Models\Passport\PersonalAccessClient;
-use App\Models\Passport\RefreshToken;
-use App\Models\Passport\Token;
 use App\Policies\OrganizationPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Jetstream\Jetstream;
@@ -47,16 +42,6 @@ class AuthServiceProvider extends ServiceProvider
             // 'delete',
         ]);
 
-        Passport::useTokenModel(Token::class);
-        Passport::useRefreshTokenModel(RefreshToken::class);
-        Passport::useAuthCodeModel(AuthCode::class);
-        Passport::useClientModel(Client::class);
-        Passport::usePersonalAccessClientModel(PersonalAccessClient::class);
-
-        // Passport::tokensExpireIn(now()->addDays(15));
-        // Passport::refreshTokensExpireIn(now()->addDays(30));
-        Passport::personalAccessTokensExpireIn(now()->addMonths(12));
-
         // same as passport default above
         Jetstream::defaultApiTokenPermissions(['read']);
 

app/Providers/Filament/AdminPanelProvider.php

@@ -69,9 +69,6 @@ class AdminPanelProvider extends PanelProvider
                 NavigationGroup::make()
                     ->label('System')
                     ->collapsed(),
-                NavigationGroup::make()
-                    ->label('Auth')
-                    ->collapsed(),
             ])
             ->middleware([
                 EncryptCookies::class,

app/Providers/JetstreamServiceProvider.php

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

app/Service/ColorService.php

@@ -33,11 +33,6 @@ class ColorService
 
     private const string VALID_REGEX = '/^#[0-9a-f]{6}$/';
 
-    public function isBuiltInColor(string $color): bool
-    {
-        return in_array($color, self::COLORS, true);
-    }
-
     public function getRandomColor(?string $seed = null): string
     {
         if ($seed !== null) {

app/Service/CurrencyService.php

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

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -11,7 +11,6 @@ use App\Models\TimeEntry;
 use Carbon\Exceptions\InvalidFormatException;
 use Exception;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
 
@@ -24,7 +23,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
      */
     private function getTags(string $tags): array
     {
-        if (Str::trim($tags) === '') {
+        if (trim($tags) === '') {
             return [];
         }
         $tagsParsed = explode(', ', $tags);

app/Service/Import/Importers/GenericProjectsImporter.php

@@ -1,105 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use App\Service\ColorService;
-use Carbon\Exceptions\InvalidFormatException;
-use Exception;
-use Illuminate\Support\Carbon;
-use League\Csv\Exception as CsvException;
-use League\Csv\Reader;
-use Override;
-
-class GenericProjectsImporter extends DefaultImporter
-{
-    /**
-     * @var array<string>
-     */
-    private const array REQUIRED_FIELDS = [
-        'name',
-    ];
-
-    /**
-     * @throws ImportException
-     */
-    #[Override]
-    public function importData(string $data, string $timezone): void
-    {
-        try {
-            $reader = Reader::createFromString($data);
-            $reader->setHeaderOffset(0);
-            $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
-            $header = $reader->getHeader();
-            $this->validateHeader($header);
-            $records = $reader->getRecords();
-            foreach ($records as $record) {
-                $clientId = null;
-                if (isset($record['client']) && $record['client'] !== '') {
-                    $clientId = $this->clientImportHelper->getKey([
-                        'name' => $record['client'],
-                        'organization_id' => $this->organization->id,
-                    ]);
-                }
-                if ($record['name'] !== '') {
-                    $archivedAt = null;
-                    if (isset($record['archived_at']) && $record['archived_at'] !== '') {
-                        try {
-                            $archivedAt = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $record['archived_at'], 'UTC');
-                        } catch (InvalidFormatException) {
-                            throw new ImportException('Value of archived_at ("'.$record['archived_at'].'") is invalid');
-                        }
-                    }
-                    $this->projectImportHelper->getKey([
-                        'name' => $record['name'],
-                        'organization_id' => $this->organization->id,
-                    ], [
-                        'color' => isset($record['color']) && $record['color'] !== '' ? $record['color'] : app(ColorService::class)->getRandomColor(),
-                        'billable_rate' => isset($record['billable_rate']) && $record['billable_rate'] !== '' ? (int) $record['billable_rate'] : null,
-                        'is_public' => isset($record['is_public']) && $record['is_public'] === 'true',
-                        'client_id' => $clientId,
-                        'is_billable' => isset($record['billable_default']) && $record['billable_default'] === 'true',
-                        'estimated_time' => isset($record['estimated_time']) && $record['estimated_time'] !== '' && is_numeric($record['estimated_time']) && ((int) $record['estimated_time'] !== 0) ? (int) $record['estimated_time'] : null,
-                        'archived_at' => $archivedAt,
-                    ]);
-                }
-            }
-        } catch (ImportException $exception) {
-            throw $exception;
-        } catch (CsvException $exception) {
-            throw new ImportException('Invalid CSV data');
-        } catch (Exception $exception) {
-            report($exception);
-            throw new ImportException('Unknown error');
-        }
-    }
-
-    /**
-     * @param  array<string>  $header
-     *
-     * @throws ImportException
-     */
-    private function validateHeader(array $header): void
-    {
-        foreach (self::REQUIRED_FIELDS as $requiredField) {
-            if (! in_array($requiredField, $header, true)) {
-                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
-            }
-        }
-    }
-
-    #[Override]
-    public function getName(): string
-    {
-        return __('importer.generic_projects.name');
-    }
-
-    #[Override]
-    public function getDescription(): string
-    {
-        return __('importer.generic_projects.description');
-    }
-}

app/Service/Import/Importers/GenericTimeEntriesImporter.php

@@ -1,208 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use App\Enums\Role;
-use App\Jobs\RecalculateSpentTimeForProject;
-use App\Jobs\RecalculateSpentTimeForTask;
-use App\Models\TimeEntry;
-use Carbon\Exceptions\InvalidFormatException;
-use Exception;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-use League\Csv\Exception as CsvException;
-use League\Csv\Reader;
-
-class GenericTimeEntriesImporter extends DefaultImporter
-{
-    /**
-     * @var array<string>
-     */
-    private const array REQUIRED_FIELDS = [
-        'description',
-        'billable',
-        'client',
-        'project',
-        'tags',
-        'start',
-        'end',
-        'task',
-        'user_name',
-        'user_email',
-    ];
-
-    /**
-     * @return array<string>
-     *
-     * @throws ImportException
-     */
-    private function getTags(string $tags): array
-    {
-        if (Str::trim($tags) === '') {
-            return [];
-        }
-        $tagsParsed = explode(',', $tags);
-        $tagIds = [];
-        foreach ($tagsParsed as $tagParsed) {
-            $tagId = $this->tagImportHelper->getKey([
-                'name' => Str::trim($tagParsed),
-                'organization_id' => $this->organization->id,
-            ]);
-            $tagIds[] = $tagId;
-        }
-
-        return $tagIds;
-    }
-
-    /**
-     * @throws ImportException
-     */
-    #[\Override]
-    public function importData(string $data, string $timezone): void
-    {
-        try {
-            $reader = Reader::createFromString($data);
-            $reader->setHeaderOffset(0);
-            $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
-            $header = $reader->getHeader();
-            $this->validateHeader($header);
-            $records = $reader->getRecords();
-            foreach ($records as $record) {
-                $userId = $this->userImportHelper->getKey([
-                    'email' => $record['user_email'],
-                ], [
-                    'name' => $record['user_name'],
-                    'timezone' => 'UTC',
-                    'is_placeholder' => true,
-                ]);
-                $memberId = $this->memberImportHelper->getKey([
-                    'user_id' => $userId,
-                    'organization_id' => $this->organization->getKey(),
-                ], [
-                    'role' => Role::Placeholder->value,
-                ]);
-                $member = $this->memberImportHelper->getModelById($memberId);
-                $clientId = null;
-                if ($record['client'] !== '') {
-                    $clientId = $this->clientImportHelper->getKey([
-                        'name' => $record['client'],
-                        'organization_id' => $this->organization->id,
-                    ]);
-                }
-                $projectId = null;
-                $project = null;
-                $projectMember = null;
-                if ($record['project'] !== '') {
-                    $projectId = $this->projectImportHelper->getKey([
-                        'name' => $record['project'],
-                        'organization_id' => $this->organization->id,
-                    ], [
-                        'client_id' => $clientId,
-                        'is_billable' => false,
-                        'color' => $this->colorService->getRandomColor(),
-                    ]);
-                    $project = $this->projectImportHelper->getModelById($projectId);
-                    $projectMember = $this->projectMemberImportHelper->getModel([
-                        'project_id' => $projectId,
-                        'member_id' => $memberId,
-                    ]);
-                }
-                $taskId = null;
-                if ($record['task'] !== '') {
-                    $taskId = $this->taskImportHelper->getKey([
-                        'name' => $record['task'],
-                        'project_id' => $projectId,
-                        'organization_id' => $this->organization->id,
-                    ]);
-                    $this->taskImportHelper->getModelById($taskId);
-                }
-                $timeEntry = new TimeEntry;
-                $timeEntry->disableAuditing();
-                $timeEntry->user_id = $userId;
-                $timeEntry->member_id = $memberId;
-                $timeEntry->task_id = $taskId;
-                $timeEntry->project_id = $projectId;
-                $timeEntry->client_id = $clientId;
-                $timeEntry->organization_id = $this->organization->id;
-                $timeEntry->description = $record['description'];
-                if (! in_array($record['billable'], ['true', 'false'], true)) {
-                    throw new ImportException('Invalid billable value');
-                }
-                $timeEntry->billable = $record['billable'] === 'true';
-                $timeEntry->tags = $this->getTags($record['tags']);
-                $timeEntry->is_imported = true;
-                try {
-                    $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $record['start'], 'UTC');
-                } catch (InvalidFormatException) {
-                    throw new ImportException('Value of start ("'.$record['start'].'") is invalid');
-                }
-                if ($start === null) {
-                    throw new ImportException('Value of start ("'.$record['start'].'") is invalid');
-                }
-                $timeEntry->start = $start->utc();
-
-                try {
-                    $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $record['end'], 'UTC');
-                } catch (InvalidFormatException) {
-                    throw new ImportException('Value of end ("'.$record['end'].'") is invalid');
-                }
-                if ($end === null) {
-                    throw new ImportException('Value of end ("'.$record['end'].'") is invalid');
-                }
-                $timeEntry->end = $end->utc();
-                $timeEntry->billable_rate = $this->billableRateService->getBillableRateForTimeEntryWithGivenRelations(
-                    $timeEntry,
-                    $projectMember,
-                    $project,
-                    $member,
-                    $this->organization
-                );
-                $timeEntry->save();
-                $this->timeEntriesCreated++;
-            }
-            foreach ($this->projectImportHelper->getCachedModels() as $usedProject) {
-                RecalculateSpentTimeForProject::dispatch($usedProject);
-            }
-            foreach ($this->taskImportHelper->getCachedModels() as $usedTask) {
-                RecalculateSpentTimeForTask::dispatch($usedTask);
-            }
-        } catch (ImportException $exception) {
-            throw $exception;
-        } catch (CsvException $exception) {
-            throw new ImportException('Invalid CSV data');
-        } catch (Exception $exception) {
-            report($exception);
-            throw new ImportException('Unknown error');
-        }
-    }
-
-    /**
-     * @param  array<string>  $header
-     *
-     * @throws ImportException
-     */
-    private function validateHeader(array $header): void
-    {
-        foreach (self::REQUIRED_FIELDS as $requiredField) {
-            if (! in_array($requiredField, $header, true)) {
-                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
-            }
-        }
-    }
-
-    #[\Override]
-    public function getName(): string
-    {
-        return __('importer.generic_time_entries.name');
-    }
-
-    #[\Override]
-    public function getDescription(): string
-    {
-        return __('importer.generic_time_entries.description');
-    }
-}

app/Service/Import/Importers/HarvestClientsImporter.php

@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use Exception;
-use League\Csv\Exception as CsvException;
-use League\Csv\Reader;
-
-class HarvestClientsImporter extends DefaultImporter
-{
-    /**
-     * @var array<string>
-     */
-    private const array REQUIRED_FIELDS = [
-        'Client Name',
-    ];
-
-    /**
-     * @throws ImportException
-     */
-    #[\Override]
-    public function importData(string $data, string $timezone): void
-    {
-        try {
-            $reader = Reader::createFromString($data);
-            $reader->setHeaderOffset(0);
-            $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
-            $header = $reader->getHeader();
-            $this->validateHeader($header);
-            $records = $reader->getRecords();
-            foreach ($records as $record) {
-                $this->clientImportHelper->getKey([
-                    'name' => $record['Client Name'],
-                    'organization_id' => $this->organization->id,
-                ]);
-            }
-        } catch (ImportException $exception) {
-            throw $exception;
-        } catch (CsvException $exception) {
-            throw new ImportException('Invalid CSV data');
-        } catch (Exception $exception) {
-            report($exception);
-            throw new ImportException('Unknown error');
-        }
-    }
-
-    /**
-     * @param  array<string>  $header
-     *
-     * @throws ImportException
-     */
-    private function validateHeader(array $header): void
-    {
-        foreach (self::REQUIRED_FIELDS as $requiredField) {
-            if (! in_array($requiredField, $header, true)) {
-                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
-            }
-        }
-    }
-
-    #[\Override]
-    public function getName(): string
-    {
-        return __('importer.harvest_clients.name');
-    }
-
-    #[\Override]
-    public function getDescription(): string
-    {
-        return __('importer.harvest_clients.description');
-    }
-}

app/Service/Import/Importers/HarvestProjectsImporter.php

@@ -1,107 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use Exception;
-use Illuminate\Support\Str;
-use League\Csv\Exception as CsvException;
-use League\Csv\Reader;
-
-class HarvestProjectsImporter extends DefaultImporter
-{
-    /**
-     * @var array<string>
-     */
-    private const array REQUIRED_FIELDS = [
-        'Client',
-        'Project',
-        'Budget',
-        'Billable Hours',
-    ];
-
-    /**
-     * @throws ImportException
-     */
-    #[\Override]
-    public function importData(string $data, string $timezone): void
-    {
-        try {
-            $reader = Reader::createFromString($data);
-            $reader->setHeaderOffset(0);
-            $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
-            $header = $reader->getHeader();
-            $this->validateHeader($header);
-            $records = $reader->getRecords();
-            foreach ($records as $record) {
-                $clientId = null;
-                if ($record['Client'] !== '') {
-                    $clientId = $this->clientImportHelper->getKey([
-                        'name' => $record['Client'],
-                        'organization_id' => $this->organization->id,
-                    ]);
-                }
-                if ($record['Project'] !== '') {
-                    if (! isset($record['Budget']) || ! is_string($record['Budget'])) {
-                        throw new ImportException('The value for "Budget" is invalid');
-                    }
-                    $estimatedTimeField = Str::replace(',', '.', $record['Budget']);
-                    $estimatedTime = $estimatedTimeField !== '' && is_numeric($estimatedTimeField) ? (int) (((float) $estimatedTimeField) * 60 * 60) : null;
-                    if ($estimatedTime === 0) {
-                        $estimatedTime = null;
-                    }
-                    if (! isset($record['Billable Hours']) || ! is_string($record['Billable Hours'])) {
-                        throw new ImportException('The value for "Billable Hours" is invalid');
-                    }
-                    $billableHoursField = Str::replace(',', '.', $record['Billable Hours']);
-                    $billableHours = $billableHoursField !== '' && is_numeric($billableHoursField) ? (int) ((float) $billableHoursField) : null;
-                    $this->projectImportHelper->getKey([
-                        'name' => $record['Project'],
-                        'organization_id' => $this->organization->id,
-                    ], [
-                        'color' => $this->colorService->getRandomColor(),
-                        'client_id' => $clientId,
-                        'estimated_time' => $estimatedTime,
-                        'is_billable' => $billableHours > 0,
-                    ]);
-                }
-            }
-        } catch (ImportException $exception) {
-            throw $exception;
-        } catch (CsvException $exception) {
-            throw new ImportException('Invalid CSV data');
-        } catch (Exception $exception) {
-            report($exception);
-            throw new ImportException('Unknown error');
-        }
-    }
-
-    /**
-     * @param  array<string>  $header
-     *
-     * @throws ImportException
-     */
-    private function validateHeader(array $header): void
-    {
-        foreach (self::REQUIRED_FIELDS as $requiredField) {
-            if (! in_array($requiredField, $header, true)) {
-                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
-            }
-        }
-    }
-
-    #[\Override]
-    public function getName(): string
-    {
-        return __('importer.harvest_projects.name');
-    }
-
-    #[\Override]
-    public function getDescription(): string
-    {
-        return __('importer.harvest_projects.description');
-    }
-}

app/Service/Import/Importers/HarvestTimeEntriesImporter.php

@@ -1,191 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\Import\Importers;
-
-use App\Enums\Role;
-use App\Jobs\RecalculateSpentTimeForProject;
-use App\Jobs\RecalculateSpentTimeForTask;
-use App\Models\TimeEntry;
-use Carbon\Exceptions\InvalidFormatException;
-use Exception;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-use League\Csv\Exception as CsvException;
-use League\Csv\Reader;
-use Override;
-
-class HarvestTimeEntriesImporter extends DefaultImporter
-{
-    /**
-     * @var array<string>
-     */
-    private const array REQUIRED_FIELDS = [
-        'Date',
-        'Hours',
-        'Client',
-        'Project',
-        'Task',
-        'Billable?',
-        'First Name',
-        'Last Name',
-        'Notes',
-    ];
-
-    /**
-     * @throws ImportException
-     */
-    #[Override]
-    public function importData(string $data, string $timezone): void
-    {
-        try {
-            $reader = Reader::createFromString($data);
-            $reader->setHeaderOffset(0);
-            $reader->setDelimiter(',');
-            $reader->setEnclosure('"');
-            $reader->setEscape('');
-            $header = $reader->getHeader();
-            $this->validateHeader($header);
-            $records = $reader->getRecords();
-            foreach ($records as $record) {
-                $firstname = $record['First Name'];
-                $lastname = $record['Last Name'];
-                $userId = $this->userImportHelper->getKey([
-                    'email' => Str::slug($firstname).'.'.Str::slug($lastname).'@solidtime-import.test',
-                ], [
-                    'name' => $firstname.' '.$lastname,
-                    'timezone' => 'UTC',
-                    'is_placeholder' => true,
-                ]);
-                $memberId = $this->memberImportHelper->getKey([
-                    'user_id' => $userId,
-                    'organization_id' => $this->organization->getKey(),
-                ], [
-                    'role' => Role::Placeholder->value,
-                ]);
-                $member = $this->memberImportHelper->getModelById($memberId);
-                $clientId = null;
-                if ($record['Client'] !== '') {
-                    $clientId = $this->clientImportHelper->getKey([
-                        'name' => $record['Client'],
-                        'organization_id' => $this->organization->id,
-                    ]);
-                }
-                $projectId = null;
-                $project = null;
-                $projectMember = null;
-                if ($record['Project'] !== '') {
-                    $projectId = $this->projectImportHelper->getKey([
-                        'name' => $record['Project'],
-                        'organization_id' => $this->organization->id,
-                    ], [
-                        'client_id' => $clientId,
-                        'color' => $this->colorService->getRandomColor(),
-                        'is_billable' => true,
-                    ]);
-                    $project = $this->projectImportHelper->getModelById($projectId);
-                    $projectMember = $this->projectMemberImportHelper->getModel([
-                        'project_id' => $projectId,
-                        'member_id' => $memberId,
-                    ]);
-                }
-                $taskId = null;
-                if ($record['Task'] !== '') {
-                    $taskId = $this->taskImportHelper->getKey([
-                        'name' => $record['Task'],
-                        'project_id' => $projectId,
-                        'organization_id' => $this->organization->id,
-                    ]);
-                    $this->taskImportHelper->getModelById($taskId);
-                }
-                $timeEntry = new TimeEntry;
-                $timeEntry->disableAuditing();
-                $timeEntry->user_id = $userId;
-                $timeEntry->member_id = $memberId;
-                $timeEntry->task_id = $taskId;
-                $timeEntry->project_id = $projectId;
-                $timeEntry->client_id = $clientId;
-                $timeEntry->organization_id = $this->organization->id;
-                if (strlen($record['Notes']) > 500) {
-                    throw new ImportException('Time entry note is too long');
-                }
-                $timeEntry->description = $record['Notes'];
-                if (! in_array($record['Billable?'], ['Yes', 'No'], true)) {
-                    throw new ImportException('Invalid billable value');
-                }
-                $timeEntry->billable = $record['Billable?'] === 'Yes';
-                $timeEntry->tags = [];
-                $timeEntry->is_imported = true;
-
-                // Start & End
-                try {
-                    $date = Carbon::createFromFormat('Y-m-d', $record['Date'], $timezone);
-                } catch (InvalidFormatException) {
-                    throw new ImportException('Date ("'.$record['Date'].'") is invalid');
-                }
-                if ($date === null) {
-                    throw new ImportException('Date ("'.$record['Date'].'") is invalid');
-                }
-                if (! isset($record['Hours']) || ! is_string($record['Hours'])) {
-                    throw new ImportException('Hours ("'.($record['Hours'] ?? '<null>').'") is invalid');
-                }
-                $hoursField = Str::replace(',', '.', $record['Hours']);
-                if (! is_numeric($hoursField)) {
-                    throw new ImportException('Hours ("'.$record['Hours'].'") is invalid');
-                }
-                $hours = (float) $hoursField;
-                $timeEntry->start = $date->copy()->startOfDay()->utc();
-                $timeEntry->end = $date->copy()->startOfDay()->addHours($hours)->utc();
-                $timeEntry->billable_rate = $this->billableRateService->getBillableRateForTimeEntryWithGivenRelations(
-                    $timeEntry,
-                    $projectMember,
-                    $project,
-                    $member,
-                    $this->organization
-                );
-                $timeEntry->save();
-                $this->timeEntriesCreated++;
-            }
-            foreach ($this->projectImportHelper->getCachedModels() as $usedProject) {
-                RecalculateSpentTimeForProject::dispatch($usedProject);
-            }
-            foreach ($this->taskImportHelper->getCachedModels() as $usedTask) {
-                RecalculateSpentTimeForTask::dispatch($usedTask);
-            }
-        } catch (ImportException $exception) {
-            throw $exception;
-        } catch (CsvException $exception) {
-            throw new ImportException('Invalid CSV data');
-        } catch (Exception $exception) {
-            report($exception);
-            throw new ImportException('Unknown error');
-        }
-    }
-
-    /**
-     * @param  array<string>  $header
-     *
-     * @throws ImportException
-     */
-    private function validateHeader(array $header): void
-    {
-        foreach (self::REQUIRED_FIELDS as $requiredField) {
-            if (! in_array($requiredField, $header, true)) {
-                throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
-            }
-        }
-    }
-
-    #[Override]
-    public function getName(): string
-    {
-        return __('importer.harvest_time_entries.name');
-    }
-
-    #[Override]
-    public function getDescription(): string
-    {
-        return __('importer.harvest_time_entries.description');
-    }
-}

app/Service/Import/Importers/ImporterProvider.php

@@ -15,11 +15,6 @@ class ImporterProvider
         'clockify_time_entries' => ClockifyTimeEntriesImporter::class,
         'clockify_projects' => ClockifyProjectsImporter::class,
         'solidtime' => SolidtimeImporter::class,
-        'harvest_projects' => HarvestProjectsImporter::class,
-        'harvest_time_entries' => HarvestTimeEntriesImporter::class,
-        'harvest_clients' => HarvestClientsImporter::class,
-        'generic_projects' => GenericProjectsImporter::class,
-        'generic_time_entries' => GenericTimeEntriesImporter::class,
     ];
 
     /**

app/Service/Import/Importers/SolidtimeImporter.php

@@ -328,7 +328,7 @@ class SolidtimeImporter extends DefaultImporter
      */
     private function getTags(string $tags): array
     {
-        if (Str::trim($tags) === '') {
+        if (trim($tags) === '') {
             return [];
         }
         $tagsParsed = json_decode($tags);

app/Service/Import/Importers/TogglDataImporter.php

@@ -5,11 +5,8 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
-use App\Service\TimezoneService;
 use Exception;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
 use Override;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 use ValueError;
@@ -96,22 +93,11 @@ class TogglDataImporter extends DefaultImporter
             }
 
             foreach ($workspaceUsers as $workspaceUser) {
-                $timezone = Str::trim($workspaceUser->timezone);
-                if ($timezone === '') {
-                    $timezone = 'UTC';
-                }
-                if (! app(TimezoneService::class)->isValid($timezone)) {
-                    Log::warning('TogglDateImporter: Invalid timezone', [
-                        'timezone' => $timezone,
-                    ]);
-                    $timezone = 'UTC';
-                }
-
                 $userId = $this->userImportHelper->getKey([
                     'email' => $workspaceUser->email,
                 ], [
                     'name' => $workspaceUser->name,
-                    'timezone' => $timezone,
+                    'timezone' => $workspaceUser->timezone ?? 'UTC',
                     'is_placeholder' => true,
                 ], (string) $workspaceUser->uid);
                 $this->memberImportHelper->getKey([

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -11,7 +11,6 @@ use App\Models\TimeEntry;
 use Carbon\Exceptions\InvalidFormatException;
 use Exception;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
 
@@ -24,7 +23,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
      */
     private function getTags(string $tags): array
     {
-        if (Str::trim($tags) === '') {
+        if (trim($tags) === '') {
             return [];
         }
         $tagsParsed = explode(', ', $tags);

app/Service/LocalizationService.php

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

app/Service/MemberService.php

@@ -7,18 +7,15 @@ namespace App\Service;
 use App\Enums\Role;
 use App\Events\MemberRemoved;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
-use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Models\Member;
 use App\Models\Organization;
-use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Models\User;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 use Laravel\Jetstream\Events\AddingTeamMember;
@@ -78,7 +75,6 @@ class MemberService
      * @throws ChangingRoleToPlaceholderIsNotAllowed
      * @throws OnlyOwnerCanChangeOwnership
      * @throws OrganizationNeedsAtLeastOneOwner
-     * @throws ChangingRoleOfPlaceholderIsNotAllowed
      */
     public function changeRole(Member $member, Organization $organization, Role $newRole, bool $allowOwnerChange): void
     {
@@ -86,9 +82,6 @@ class MemberService
         if ($oldRole === Role::Owner) {
             throw new OrganizationNeedsAtLeastOneOwner;
         }
-        if ($oldRole === Role::Placeholder) {
-            throw new ChangingRoleOfPlaceholderIsNotAllowed;
-        }
         if ($newRole === Role::Placeholder) {
             throw new ChangingRoleToPlaceholderIsNotAllowed;
         }
@@ -103,39 +96,6 @@ class MemberService
         }
     }
 
-    public function assignOrganizationEntitiesToDifferentMember(Organization $organization, Member $fromMember, Member $toMember): void
-    {
-        // Time entries
-        TimeEntry::query()
-            ->whereBelongsTo($organization, 'organization')
-            ->whereBelongsTo($fromMember, 'member')
-            ->update([
-                'user_id' => $toMember->user_id,
-                'member_id' => $toMember->getKey(),
-            ]);
-
-        // Project members
-        ProjectMember::query()
-            ->whereBelongsToOrganization($organization)
-            ->whereBelongsTo($fromMember, 'member')
-            ->whereDoesntHave('project', function (Builder $builder) use ($toMember): void {
-                /** @var Builder<Project> $builder */
-                $builder->whereHas('members', function (Builder $builder) use ($toMember): void {
-                    /** @var Builder<ProjectMember> $builder */
-                    $builder->where('member_id', $toMember->getKey());
-                });
-            })
-            ->update([
-                'user_id' => $toMember->user_id,
-                'member_id' => $toMember->getKey(),
-            ]);
-
-        ProjectMember::query()
-            ->whereBelongsToOrganization($organization)
-            ->whereBelongsTo($fromMember, 'member')
-            ->delete();
-    }
-
     /**
      * Change the ownership of an organization to a new user.
      * The previous owner will be demoted to an admin.
@@ -172,7 +132,7 @@ class MemberService
         $member->role = Role::Placeholder->value;
         $member->save();
 
-        $this->userService->assignOrganizationEntitiesToDifferentUser($member->organization, $user, $placeholderUser);
+        $this->userService->assignOrganizationEntitiesToDifferentMember($member->organization, $user, $placeholderUser, $member);
         if ($makeSureUserHasAtLeastOneOrganization) {
             $this->userService->makeSureUserHasAtLeastOneOrganization($user);
         }

app/Service/OrganizationService.php

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

app/Service/ReportExport/TimeEntriesDetailedExport.php

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

app/Service/ReportExport/TimeEntriesReportExport.php

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

app/Service/TimeEntryAggregationService.php

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

app/Service/UserService.php

@@ -4,12 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
 use App\Enums\Role;
-use App\Enums\TimeFormat;
 use App\Enums\Weekday;
 use App\Events\AfterCreateOrganization;
 use App\Models\Member;
@@ -17,46 +12,31 @@ use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Models\User;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Hash;
 
 class UserService
 {
-    public function createUser(
-        string $name,
-        string $email,
-        string $password,
-        string $timezone,
-        Weekday $weekStart,
-        ?string $currency,
-        ?NumberFormat $numberFormat = null,
-        ?CurrencyFormat $currencyFormat = null,
-        ?DateFormat $dateFormat = null,
-        ?IntervalFormat $intervalFormat = null,
-        ?TimeFormat $timeFormat = null,
-        bool $verifyEmail = false
-    ): User {
+    public function createUser(string $name, string $email, string $password, string $timezone, Weekday $weekStart, string $currency): User
+    {
         $user = new User;
         $user->name = $name;
         $user->email = $email;
         $user->password = Hash::make($password);
         $user->timezone = $timezone;
         $user->week_start = $weekStart;
-        if ($verifyEmail) {
-            $user->email_verified_at = Carbon::now();
-        }
         $user->save();
 
-        $organization = app(OrganizationService::class)->createOrganization(
-            $this->getOrganizationNameForUserName($user->name),
-            $user,
-            true,
-            $currency,
-            $numberFormat,
-            $currencyFormat,
-            $dateFormat,
-            $intervalFormat,
-            $timeFormat,
+        $organization = new Organization;
+        $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
+        $organization->personal_team = true;
+        $organization->currency = $currency;
+        $organization->owner()->associate($user);
+        $organization->save();
+
+        $organization->users()->attach(
+            $user, [
+                'role' => Role::Owner->value,
+            ]
         );
 
         $user->ownedTeams()->save($organization);
@@ -65,10 +45,24 @@ class UserService
     }
 
     /**
-     * This does NOT change the member id.
-     * This should only be used in if you want to change a member to a placeholder!
+     * Assign all organization entities (time entries, project members) from one user to another.
+     * This is useful when a placeholder user is replaced with a real user.
      */
     public function assignOrganizationEntitiesToDifferentUser(Organization $organization, User $fromUser, User $toUser): void
+    {
+        /** @var Member|null $toMember */
+        $toMember = Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereBelongsTo($toUser, 'user')
+            ->first();
+        if ($toMember === null) {
+            throw new \InvalidArgumentException('User is not a member of the organization');
+        }
+
+        $this->assignOrganizationEntitiesToDifferentMember($organization, $fromUser, $toUser, $toMember);
+    }
+
+    public function assignOrganizationEntitiesToDifferentMember(Organization $organization, User $fromUser, User $toUser, Member $toMember): void
     {
         // Time entries
         TimeEntry::query()
@@ -76,6 +70,7 @@ class UserService
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
+                'member_id' => $toMember->getKey(),
             ]);
 
         // Project members
@@ -84,6 +79,7 @@ class UserService
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
+                'member_id' => $toMember->getKey(),
             ]);
     }
 
@@ -94,11 +90,14 @@ class UserService
         }
 
         // Create a new organization
-        $organization = app(OrganizationService::class)->createOrganization(
-            $this->getOrganizationNameForUserName($user->name),
-            $user,
-            true
-        );
+        $organization = new Organization;
+        $organization->name = $user->name."'s Organization";
+        $organization->personal_team = true;
+        $organization->user_id = $user->id;
+        $organization->save();
+
+        // Attach the user to the organization
+        $organization->users()->attach($user, ['role' => Role::Owner->value]);
 
         // Set the organization as the user's current organization
         $user->currentOrganization()->associate($organization);
@@ -107,11 +106,6 @@ class UserService
         AfterCreateOrganization::dispatch($organization);
     }
 
-    public function getOrganizationNameForUserName(string $username): string
-    {
-        return explode(' ', $username, 2)[0]."'s Organization";
-    }
-
     public function makeSureUserHasCurrentOrganization(User $user): void
     {
         if ($user->currentOrganization !== null) {

components.json

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

composer.json

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

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "33dc60657e6702ebd5e19f19d86a64b4",
+    "content-hash": "e02eaa279f99a886be314748daa0b234",
     "packages": [
         {
             "name": "anourvalar/eloquent-serialize",
@@ -128,16 +128,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.339.7",
+            "version": "3.339.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "7b7e48ce7970c0416c5fda045df7b93948fbf643"
+                "reference": "cc0b21de3b1eaabb7d0a1ed4f3f067bad4be5f31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7b7e48ce7970c0416c5fda045df7b93948fbf643",
-                "reference": "7b7e48ce7970c0416c5fda045df7b93948fbf643",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc0b21de3b1eaabb7d0a1ed4f3f067bad4be5f31",
+                "reference": "cc0b21de3b1eaabb7d0a1ed4f3f067bad4be5f31",
                 "shasum": ""
             },
             "require": {
@@ -220,9 +220,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.339.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.339.6"
             },
-            "time": "2025-02-05T19:06:15+00:00"
+            "time": "2025-02-04T19:03:40+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -692,16 +692,16 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.6.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9"
+                "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
-                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915",
+                "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915",
                 "shasum": ""
             },
             "require": {
@@ -745,7 +745,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.6.0"
+                "source": "https://github.com/composer/class-map-generator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -761,7 +761,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-05T10:05:34+00:00"
+            "time": "2024-11-25T16:11:06+00:00"
         },
         {
             "name": "composer/composer",
@@ -1519,16 +1519,16 @@
         },
         {
             "name": "dedoc/scramble",
-            "version": "v0.12.5",
+            "version": "v0.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dedoc/scramble.git",
-                "reference": "de055584b61338dd6de6cc1cc20d79da6a442230"
+                "reference": "9482d3c6285ebb16a067bd28b01e94899e1fddd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dedoc/scramble/zipball/de055584b61338dd6de6cc1cc20d79da6a442230",
-                "reference": "de055584b61338dd6de6cc1cc20d79da6a442230",
+                "url": "https://api.github.com/repos/dedoc/scramble/zipball/9482d3c6285ebb16a067bd28b01e94899e1fddd8",
+                "reference": "9482d3c6285ebb16a067bd28b01e94899e1fddd8",
                 "shasum": ""
             },
             "require": {
@@ -1583,7 +1583,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dedoc/scramble/issues",
-                "source": "https://github.com/dedoc/scramble/tree/v0.12.5"
+                "source": "https://github.com/dedoc/scramble/tree/v0.12.2"
             },
             "funding": [
                 {
@@ -1591,7 +1591,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-05T11:22:52+00:00"
+            "time": "2025-02-03T12:23:33+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -2249,16 +2249,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "0eee8f8eeea4422c279c2622442b2a9a101d558c"
+                "reference": "cdefacc18993050cdd37e8e980ec66ca4109ae9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/0eee8f8eeea4422c279c2622442b2a9a101d558c",
-                "reference": "0eee8f8eeea4422c279c2622442b2a9a101d558c",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/cdefacc18993050cdd37e8e980ec66ca4109ae9a",
+                "reference": "cdefacc18993050cdd37e8e980ec66ca4109ae9a",
                 "shasum": ""
             },
             "require": {
@@ -2298,20 +2298,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-06T11:47:20+00:00"
+            "time": "2025-01-31T11:08:24+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "407b52ee57feed6f67706af2a18bc81d32aea3f1"
+                "reference": "c92daf4b6e4b478be5d32d5e1b404ba92bb45414"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/407b52ee57feed6f67706af2a18bc81d32aea3f1",
-                "reference": "407b52ee57feed6f67706af2a18bc81d32aea3f1",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/c92daf4b6e4b478be5d32d5e1b404ba92bb45414",
+                "reference": "c92daf4b6e4b478be5d32d5e1b404ba92bb45414",
                 "shasum": ""
             },
             "require": {
@@ -2363,20 +2363,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-06T11:47:25+00:00"
+            "time": "2025-01-31T11:08:29+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "6ab0419fd3599aacdd7b2a8f69641cab6f158674"
+                "reference": "8856b3b3714a0efae65d9f817fcc1934b6f34fda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/6ab0419fd3599aacdd7b2a8f69641cab6f158674",
-                "reference": "6ab0419fd3599aacdd7b2a8f69641cab6f158674",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/8856b3b3714a0efae65d9f817fcc1934b6f34fda",
+                "reference": "8856b3b3714a0efae65d9f817fcc1934b6f34fda",
                 "shasum": ""
             },
             "require": {
@@ -2419,11 +2419,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-06T11:47:21+00:00"
+            "time": "2025-01-31T11:08:23+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -2474,7 +2474,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2526,7 +2526,7 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
@@ -2585,16 +2585,16 @@
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "d420b0b0cbe605c712ab054a43d51baf5095dc87"
+                "reference": "1b1d9c3b837c11408ad28240dc9e3e33340d870b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/d420b0b0cbe605c712ab054a43d51baf5095dc87",
-                "reference": "d420b0b0cbe605c712ab054a43d51baf5095dc87",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/1b1d9c3b837c11408ad28240dc9e3e33340d870b",
+                "reference": "1b1d9c3b837c11408ad28240dc9e3e33340d870b",
                 "shasum": ""
             },
             "require": {
@@ -2633,11 +2633,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-02-06T11:47:34+00:00"
+            "time": "2025-01-31T11:08:58+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.137",
+            "version": "v3.2.136",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3780,73 +3780,6 @@
             },
             "time": "2024-03-01T14:15:47+00:00"
         },
-        {
-            "name": "korridor/laravel-has-many-sync",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/korridor/laravel-has-many-sync.git",
-                "reference": "32344956730d306d9753f5d3c455650ed828fd4e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/korridor/laravel-has-many-sync/zipball/32344956730d306d9753f5d3c455650ed828fd4e",
-                "reference": "32344956730d306d9753f5d3c455650ed828fd4e",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/database": "^10|^11|^12",
-                "illuminate/support": "^10|^11|^12",
-                "php": ">=8.1"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3",
-                "larastan/larastan": "^2|^3.0",
-                "orchestra/testbench": "^8|^9|^10",
-                "phpunit/phpunit": "^10.0|^11.5",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Korridor\\LaravelHasManySync\\ServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Korridor\\LaravelHasManySync\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "korridor",
-                    "email": "26689068+korridor@users.noreply.github.com"
-                },
-                {
-                    "name": "Alfa Adhitya",
-                    "email": "alfa2159@gmail.com"
-                }
-            ],
-            "description": "Laravel has many sync",
-            "homepage": "https://github.com/korridor/laravel-has-many-sync",
-            "keywords": [
-                "eloquent",
-                "has-many",
-                "laravel",
-                "relations",
-                "sync"
-            ],
-            "support": {
-                "source": "https://github.com/korridor/laravel-has-many-sync/tree/3.1.0"
-            },
-            "time": "2025-03-03T20:58:17+00:00"
-        },
         {
             "name": "korridor/laravel-model-validation-rules",
             "version": "3.2.0",
@@ -5482,73 +5415,6 @@
             },
             "time": "2024-08-09T21:24:39+00:00"
         },
-        {
-            "name": "league/iso3166",
-            "version": "4.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/alcohol/iso3166.git",
-                "reference": "5133fed7d54728222f4058702487dccedda20472"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/alcohol/iso3166/zipball/5133fed7d54728222f4058702487dccedda20472",
-                "reference": "5133fed7d54728222f4058702487dccedda20472",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": "^7.4 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.12.6",
-                "phpstan/phpstan-deprecation-rules": "^1.2.1",
-                "phpstan/phpstan-strict-rules": "^1.6.1",
-                "phpunit/phpunit": "^9.6.21"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\ISO3166\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com"
-                }
-            ],
-            "description": "ISO 3166-1 PHP Library",
-            "homepage": "https://github.com/alcohol/iso3166",
-            "keywords": [
-                "3166",
-                "3166-1",
-                "ISO 3166",
-                "countries",
-                "iso",
-                "library"
-            ],
-            "support": {
-                "issues": "https://github.com/alcohol/iso3166/issues",
-                "source": "https://github.com/alcohol/iso3166"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/alcohol",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-10-10T07:39:24+00:00"
-        },
         {
             "name": "league/mime-type-detection",
             "version": "1.16.0",
@@ -9246,27 +9112,27 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.19.0",
+            "version": "1.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa"
+                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa",
-                "reference": "1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
+                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^9.28|^10.0|^11.0|^12.0",
+                "illuminate/contracts": "^9.28|^10.0|^11.0",
                 "php": "^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
-                "pestphp/pest": "^1.23|^2.1|^3.1",
-                "phpunit/phpunit": "^9.5.24|^10.5|^11.5",
+                "orchestra/testbench": "^7.7|^8.0|^9.0",
+                "pestphp/pest": "^1.22|^2",
+                "phpunit/phpunit": "^9.5.24|^10.5",
                 "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
             "type": "library",
@@ -9294,7 +9160,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.19.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.3"
             },
             "funding": [
                 {
@@ -9302,7 +9168,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-06T14:58:20+00:00"
+            "time": "2025-01-22T08:51:18+00:00"
         },
         {
             "name": "spatie/regex",
@@ -14322,16 +14188,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.7",
+            "version": "11.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d"
+                "reference": "3c3ae14c90f244cdda95028c3e469028e8d1c02c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e1cb706f019e2547039ca2c839898cd5f557ee5d",
-                "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3c3ae14c90f244cdda95028c3e469028e8d1c02c",
+                "reference": "3c3ae14c90f244cdda95028c3e469028e8d1c02c",
                 "shasum": ""
             },
             "require": {
@@ -14403,7 +14269,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.6"
             },
             "funding": [
                 {
@@ -14419,7 +14285,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-06T16:10:05+00:00"
+            "time": "2025-01-31T07:03:30+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/app.php

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

config/session.php

@@ -168,7 +168,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', env('APP_FORCE_HTTPS')),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------

database/factories/OrganizationFactory.php

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

database/factories/Passport/ClientFactory.php

@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Database\Factories\Passport;
-
-use App\Models\Passport\Client;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Client>
- */
-class ClientFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id' => $this->faker->uuid,
-            'user_id' => null,
-            'name' => $this->faker->company(),
-            'secret' => $this->faker->regexify('[A-Za-z]{40}'),
-            'provider' => 'users',
-            'redirect' => $this->faker->url(),
-            'personal_access_client' => false,
-            'password_client' => false,
-            'revoked' => false,
-            'created_at' => $this->faker->dateTime(),
-            'updated_at' => $this->faker->dateTime(),
-        ];
-    }
-
-    public function personalAccessClient(): self
-    {
-        return $this->state(function (array $attributes) {
-            return [
-                'personal_access_client' => true,
-            ];
-        });
-    }
-
-    public function forUser(User $user): self
-    {
-        return $this->state(function (array $attributes) use ($user): array {
-            return [
-                'user_id' => $user->getKey(),
-            ];
-        });
-    }
-}

database/factories/Passport/TokenFactory.php

@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Database\Factories\Passport;
-
-use App\Models\Passport\Client;
-use App\Models\Passport\Token;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Token>
- */
-class TokenFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id' => $this->faker->uuid,
-            'user_id' => null,
-            'client_id' => $this->faker->uuid,
-            'name' => null,
-            'scopes' => [],
-            'revoked' => false,
-            'created_at' => $this->faker->dateTime,
-            'updated_at' => $this->faker->dateTime,
-            'expires_at' => $this->faker->dateTime,
-        ];
-    }
-
-    public function forUser(User $user): self
-    {
-        return $this->state(function (array $attributes) use ($user): array {
-            return [
-                'user_id' => $user->getKey(),
-            ];
-        });
-    }
-
-    public function forClient(Client $client): self
-    {
-        return $this->state(function (array $attributes) use ($client): array {
-            return [
-                'client_id' => $client->getKey(),
-            ];
-        });
-    }
-}

database/migrations/2025_04_03_101827_add_localization_columns_to_organizations_table.php

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

database/seeders/DatabaseSeeder.php

@@ -34,29 +34,6 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         $this->deleteAll();
-
-        app(ClientRepository::class)->create(
-            null,
-            'desktop',
-            'solidtime://oauth/callback',
-            null,
-            false,
-            false,
-            false
-        );
-
-        $personalAccessClient = new PassportClient;
-        $personalAccessClient->id = config('passport.personal_access_client.id');
-        $personalAccessClient->secret = config('passport.personal_access_client.secret');
-        $personalAccessClient->name = 'API';
-        $personalAccessClient->redirect = 'http://localhost';
-        $personalAccessClient->user_id = null;
-        $personalAccessClient->revoked = false;
-        $personalAccessClient->provider = null;
-        $personalAccessClient->personal_access_client = true;
-        $personalAccessClient->password_client = false;
-        $personalAccessClient->save();
-
         $userWithMultipleOrganizations = User::factory()->withPersonalOrganization()->create([
             'name' => 'Mister Overemployed',
             'email' => 'overemployed@acme.test',
@@ -78,8 +55,6 @@ class DatabaseSeeder extends Seeder
             'name' => 'Acme Manager',
             'email' => 'test@example.com',
         ]);
-        $userAcmeManager->createToken('Testing Token 1')->accessToken;
-        $userAcmeManager->createToken('Testing Token 2')->accessToken;
         $userAcmeAdmin = User::factory()->withPersonalOrganization()->create([
             'name' => 'Acme Admin',
             'email' => 'admin@acme.test',
@@ -184,6 +159,15 @@ class DatabaseSeeder extends Seeder
             'email' => 'admin@example.com',
         ]);
 
+        app(ClientRepository::class)->create(
+            null,
+            'desktop',
+            'solidtime://oauth/callback',
+            null,
+            false,
+            false,
+            false
+        );
     }
 
     private function deleteAll(): void

docker-compose.yml

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

docker/prod/Dockerfile

@@ -182,7 +182,7 @@ COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini /lib/ph
 #    && composer clear-cache
 
 RUN cat .env
-#RUN php artisan env
+RUN php artisan env
 RUN php artisan storage:link
 
 RUN chmod +x /usr/local/bin/start-container

e2e/auth.spec.ts

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