Add validation for task name length

.github/workflows/build-private.yml

@@ -97,7 +97,7 @@ jobs:
       - name: "Install dependencies in billing extension"
         uses: php-actions/composer@v6
         env:
-          COMPOSER_AUTH: '{"http-basic": {"spark.laravel.com": {"username": "gregor@vostrak.at", "password": "${{ secrets.LARAVEL_SPARK_API_KEY }}"}}}'
+          COMPOSER_AUTH: '{"http-basic": {"spark.laravel.com": {"username": "${{ secrets.LARAVEL_SPARK_USERNAME }}", "password": "${{ secrets.LARAVEL_SPARK_API_KEY }}"}}}'
         with:
           working_dir: "extensions/Billing"
           command: install

.github/workflows/phpunit-extensions.yml

@@ -0,0 +1,136 @@
+name: PHPUnit Tests - Extensions
+on: push
+permissions:
+  contents: read
+jobs:
+  phpunit-extensions:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        postgres_version: [ 15, 16, 17 ]
+
+    services:
+      pgsql_test:
+        image: postgres:${{ matrix.postgres_version }}
+        env:
+          PGPASSWORD: 'root'
+          POSTGRES_DB: 'laravel'
+          POSTGRES_USER: 'root'
+          POSTGRES_PASSWORD: 'root'
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      gotenberg:
+        image: gotenberg/gotenberg:8
+        ports:
+          - 3000:3000
+        options: >-
+          --health-cmd "curl --silent --fail http://localhost:3000/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v7
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
+          coverage: pcov
+
+      - uses: actions/setup-node@v7
+        with:
+          node-version: '20.x'
+
+      - name: "Read extension manifest"
+        id: extension-manifest
+        run: |
+          {
+            echo "billing_repository=$(jq -r '.Billing.repository' extensions/manifest.json)"
+            echo "billing_ref=$(jq -r '.Billing.ref' extensions/manifest.json)"
+            echo "services_repository=$(jq -r '.Services.repository' extensions/manifest.json)"
+            echo "services_ref=$(jq -r '.Services.ref' extensions/manifest.json)"
+            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
+            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: "Checkout billing extension"
+        uses: actions/checkout@v7
+        with:
+          repository: ${{ steps.extension-manifest.outputs.billing_repository }}
+          ref: ${{ steps.extension-manifest.outputs.billing_ref }}
+          path: extensions/Billing
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_BILLING_EXTENSION }}
+
+      - name: "Install composer dependencies in billing extension"
+        working-directory: extensions/Billing
+        env:
+          COMPOSER_AUTH: '{"http-basic": {"spark.laravel.com": {"username": "contact@solidtime.io", "password": "${{ secrets.LARAVEL_SPARK_API_KEY }}"}}}'
+        run: composer install -n --prefer-dist --ignore-platform-reqs
+
+      - name: "Install npm dependencies in billing extension"
+        run: cd extensions/Billing && npm ci
+
+      - name: "Checkout services extension"
+        uses: actions/checkout@v7
+        with:
+          repository: ${{ steps.extension-manifest.outputs.services_repository }}
+          ref: ${{ steps.extension-manifest.outputs.services_ref }}
+          path: extensions/Services
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SERVICES_EXTENSION }}
+
+      - name: "Install composer dependencies in services extension"
+        working-directory: extensions/Services
+        run: composer install -n --prefer-dist --ignore-platform-reqs
+
+      - name: "Install npm dependencies in services extension"
+        run: cd extensions/Services && npm ci
+
+      - name: "Checkout invoicing extension"
+        uses: actions/checkout@v7
+        with:
+          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
+          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
+          path: extensions/Invoicing
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
+
+      - name: "Install composer dependencies in invoicing extension"
+        working-directory: extensions/Invoicing
+        run: composer install -n --prefer-dist --ignore-platform-reqs
+
+      - name: "Install npm dependencies in invoicing extension"
+        run: cd extensions/Invoicing && npm ci
+
+      - name: "Run composer install"
+        run: composer install -n --prefer-dist --ignore-platform-reqs
+
+      - name: "Activate billing extension"
+        run: php artisan module:enable Billing
+
+      - name: "Activate services extension"
+        run: php artisan module:enable Services
+
+      - name: "Activate invoicing extension"
+        run: php artisan module:enable Invoicing
+
+      - name: "Install dependencies"
+        run: npm ci
+
+      - name: "Build Frontend"
+        run: npm run build
+
+      - name: "Prepare Laravel Application"
+        run: |
+          cp .env.ci .env
+          php artisan key:generate
+          php artisan passport:keys
+
+      - name: "Run PHPUnit"
+        run: php artisan test extensions/Billing/tests extensions/Services/tests extensions/Invoicing/tests --stop-on-failure

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

@@ -4,6 +4,7 @@ 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;
@@ -158,7 +159,7 @@ class ChartController extends Controller
         $this->checkPermission($organization, 'charts:view:own');
         $user = $this->user();
 
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $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.');
         }

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

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
-use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Models\Organization;
 use App\Service\BillingContract;
 use App\Service\PermissionStore;
@@ -51,30 +49,4 @@ class Controller extends \App\Http\Controllers\Controller
     {
         return app(BillingContract::class)->hasSubscription($organization) || app(BillingContract::class)->hasTrial($organization);
     }
-
-    protected function canUseBillableRates(Organization $organization): bool
-    {
-        return app(BillingContract::class)->canUseBillableRates($organization);
-    }
-
-    protected function canSeeBillableRates(Organization $organization): bool
-    {
-        if (! $this->canUseBillableRates($organization)) {
-            return false;
-        }
-
-        return $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-    }
-
-    /**
-     * Organizations that can not use billable rates may keep or remove an existing rate, but not set a new one
-     *
-     * @throws FeatureIsNotAvailableInFreePlanApiException
-     */
-    protected function checkBillableRateChange(Organization $organization, ?int $oldBillableRate, ?int $newBillableRate): void
-    {
-        if ($newBillableRate !== null && $newBillableRate !== $oldBillableRate && ! $this->canUseBillableRates($organization)) {
-            throw new FeatureIsNotAvailableInFreePlanApiException;
-        }
-    }
 }

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

@@ -83,7 +83,6 @@ class MemberController extends Controller
         $this->checkPermission($organization, 'members:update', $member);
 
         if ($request->has('billable_rate') && $member->billable_rate !== $request->getBillableRate()) {
-            $this->checkBillableRateChange($organization, $member->billable_rate, $request->getBillableRate());
             $member->billable_rate = $request->getBillableRate();
 
             $billableRateService->updateTimeEntriesBillableRateForMember($member);

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

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
-use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Http\Requests\V1\Organization\OrganizationDestroyRequest;
 use App\Http\Requests\V1\Organization\OrganizationStoreRequest;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
@@ -32,7 +32,7 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         return new OrganizationResource($organization, $showBillableRate);
     }
@@ -54,10 +54,7 @@ class OrganizationController extends Controller
         if ($request->getCurrency() !== null) {
             $organization->currency = $request->getCurrency();
         }
-        if ($request->getEmployeesCanSeeBillableRates() !== null && $request->getEmployeesCanSeeBillableRates() !== $organization->employees_can_see_billable_rates) {
-            if (! $this->canUseBillableRates($organization)) {
-                throw new FeatureIsNotAvailableInFreePlanApiException;
-            }
+        if ($request->getEmployeesCanSeeBillableRates() !== null) {
             $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
         }
         if ($request->getEmployeesCanManageTasks() !== null) {
@@ -86,7 +83,6 @@ class OrganizationController extends Controller
         }
         $hasBillableRate = $request->has('billable_rate');
         if ($hasBillableRate) {
-            $this->checkBillableRateChange($organization, $organization->billable_rate, $request->getBillableRate());
             $oldBillableRate = $organization->billable_rate;
             $organization->billable_rate = $request->getBillableRate();
         }

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

@@ -65,7 +65,7 @@ class ProjectController extends Controller
             ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         return new ProjectCollection($projects, $showBillableRate);
     }
@@ -99,7 +99,6 @@ class ProjectController extends Controller
     public function store(Organization $organization, ProjectStoreRequest $request): JsonResource
     {
         $this->checkPermission($organization, 'projects:create');
-        $this->checkBillableRateChange($organization, null, $request->getBillableRate());
         $project = new Project;
         $project->name = $request->input('name');
         $project->color = $request->input('color');
@@ -126,7 +125,6 @@ class ProjectController extends Controller
     public function update(Organization $organization, Project $project, ProjectUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'projects:update', $project);
-        $this->checkBillableRateChange($organization, $project->billable_rate, $request->getBillableRate());
         $project->name = $request->input('name');
         $project->color = $request->input('color');
         $project->is_billable = (bool) $request->input('is_billable');
@@ -141,17 +139,14 @@ class ProjectController extends Controller
         }
         $oldBillableRate = $project->billable_rate;
         $clientIdChanged = false;
-        // Organizations that can not use billable rates do not receive the rate of the project, so the incoming value is ignored to keep the existing rate
-        if ($this->canUseBillableRates($organization)) {
-            $project->billable_rate = $request->getBillableRate();
-        }
+        $project->billable_rate = $request->getBillableRate();
         if ($project->client_id !== $request->input('client_id')) {
             $project->client_id = $request->input('client_id');
             $clientIdChanged = true;
         }
         $project->save();
 
-        if ($oldBillableRate !== $project->billable_rate) {
+        if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProject($project);
         }
         if ($clientIdChanged) {

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

@@ -65,7 +65,6 @@ class ProjectMemberController extends Controller
     public function store(Organization $organization, Project $project, ProjectMemberStoreRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:create', $project);
-        $this->checkBillableRateChange($organization, null, $request->getBillableRate());
 
         $member = Member::findOrFail((string) $request->input('member_id'));
         if ($member->user->is_placeholder) {
@@ -99,7 +98,6 @@ class ProjectMemberController extends Controller
     public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
-        $this->checkBillableRateChange($organization, $projectMember->billable_rate, $request->getBillableRate());
         $oldBillableRate = $projectMember->billable_rate;
         $projectMember->billable_rate = $request->getBillableRate();
         $projectMember->save();

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\ExportFormat;
+use App\Enums\Role;
 use App\Enums\TimeEntryType;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
 use App\Exceptions\Api\OverlappingTimeEntryApiException;
@@ -239,7 +240,7 @@ class TimeEntryController extends Controller
         }
         $user = $this->user();
         $timezone = $user->timezone;
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -385,7 +386,7 @@ class TimeEntryController extends Controller
         }
         $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
         $user = $this->user();
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
@@ -440,7 +441,7 @@ class TimeEntryController extends Controller
         }
         $debug = $request->getDebug();
         $user = $this->user();
-        $showBillableRate = $this->canSeeBillableRates($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();

app/Http/Middleware/HandleInertiaRequests.php

@@ -57,7 +57,6 @@ class HandleInertiaRequests extends Middleware
                 'has_trial' => $billing->hasTrial($currentOrganization),
                 'trial_until' => $billing->getTrialUntil($currentOrganization)?->toIso8601ZuluString(),
                 'is_blocked' => $billing->isBlocked($currentOrganization),
-                'can_use_billable_rates' => $billing->canUseBillableRates($currentOrganization),
             ] : null,
             'flash' => [
                 'message' => fn () => $request->session()->get('message'),

app/Service/BillingContract.php

@@ -54,13 +54,4 @@ class BillingContract
     {
         return false;
     }
-
-    /**
-     * Check if the organization can set and see billable rates
-     * Without a billing system every organization can use billable rates
-     */
-    public function canUseBillableRates(Organization $organization): bool
-    {
-        return true;
-    }
 }

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -44,7 +44,7 @@ class ClockifyProjectsImporter extends DefaultImporter
                         'organization_id' => $this->organization->id,
                     ], [
                         'color' => $this->colorService->getRandomColor(),
-                        'is_billable' => $record['Billability'] === 'Yes',
+                        'is_billable' => ($record['Billability'] ?? '') === 'Yes',
                         'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,
                         'estimated_time' => isset($record['Estimated (h)']) && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
                         'archived_at' => $record['Status'] === 'Archived' ? Carbon::now() : null,
@@ -54,6 +54,7 @@ class ClockifyProjectsImporter extends DefaultImporter
                 if ($tasksKey !== null && $record[$tasksKey] !== '') {
                     $tasks = explode(', ', $record[$tasksKey]);
                     foreach ($tasks as $task) {
+                        $this->checkTaskNameLength($task);
                         $this->taskImportHelper->getKey([
                             'name' => $task,
                             'project_id' => $projectId,
@@ -83,7 +84,6 @@ class ClockifyProjectsImporter extends DefaultImporter
             'Project',
             'Status',
             'Visibility',
-            'Billability',
         ];
         foreach ($requiredFields as $requiredField) {
             if (! in_array($requiredField, $header, true)) {

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -103,6 +103,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 }
                 $taskId = null;
                 if (! $isBreak && $taskKey !== null && $record[$taskKey] !== '') {
+                    $this->checkTaskNameLength($record[$taskKey]);
                     $taskId = $this->taskImportHelper->getKey([
                         'name' => $record[$taskKey],
                         'project_id' => $projectId,

app/Service/Import/Importers/DefaultImporter.php

@@ -14,7 +14,6 @@ use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
 use App\Service\BillableRateService;
-use App\Service\BillingContract;
 use App\Service\ColorService;
 use App\Service\Import\ImportDatabaseHelper;
 use App\Service\TimezoneService;
@@ -22,6 +21,8 @@ use Illuminate\Database\Eloquent\Builder;
 
 abstract class DefaultImporter implements ImporterContract
 {
+    protected const TASK_NAME_MAX_LENGTH = 500;
+
     protected Organization $organization;
 
     /**
@@ -72,15 +73,9 @@ abstract class DefaultImporter implements ImporterContract
 
     protected BillableRateService $billableRateService;
 
-    /**
-     * Organizations that can not use billable rates import projects, members and project members without billable rates
-     */
-    protected bool $canUseBillableRates;
-
     public function init(Organization $organization): void
     {
         $this->organization = $organization;
-        $this->canUseBillableRates = app(BillingContract::class)->canUseBillableRates($organization);
         $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
             /** @var Builder<User> $builder */
             return $builder->belongsToOrganization($this->organization);
@@ -103,11 +98,7 @@ abstract class DefaultImporter implements ImporterContract
                 'string',
                 'in:placeholder',
             ],
-        ], beforeSave: function (Member $member): void {
-            if (! $this->canUseBillableRates) {
-                $member->billable_rate = null;
-            }
-        });
+        ]);
         $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'client_id', 'organization_id'], true, function (Builder $builder) {
             /** @var Builder<Project> $builder */
             return $builder->where('organization_id', $this->organization->id);
@@ -131,7 +122,7 @@ abstract class DefaultImporter implements ImporterContract
                 'uuid',
             ],
         ], beforeSave: function (Project $project): void {
-            if ($project->billable_rate === 0 || ! $this->canUseBillableRates) {
+            if ($project->billable_rate === 0) {
                 $project->billable_rate = null;
             }
         });
@@ -145,7 +136,7 @@ abstract class DefaultImporter implements ImporterContract
                 'max:2147483647',
             ],
         ], beforeSave: function (ProjectMember $projectMember): void {
-            if ($projectMember->billable_rate === 0 || ! $this->canUseBillableRates) {
+            if ($projectMember->billable_rate === 0) {
                 $projectMember->billable_rate = null;
             }
         });
@@ -192,6 +183,16 @@ abstract class DefaultImporter implements ImporterContract
         $this->billableRateService = app(BillableRateService::class);
     }
 
+    /**
+     * @throws ImportException
+     */
+    protected function checkTaskNameLength(string $taskName): void
+    {
+        if (strlen($taskName) > self::TASK_NAME_MAX_LENGTH) {
+            throw new ImportException('Task name ("'.$taskName.'") is too long, maximum length is '.self::TASK_NAME_MAX_LENGTH.' characters');
+        }
+    }
+
     #[\Override]
     public function getReport(): ReportDto
     {

app/Service/Import/Importers/GenericTimeEntriesImporter.php

@@ -113,6 +113,7 @@ class GenericTimeEntriesImporter extends DefaultImporter
                 }
                 $taskId = null;
                 if ($record['task'] !== '') {
+                    $this->checkTaskNameLength($record['task']);
                     $taskId = $this->taskImportHelper->getKey([
                         'name' => $record['task'],
                         'project_id' => $projectId,

app/Service/Import/Importers/HarvestTimeEntriesImporter.php

@@ -92,6 +92,7 @@ class HarvestTimeEntriesImporter extends DefaultImporter
                 }
                 $taskId = null;
                 if ($record['Task'] !== '') {
+                    $this->checkTaskNameLength($record['Task']);
                     $taskId = $this->taskImportHelper->getKey([
                         'name' => $record['Task'],
                         'project_id' => $projectId,

app/Service/Import/Importers/SolidtimeImporter.php

@@ -199,6 +199,7 @@ class SolidtimeImporter extends DefaultImporter
                 if ($projectId === null) {
                     throw new Exception('Project does not exist');
                 }
+                $this->checkTaskNameLength($task['name']);
                 $this->taskImportHelper->getKey([
                     'name' => $task['name'],
                     'project_id' => $projectId,

app/Service/Import/Importers/TogglDataImporter.php

@@ -153,9 +153,16 @@ class TogglDataImporter extends DefaultImporter
                 }
                 foreach ($projectMembers as $projectMember) {
                     $userId = $this->userImportHelper->getKeyByExternalIdentifier((string) $projectMember->user_id);
+                    if ($userId === null) {
+                        throw new Exception('User does not exist');
+                    }
+                    $memberId = $this->memberImportHelper->getKeyByExternalIdentifier($userId);
+                    if ($memberId === null) {
+                        throw new Exception('Member does not exist');
+                    }
                     $this->projectMemberImportHelper->getKey([
                         'project_id' => $projectId,
-                        'member_id' => $this->memberImportHelper->getKeyByExternalIdentifier($userId),
+                        'member_id' => $memberId,
                     ], [
                         'user_id' => $userId,
                         'billable_rate' => $projectMember->rate !== null ? (int) ($projectMember->rate * 100) : null,
@@ -182,6 +189,7 @@ class TogglDataImporter extends DefaultImporter
                     if ($projectId === null) {
                         throw new Exception('Project does not exist');
                     }
+                    $this->checkTaskNameLength($task->name);
                     $this->taskImportHelper->getKey([
                         'name' => $task->name,
                         'project_id' => $projectId,

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -97,6 +97,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
                 }
                 $taskId = null;
                 if ($record['Task'] !== '') {
+                    $this->checkTaskNameLength($record['Task']);
                     $taskId = $this->taskImportHelper->getKey([
                         'name' => $record['Task'],
                         'project_id' => $projectId,

docker/prod/Dockerfile

@@ -1,7 +1,6 @@
 ARG PHP_VERSION=8.3
-ARG FRANKENPHP_VERSION=1.8
+ARG FRANKENPHP_VERSION=1.11
 ARG COMPOSER_VERSION=2.8
-ARG BUN_VERSION="latest"
 ARG APP_ENV
 ARG DOCKER_FILES_BASE_PATH="docker/prod/"
 
@@ -16,13 +15,13 @@ RUN CGO_ENABLED=1 \
     XCADDY_GO_BUILD_FLAGS="-ldflags='-w -s' -tags=nobadger,nomysql,nopgx" \
     CGO_CFLAGS=$(php-config --includes) \
     CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" \
-    xcaddy build v2.10.0 \
+    xcaddy build \
         --output /usr/local/bin/frankenphp \
         --with github.com/dunglas/frankenphp=./ \
         --with github.com/dunglas/frankenphp/caddy=./caddy/ \
         --with github.com/dunglas/caddy-cbrotli
 
-FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION} AS base
+FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}
 
 COPY --from=upstream /usr/local/bin/frankenphp /usr/local/bin/frankenphp
 
@@ -32,26 +31,28 @@ LABEL org.opencontainers.image.description="solidtime is a modern open source ti
 LABEL org.opencontainers.image.source="https://github.com/solidtime-io/solidtime"
 LABEL org.opencontainers.image.licenses="AGPL"
 
-ARG WWWUSER=1000
-ARG WWWGROUP=1000
+ARG USER_ID=1000
+ARG GROUP_ID=1000
 ARG TZ=UTC
-ARG APP_DIR=/var/www/html
-ARG APP_ENV
-ARG APP_HOST
 ARG DOCKER_FILES_BASE_PATH
 
 ENV DEBIAN_FRONTEND=noninteractive \
     TERM=xterm-color \
     OCTANE_SERVER=frankenphp \
     TZ=${TZ} \
-    USER=octane \
-    ROOT=${APP_DIR} \
-    APP_ENV=${APP_ENV} \
+    LANG=C.UTF-8 \
+    USER=laravel \
+    ROOT=/var/www/html \
+    APP_ENV=production \
+    COMPOSER_ALLOW_SUPERUSER=1 \
     COMPOSER_FUND=0 \
-    COMPOSER_MAX_PARALLEL_HTTP=24 \
-    XDG_CONFIG_HOME=${APP_DIR}/.config \
-    XDG_DATA_HOME=${APP_DIR}/.data \
-    SERVER_NAME=${APP_HOST}
+    COMPOSER_MAX_PARALLEL_HTTP=48 \
+    WITH_HORIZON=false \
+    WITH_SCHEDULER=false \
+    WITH_REVERB=false \
+    WITH_SSR=false
+
+ENV XDG_CONFIG_HOME=${ROOT}/.config XDG_DATA_HOME=${ROOT}/.data
 
 WORKDIR ${ROOT}
 
@@ -60,6 +61,9 @@ SHELL ["/bin/bash", "-eou", "pipefail", "-c"]
 RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
     && echo ${TZ} > /etc/timezone
 
+RUN echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \
+    echo "Acquire::BrokenProxy    true;" >> /etc/apt/apt.conf.d/99custom
+
 RUN apt-get update; \
     apt-get upgrade -yqq; \
     apt-get install -yqq --no-install-recommends --show-progress \
@@ -68,40 +72,36 @@ RUN apt-get update; \
     wget \
     vim \
     git \
+    unzip \
     ncdu \
     procps \
-    unzip \
     ca-certificates \
     supervisor \
     libsodium-dev \
-    libbrotli-dev \
-    # Install PHP extensions (included with dunglas/frankenphp)
+#    && curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr bash \
     && install-php-extensions \
+    apcu \
     bz2 \
     pcntl \
     mbstring \
     bcmath \
     sockets \
-    pgsql \
     pdo_pgsql \
     opcache \
     exif \
     pdo_mysql \
     zip \
     uv \
-    vips \
     intl \
     gd \
     redis \
     rdkafka \
-    memcached \
-    igbinary \
+    ffi \
     ldap \
     && apt-get -y autoremove \
     && apt-get clean \
     && docker-php-source delete \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    && rm /var/log/lastlog /var/log/faillog
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/lastlog /var/log/faillog
 
 RUN arch="$(uname -m)" \
     && case "$arch" in \
@@ -111,106 +111,64 @@ RUN arch="$(uname -m)" \
     x86) _cronic_fname='supercronic-linux-386' ;; \
     *) echo >&2 "error: unsupported architecture: $arch"; exit 1 ;; \
     esac \
-    && wget -q "https://github.com/aptible/supercronic/releases/download/v0.2.29/${_cronic_fname}" \
+    && wget -q "https://github.com/aptible/supercronic/releases/download/v0.2.38/${_cronic_fname}" \
     -O /usr/bin/supercronic \
     && chmod +x /usr/bin/supercronic \
     && mkdir -p /etc/supercronic \
     && echo "*/1 * * * * php ${ROOT}/artisan schedule:run --no-interaction" > /etc/supercronic/laravel
 
 RUN userdel --remove --force www-data \
-    && groupadd --force -g ${WWWGROUP} ${USER} \
-    && useradd -ms /bin/bash --no-log-init --no-user-group -g ${WWWGROUP} -u ${WWWUSER} ${USER} \
-    && setcap -r /usr/local/bin/frankenphp
-
-RUN chown -R ${USER}:${USER} ${ROOT} /var/{log,run} \
-    && chmod -R a+rw ${ROOT} /var/{log,run}
+    && groupadd --force -g ${GROUP_ID} ${USER} \
+    && useradd -ms /bin/bash --no-log-init --no-user-group -g ${GROUP_ID} -u ${USER_ID} ${USER}
 
 RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
-USER ${USER}
+COPY --link --from=vendor /usr/bin/composer /usr/bin/composer
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/supervisord.conf /etc/
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/supervisord.*.conf /etc/supervisor/conf.d/
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/start-container /usr/local/bin/start-container
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/healthcheck /usr/local/bin/healthcheck
+COPY --link ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-php.ini
+#COPY --link composer.* ./
 
-COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer
-
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.conf /etc/
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.*.conf /etc/supervisor/conf.d/
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/start-container /usr/local/bin/start-container
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/healthcheck /usr/local/bin/healthcheck
-COPY --link --chown=${WWWUSER}:${WWWUSER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini
-
-RUN chmod +x /usr/local/bin/start-container /usr/local/bin/healthcheck
-
-###########################################
-
-#FROM base AS common
-#
-#USER ${USER}
-#
-#COPY --link --chown=${WWWUSER}:${WWWUSER} . .
-#
 #RUN composer install \
 #    --no-dev \
 #    --no-interaction \
 #    --no-autoloader \
 #    --no-ansi \
 #    --no-scripts \
+#    --no-progress \
 #    --audit
 
-###########################################
-# Build frontend assets with Bun
-###########################################
-
-#FROM oven/bun:${BUN_VERSION} AS build
-#
-#ARG APP_ENV
-#
-#ENV ROOT=/var/www/html \
-#    APP_ENV=${APP_ENV} \
-#    NODE_ENV=${APP_ENV:-production}
-#
-#WORKDIR ${ROOT}
-#
 #COPY --link package.json bun.lock* ./
-#
+
 #RUN bun install --frozen-lockfile
-#
-#COPY --link . .
-#COPY --link --from=common ${ROOT}/vendor vendor
-#
-#RUN bun run build
 
-###########################################
-
-#FROM common AS runner
-
-USER ${USER}
-
-ENV WITH_HORIZON=false \
-    WITH_SCHEDULER=false \
-    WITH_REVERB=false
-
-COPY --link --chown=${WWWUSER}:${WWWUSER} . ./
-
-RUN test -z "$(find . -name .git -print -quit)"
-#COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public
+COPY --link . .
 
 RUN mkdir -p \
     storage/framework/{sessions,views,cache,testing} \
     storage/logs \
-    bootstrap/cache && chmod -R a+rw storage
+    bootstrap/cache \
+    && chmod +x /usr/local/bin/start-container /usr/local/bin/healthcheck
 
-#RUN composer install \
-#    --classmap-authoritative \
-#    --no-interaction \
-#    --no-ansi \
-#    --no-dev \
-#    && composer clear-cache
+RUN composer dump-autoload \
+    --optimize \
+    --apcu \
+    --no-dev
 
-RUN cat .env
-#RUN php artisan env
+#RUN bun run build
+
+RUN chown -R ${USER_ID}:${GROUP_ID} ${ROOT} \
+    && find / -perm /6000 -type f -exec chmod a-s {} + 2>/dev/null || true
+
+USER ${USER}
 
 EXPOSE 8000
+#EXPOSE 2019
+#EXPOSE 8080
 
 ENTRYPOINT ["start-container"]
 
-#HEALTHCHECK --start-period=5s --interval=2s --timeout=5s --retries=8 CMD healthcheck || exit 1
+#HEALTHCHECK --start-period=30s --interval=10s --timeout=3s --retries=3 CMD healthcheck || exit 1

docker/prod/deployment/healthcheck

@@ -22,6 +22,13 @@ elif [ "${container_mode}" = "reverb" ]; then
         echo "Healthcheck failed."
         exit 1
     fi
+elif [ "${container_mode}" = "ssr" ]; then
+    if [ "$(supervisorctl status inertia-ssr-server:inertia-ssr-server_0 | awk '{print tolower($2)}')" = "running" ]; then
+        exit 0
+    else
+        echo "Healthcheck failed."
+        exit 1
+    fi
 elif [ "${container_mode}" = "worker" ]; then
     if [ "$(supervisorctl status worker:worker_0 | awk '{print tolower($2)}')" = "running" ]; then
         exit 0

docker/prod/deployment/octane/FrankenPHP/Caddyfile

@@ -3,6 +3,14 @@
 
 	admin {$CADDY_SERVER_ADMIN_HOST}:{$CADDY_SERVER_ADMIN_PORT}
 
+	log {
+		level {$CADDY_SERVER_LOG_LEVEL:WARN}
+	}
+
+	auto_https off
+
+	skip_install_trust
+
 	frankenphp {
 		worker "{$APP_PUBLIC_PATH}/frankenphp-worker.php" {$CADDY_SERVER_WORKER_COUNT}
 	}
@@ -20,7 +28,7 @@
 
 {$CADDY_SERVER_SERVER_NAME} {
 	log {
-		level WARN
+		level {$CADDY_SERVER_LOG_LEVEL:WARN}
 
 		format filter {
 			wrap {$CADDY_SERVER_LOGGER}
@@ -60,7 +68,6 @@
 		error @rejected 401
 
 		php_server {
-			index frankenphp-worker.php
 			try_files {path} frankenphp-worker.php
 			resolve_root_symlink
 		}

docker/prod/deployment/octane/FrankenPHP/supervisord.frankenphp.conf

@@ -1,65 +1,18 @@
 [program:octane]
 process_name = %(program_name)s_%(process_num)s
-command = php %(ENV_ROOT)s/artisan octane:frankenphp --host=0.0.0.0 --port=8000 --admin-port=2019 --caddyfile=%(ENV_ROOT)s/docker/prod/deployment/octane/FrankenPHP/Caddyfile
+command = php %(ENV_ROOT)s/artisan octane:frankenphp --host=0.0.0.0 --port=8000 --admin-host=0.0.0.0 --admin-port=2019 --log-level=WARN --caddyfile=%(ENV_ROOT)s/docker/prod/deployment/octane/FrankenPHP/Caddyfile
 user = %(ENV_USER)s
 priority = 1
 autostart = true
 autorestart = true
+stopwaitsecs = 30
+stopasgroup = true
+killasgroup = true
 environment = LARAVEL_OCTANE = "1"
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr
 stderr_logfile_maxbytes = 0
 
-[program:horizon]
-process_name = %(program_name)s_%(process_num)s
-command = php %(ENV_ROOT)s/artisan horizon
-user = %(ENV_USER)s
-priority = 3
-autostart = %(ENV_WITH_HORIZON)s
-autorestart = true
-stdout_logfile = %(ENV_ROOT)s/storage/logs/horizon.log
-stdout_logfile_maxbytes = 200MB
-stderr_logfile = %(ENV_ROOT)s/storage/logs/horizon.log
-stderr_logfile_maxbytes = 200MB
-stopwaitsecs = 3600
-
-[program:scheduler]
-process_name = %(program_name)s_%(process_num)s
-command = supercronic -overlapping /etc/supercronic/laravel
-user = %(ENV_USER)s
-autostart = %(ENV_WITH_SCHEDULER)s
-autorestart = true
-stdout_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
-stdout_logfile_maxbytes = 200MB
-stderr_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
-stderr_logfile_maxbytes = 200MB
-
-[program:clear-scheduler-cache]
-process_name = %(program_name)s_%(process_num)s
-command = php %(ENV_ROOT)s/artisan schedule:clear-cache
-user = %(ENV_USER)s
-autostart = %(ENV_WITH_SCHEDULER)s
-autorestart = false
-startsecs = 0
-startretries = 1
-stdout_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
-stdout_logfile_maxbytes = 200MB
-stderr_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
-stderr_logfile_maxbytes = 200MB
-
-[program:reverb]
-process_name = %(program_name)s_%(process_num)s
-command = php %(ENV_ROOT)s/artisan reverb:start
-user = %(ENV_USER)s
-priority = 2
-autostart = %(ENV_WITH_REVERB)s
-autorestart = true
-stdout_logfile = %(ENV_ROOT)s/storage/logs/reverb.log
-stdout_logfile_maxbytes = 200MB
-stderr_logfile = %(ENV_ROOT)s/storage/logs/reverb.log
-stderr_logfile_maxbytes = 200MB
-minfds = 10000
-
 [include]
-files = /etc/supervisord.conf
+files = /etc/supervisord.conf /etc/supervisor/conf.d/supervisord.services.conf

docker/prod/deployment/php.ini

@@ -2,8 +2,9 @@
 post_max_size = 100M
 upload_max_filesize = 100M
 expose_php = 0
-realpath_cache_size = 16M
-realpath_cache_ttl = 360
+realpath_cache_size = 32M
+realpath_cache_ttl = 720
+memory_limit = 256M
 max_input_time = 5
 register_argc_argv = 0
 date.timezone = ${TZ:-UTC}
@@ -11,18 +12,24 @@ date.timezone = ${TZ:-UTC}
 [Opcache]
 opcache.enable = 1
 opcache.enable_cli = 1
-opcache.memory_consumption = 256M
+opcache.memory_consumption = 256
 opcache.use_cwd = 0
+opcache.save_comments = 1
 opcache.max_file_size = 0
 opcache.max_accelerated_files = 32531
 opcache.validate_timestamps = 0
 opcache.file_update_protection = 0
 opcache.interned_strings_buffer = 16
+opcache.enable_file_override = 1
+opcache.file_cache_consistency_checks = 0
+opcache.file_cache = /tmp/opcache-file-cache
 
 [JIT]
 opcache.jit_buffer_size = 128M
-opcache.jit = function
-opcache.jit_prof_threshold = 0.001
+opcache.jit = tracing
+opcache.jit_hot_loop = 16
+opcache.jit_hot_func = 32
+opcache.jit_hot_return = 4
 opcache.jit_max_root_traces = 2048
 opcache.jit_max_side_traces = 256
 

docker/prod/deployment/supervisord.conf

@@ -1,8 +1,6 @@
 [supervisord]
 nodaemon = true
 user = %(ENV_USER)s
-logfile = /var/log/supervisor/supervisord.log
-pidfile = /var/run/supervisord.pid
 
 [supervisorctl]
 
@@ -10,4 +8,4 @@ pidfile = /var/run/supervisord.pid
 port = 127.0.0.1:9001
 
 [rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

docker/prod/deployment/supervisord.horizon.conf

@@ -4,6 +4,8 @@ command = php %(ENV_ROOT)s/artisan horizon
 user = %(ENV_USER)s
 autostart = true
 autorestart = true
+stopasgroup = true
+killasgroup = true
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr

docker/prod/deployment/supervisord.inertia.conf

@@ -0,0 +1,15 @@
+[program:inertia-ssr-server]
+process_name = %(program_name)s_%(process_num)s
+command = php %(ENV_ROOT)s/artisan inertia:start-ssr --runtime=bun --quiet
+user = %(ENV_USER)s
+autostart = true
+autorestart = true
+stopasgroup = true
+killasgroup = true
+stdout_logfile = /dev/stdout
+stdout_logfile_maxbytes = 0
+stderr_logfile = /dev/stderr
+stderr_logfile_maxbytes = 0
+
+[include]
+files = /etc/supervisord.conf

docker/prod/deployment/supervisord.reverb.conf

@@ -4,6 +4,8 @@ command = php %(ENV_ROOT)s/artisan reverb:start
 user = %(ENV_USER)s
 autostart = true
 autorestart = true
+stopasgroup = true
+killasgroup = true
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr

docker/prod/deployment/supervisord.scheduler.conf

@@ -4,6 +4,8 @@ command = supercronic -overlapping /etc/supercronic/laravel
 user = %(ENV_USER)s
 autostart = true
 autorestart = true
+stopasgroup = true
+killasgroup = true
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr

docker/prod/deployment/supervisord.services.conf

@@ -0,0 +1,69 @@
+[program:horizon]
+process_name = %(program_name)s_%(process_num)s
+command = php %(ENV_ROOT)s/artisan horizon
+user = %(ENV_USER)s
+priority = 4
+autostart = %(ENV_WITH_HORIZON)s
+autorestart = true
+stopasgroup = true
+killasgroup = true
+stdout_logfile = %(ENV_ROOT)s/storage/logs/horizon.log
+stdout_logfile_maxbytes = 200MB
+stderr_logfile = %(ENV_ROOT)s/storage/logs/horizon.log
+stderr_logfile_maxbytes = 200MB
+stopwaitsecs = 3600
+
+[program:scheduler]
+process_name = %(program_name)s_%(process_num)s
+command = supercronic -overlapping /etc/supercronic/laravel
+user = %(ENV_USER)s
+autostart = %(ENV_WITH_SCHEDULER)s
+autorestart = true
+stopasgroup = true
+killasgroup = true
+stdout_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
+stdout_logfile_maxbytes = 200MB
+stderr_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
+stderr_logfile_maxbytes = 200MB
+
+[program:clear-scheduler-cache]
+process_name = %(program_name)s_%(process_num)s
+command = php %(ENV_ROOT)s/artisan schedule:clear-cache
+user = %(ENV_USER)s
+autostart = %(ENV_WITH_SCHEDULER)s
+autorestart = false
+startsecs = 0
+startretries = 1
+stdout_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
+stdout_logfile_maxbytes = 200MB
+stderr_logfile = %(ENV_ROOT)s/storage/logs/scheduler.log
+stderr_logfile_maxbytes = 200MB
+
+[program:reverb]
+process_name = %(program_name)s_%(process_num)s
+command = php %(ENV_ROOT)s/artisan reverb:start
+user = %(ENV_USER)s
+priority = 3
+autostart = %(ENV_WITH_REVERB)s
+autorestart = true
+stopasgroup = true
+killasgroup = true
+stdout_logfile = %(ENV_ROOT)s/storage/logs/reverb.log
+stdout_logfile_maxbytes = 200MB
+stderr_logfile = %(ENV_ROOT)s/storage/logs/reverb.log
+stderr_logfile_maxbytes = 200MB
+minfds = 10000
+
+[program:inertia-ssr-server]
+process_name = %(program_name)s_%(process_num)s
+command = php %(ENV_ROOT)s/artisan inertia:start-ssr --runtime=bun --quiet
+user = %(ENV_USER)s
+priority = 2
+autostart = %(ENV_WITH_SSR)s
+autorestart = true
+stopasgroup = true
+killasgroup = true
+stdout_logfile = %(ENV_ROOT)s/storage/logs/inertia-ssr-server.log
+stdout_logfile_maxbytes = 200MB
+stderr_logfile = %(ENV_ROOT)s/storage/logs/inertia-ssr-server.log
+stderr_logfile_maxbytes = 200MB

docker/prod/deployment/supervisord.worker.conf

@@ -4,6 +4,8 @@ command = %(ENV_WORKER_COMMAND)s
 user = %(ENV_USER)s
 autostart = true
 autorestart = true
+stopasgroup = true
+killasgroup = true
 stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 stderr_logfile = /dev/stderr

extensions/manifest.json

@@ -1,7 +1,7 @@
 {
     "Billing": {
         "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.6"
+        "ref": "main"
     },
     "Services": {
         "repository": "solidtime-io/extension-services",

phpunit.xml

@@ -43,5 +43,7 @@
         <env name="NEWSLETTER_URL" value="null"/>
         <env name="PASSPORT_PERSONAL_ACCESS_CLIENT_ID" value="null"/>
         <env name="PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET" value="null"/>
+        <env name="PADDLE_API_KEY" value="test_phpunit_paddle_api_key"/>
+        <env name="PADDLE_SANDBOX" value="true"/>
     </php>
 </phpunit>

resources/js/Components/Common/Member/MemberEditModal.vue

@@ -21,7 +21,6 @@ import { getOrganizationCurrencyString } from '@/utils/money';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 
 const { updateMember } = useMembersStore();
 const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
@@ -72,8 +71,6 @@ function saveWithChecks() {
     }
 }
 
-const { locked: billableRatesLocked } = useBillableRatesLock();
-
 const billableRateSelect = ref<MemberBillableKey>('default-rate');
 
 onMounted(() => {
@@ -162,12 +159,7 @@ const roleDescription = computed(() => {
                         <FieldLabel :icon="BillableIcon" for="billableRateType"
                             >Billable Rate</FieldLabel
                         >
-                        <BillableRateInput
-                            v-if="billableRatesLocked"
-                            v-model="displayedRate"
-                            :currency="getOrganizationCurrencyString()"
-                            name="memberBillableRate" />
-                        <div v-else class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                             <Select v-model="billableRateSelect">
                                 <SelectTrigger id="billableRateType">
                                     <SelectValue />

resources/js/Components/Common/Member/MemberTableHeading.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import TableHeading from '@/Components/Common/TableHeading.vue';
 import SortableTableHeaderCell from '@/Components/Common/SortableTableHeaderCell.vue';
 import type { SortColumn, SortDirection } from '@/Components/Common/Member/MemberTable.vue';
@@ -14,8 +12,6 @@ const props = defineProps<{
 defineEmits<{
     sort: [column: SortColumn];
 }>();
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -37,10 +33,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
             column="billable_rate"
             v-bind="props"
             @sort="$emit('sort', $event)">
-            <span class="inline-flex items-center gap-2 whitespace-nowrap">
-                Billable Rate
-                <UpgradeLockedBadge v-if="billableRatesLocked" />
-            </span>
+            Billable Rate
         </SortableTableHeaderCell>
         <SortableTableHeaderCell column="status" v-bind="props" @sort="$emit('sort', $event)">
             Status

resources/js/Components/Common/Member/MemberTableRow.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import type { Member, Organization } from '@/packages/api/src';
 import { api } from '@/packages/api/src';
 import { CheckCircleIcon, UserCircleIcon } from '@heroicons/vue/24/outline';
@@ -26,7 +25,6 @@ import MemberEditModal from '@/Components/Common/Member/MemberEditModal.vue';
 import MemberMergeModal from '@/Components/Common/Member/MemberMergeModal.vue';
 import MemberMakePlaceholderModal from '@/Components/Common/Member/MemberMakePlaceholderModal.vue';
 import MemberDeleteModal from '@/Components/Common/Member/MemberDeleteModal.vue';
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
 import { capitalizeFirstLetter } from '../../../utils/format';
 import { formatCents } from '../../../packages/ui/src/utils/money';
 import {
@@ -73,8 +71,6 @@ async function invitePlaceholder(id: string) {
 const userHasValidMailAddress = computed(() => {
     return !props.member.email.endsWith('@solidtime-import.test');
 });
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -94,8 +90,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
                     {{ capitalizeFirstLetter(member.role) }}
                 </div>
                 <div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    <UpgradeLockedBadge v-if="billableRatesLocked" />
-                    <span v-else-if="member.billable_rate">
+                    <span v-if="member.billable_rate">
                         {{
                             formatCents(
                                 member.billable_rate,

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

@@ -23,10 +23,8 @@ import ProjectVisibilitySelect from '@/packages/ui/src/Project/ProjectVisibility
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { getCurrentOrganizationId } from '@/utils/useUser';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 
 const { updateProject } = useProjectsStore();
-const { locked: billableRatesLocked } = useBillableRatesLock();
 const { clients } = useClientsQuery();
 const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const show = defineModel('show', { default: false });
@@ -50,11 +48,6 @@ const project = ref<CreateProjectBody>({
     is_public: props.originalProject.is_public,
 });
 
-// Locked organizations do not receive the rate of the project, so sending it back would remove the existing rate
-function getUpdateBody() {
-    const { billable_rate: billableRate, ...body } = project.value;
-    return billableRatesLocked.value ? body : { ...body, billable_rate: billableRate };
-}
 async function submit() {
     if (props.originalProject.billable_rate !== project.value.billable_rate) {
         // make sure that the alert modal is not immediately submitted when user presses enter
@@ -63,7 +56,7 @@ async function submit() {
         }, 0);
         return;
     }
-    await updateProject(props.originalProject.id, getUpdateBody());
+    await updateProject(props.originalProject.id, project.value);
     show.value = false;
 }
 
@@ -79,7 +72,7 @@ const currentClientName = computed(() => {
 });
 
 async function submitBillableRate() {
-    await updateProject(props.originalProject.id, getUpdateBody());
+    await updateProject(props.originalProject.id, project.value);
     show.value = false;
     showBillableRateModal.value = false;
 }

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

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import { computed } from 'vue';
 import TableHeading from '@/Components/Common/TableHeading.vue';
 import SortableTableHeaderCell from '@/Components/Common/SortableTableHeaderCell.vue';
@@ -27,8 +25,6 @@ const sortState = computed(() => ({
 function handleSort(column: SortColumn) {
     emit('sort', column);
 }
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -54,10 +50,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
             column="billable_rate"
             v-bind="sortState"
             @sort="handleSort">
-            <span class="inline-flex items-center gap-2 whitespace-nowrap">
-                Billable Rate
-                <UpgradeLockedBadge v-if="billableRatesLocked" />
-            </span>
+            Billable Rate
         </SortableTableHeaderCell>
         <SortableTableHeaderCell column="status" v-bind="sortState" @sort="handleSort">
             Status

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

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import ProjectMoreOptionsDropdown from '@/Components/Common/Project/ProjectMoreOptionsDropdown.vue';
 import type { Project } from '@/packages/api/src';
 import { computed, ref, inject, type ComputedRef } from 'vue';
@@ -16,7 +15,6 @@ import { useTasksQuery } from '@/utils/useTasksQuery';
 import { useProjectsStore } from '@/utils/useProjects';
 import TableRow from '@/Components/TableRow.vue';
 import ProjectEditModal from '@/Components/Common/Project/ProjectEditModal.vue';
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import EstimatedTimeProgress from '@/packages/ui/src/EstimatedTimeProgress.vue';
@@ -54,11 +52,8 @@ function deleteProject() {
 }
 
 function archiveProject() {
-    // Locked organizations do not receive the rate of the project, so sending it back would remove the existing rate
-    const { billable_rate: billableRate, ...project } = props.project;
     useProjectsStore().updateProject(props.project.id, {
-        ...project,
-        ...(billableRatesLocked.value ? {} : { billable_rate: billableRate }),
+        ...props.project,
         is_archived: !props.project.is_archived,
     });
 }
@@ -83,8 +78,6 @@ const billableRateInfo = computed(() => {
 });
 
 const showEditProjectModal = ref(false);
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -136,8 +129,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
                 <div
                     v-if="showBillableRate"
                     class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
-                    <UpgradeLockedBadge v-if="billableRatesLocked" />
-                    <span v-else-if="billableRateInfo">{{ billableRateInfo }}</span>
+                    <span v-if="billableRateInfo">{{ billableRateInfo }}</span>
                     <span v-else class="text-text-tertiary">--</span>
                 </div>
                 <div

resources/js/Components/Common/ProjectMember/ProjectMemberTableHeading.vue

@@ -1,9 +1,5 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import TableHeading from '@/Components/Common/TableHeading.vue';
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -11,10 +7,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
         <div class="py-1.5 pr-3 text-left text-text-tertiary pl-4 sm:pl-6 lg:pl-8 3xl:pl-12">
             Name
         </div>
-        <div class="px-3 py-1.5 text-left text-text-tertiary flex items-center gap-2">
-            Billable Rate
-            <UpgradeLockedBadge v-if="billableRatesLocked" />
-        </div>
+        <div class="px-3 py-1.5 text-left text-text-tertiary">Billable Rate</div>
         <div class="px-3 py-1.5 text-left text-text-tertiary">Role</div>
         <div class="relative py-1.5 pl-3 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
             <span class="sr-only">Edit</span>

resources/js/Components/Common/ProjectMember/ProjectMemberTableRow.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import type { ProjectMember } from '@/packages/api/src';
 import { computed, ref, inject, type ComputedRef } from 'vue';
 import TableRow from '@/Components/TableRow.vue';
@@ -11,7 +10,6 @@ import { capitalizeFirstLetter } from '@/utils/format';
 import ProjectMemberEditModal from '@/Components/Common/ProjectMember/ProjectMemberEditModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import type { Organization } from '@/packages/api/src';
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
 
 const props = defineProps<{
     projectMember: ProjectMember;
@@ -35,8 +33,6 @@ const member = computed(() => {
     return members.value.find((member) => member.id === props.projectMember.member_id);
 });
 const showEditModal = ref(false);
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -52,20 +48,17 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
             </span>
         </div>
         <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
-            <UpgradeLockedBadge v-if="billableRatesLocked" />
-            <span v-else>
-                {{
-                    projectMember.billable_rate
-                        ? formatCents(
-                              projectMember.billable_rate,
-                              getOrganizationCurrencyString(),
-                              organization?.currency_format,
-                              organization?.currency_symbol,
-                              organization?.number_format
-                          )
-                        : '--'
-                }}
-            </span>
+            {{
+                projectMember.billable_rate
+                    ? formatCents(
+                          projectMember.billable_rate,
+                          getOrganizationCurrencyString(),
+                          organization?.currency_format,
+                          organization?.currency_symbol,
+                          organization?.number_format
+                      )
+                    : '--'
+            }}
         </div>
         <div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
             {{ capitalizeFirstLetter(member?.role ?? '') }}

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

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import {
     ChartBarIcon,
     ArrowDownTrayIcon,
@@ -292,8 +290,6 @@ const tableData = computed(() => {
         };
     });
 });
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -420,12 +416,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
                         <div class="text-right" :class="!showBillableRate ? 'pr-6' : ''">
                             Duration
                         </div>
-                        <div
-                            v-if="showBillableRate"
-                            class="flex items-center justify-end gap-2 pr-6">
-                            <UpgradeLockedBadge v-if="billableRatesLocked" />
-                            Cost
-                        </div>
+                        <div v-if="showBillableRate" class="text-right pr-6">Cost</div>
                     </div>
                     <template
                         v-if="

resources/js/Components/Common/StatCard.vue

@@ -9,7 +9,7 @@ defineProps<{
     <div class="rounded-lg bg-card-background border-card-border shadow-card border px-3.5 py-2.5">
         <dt class="font-medium text-sm text-text-secondary">{{ title }}</dt>
         <dd class="text-xl text-text-primary pt-1 font-medium">
-            <slot>{{ value ?? '--' }}</slot>
+            {{ value ?? '--' }}
         </dd>
     </div>
 </template>

resources/js/Components/Dashboard/ThisWeekOverview.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import { use } from 'echarts/core';
 import { CanvasRenderer } from 'echarts/renderers';
 import { BarChart } from 'echarts/charts';
@@ -103,8 +101,6 @@ const { data: totalWeeklyBillableTime } = useQuery({
     staleTime: 1000 * 30, // 30 seconds
 });
 
-const { locked: billableRatesLocked } = useBillableRatesLock();
-
 const { data: totalWeeklyBillableAmount } = useQuery({
     queryKey: ['totalWeeklyBillableAmount', organizationId],
     queryFn: () => {
@@ -114,7 +110,7 @@ const { data: totalWeeklyBillableAmount } = useQuery({
             },
         });
     },
-    enabled: computed(() => !!organizationId.value && !billableRatesLocked.value),
+    enabled: computed(() => !!organizationId.value),
     staleTime: 1000 * 30, // 30 seconds
 });
 
@@ -274,11 +270,7 @@ const option = computed(() => {
                           )
                         : '--'
                 " />
-            <StatCard v-if="billableRatesLocked" title="Billable Amount">
-                <UpgradeLockedBadge />
-            </StatCard>
             <StatCard
-                v-else
                 title="Billable Amount"
                 :value="
                     totalWeeklyBillableAmount

resources/js/Components/Dashboard/ThisWeekReportingTable.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
 import ReportingGroupBySelect from '@/Components/Common/Reporting/ReportingGroupBySelect.vue';
 import {
@@ -128,8 +126,6 @@ const showBillableRate = computed(() => {
         getCurrentRole() !== 'employee' || organization?.value?.employees_can_see_billable_rates
     );
 });
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -155,10 +151,7 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
                 class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:pb-1.5 [&>*]:pt-1 text-text-tertiary text-sm">
                 <div class="pl-6">Name</div>
                 <div class="text-right" :class="!showBillableRate ? 'pr-6' : ''">Duration</div>
-                <div v-if="showBillableRate" class="flex items-center justify-end gap-2 pr-6">
-                    <UpgradeLockedBadge v-if="billableRatesLocked" />
-                    Cost
-                </div>
+                <div v-if="showBillableRate" class="text-right pr-6">Cost</div>
             </div>
 
             <div

resources/js/Layouts/AppLayout.vue

@@ -23,7 +23,7 @@ import { PanelLeft } from '@lucide/vue';
 import NavigationSidebarItem from '@/Components/NavigationSidebarItem.vue';
 import UserSettingsIcon from '@/Components/UserSettingsIcon.vue';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
-import { computed, nextTick, onMounted, provide, ref } from 'vue';
+import { nextTick, onMounted, provide, ref } from 'vue';
 import NotificationContainer from '@/Components/NotificationContainer.vue';
 import { initializeStores } from '@/utils/init';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
@@ -37,9 +37,7 @@ import {
     canViewReport,
     canViewTags,
 } from '@/utils/permissions';
-import { canUseBillableRates, isBillingActivated, isInvoicingActivated } from '@/utils/billing';
-import UpgradeModal from '@/Components/Common/UpgradeModal.vue';
-import { billableRatesLockKey } from '@/packages/ui/src/utils/useBillableRatesLock';
+import { isBillingActivated, isInvoicingActivated } from '@/utils/billing';
 import type { User } from '@/types/models';
 import { ArrowsRightLeftIcon } from '@heroicons/vue/16/solid';
 import { fetchToken, isTokenValid } from '@/utils/session';
@@ -90,14 +88,6 @@ const { organization, isLoading: isOrganizationLoading } = useOrganizationQuery(
 
 provide('organization', organization);
 
-const showBillableRatesUpgradeModal = ref(false);
-provide(billableRatesLockKey, {
-    locked: computed(() => !canUseBillableRates()),
-    requestUpgrade: () => {
-        showBillableRatesUpgradeModal.value = true;
-    },
-});
-
 onMounted(async () => {
     useTheme();
     // make sure that the initial requests are only loaded once, this can be removed once we move away from inertia
@@ -387,7 +377,4 @@ const page = usePage<{
     <NotificationContainer></NotificationContainer>
     <UserTimezoneMismatchModal></UserTimezoneMismatchModal>
     <CommandPaletteProvider></CommandPaletteProvider>
-    <UpgradeModal v-model:show="showBillableRatesUpgradeModal">
-        <strong>Billable Rates</strong> are only available in solidtime Professional.
-    </UpgradeModal>
 </template>

resources/js/Pages/ProjectShow.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import UpgradeLockedBadge from '@/packages/ui/src/UpgradeLockedBadge.vue';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import AppLayout from '@/Layouts/AppLayout.vue';
 import { FolderIcon, PlusIcon } from '@heroicons/vue/20/solid';
@@ -82,8 +80,6 @@ const shownTasks = computed(() => {
         return task.project_id === projectId && task.is_done;
     });
 });
-
-const { locked: billableRatesLocked } = useBillableRatesLock();
 </script>
 
 <template>
@@ -121,17 +117,11 @@ const { locked: billableRatesLocked } = useBillableRatesLock();
                     </li>
                 </ol>
                 <div class="px-4 space-x-1">
-                    <UpgradeLockedBadge v-if="billableRatesLocked"
-                        >Billable Rates</UpgradeLockedBadge
-                    >
-                    <Badge v-else-if="project?.billable_rate">
+                    <Badge v-if="project?.billable_rate">
                         {{ billableRateFormatted }}
                         / h
                     </Badge>
-                    <Badge
-                        v-if="
-                            project?.is_billable && !project?.billable_rate && !billableRatesLocked
-                        ">
+                    <Badge v-if="project?.is_billable && !project?.billable_rate">
                         Default Rate
                     </Badge>
                     <Badge v-if="!project?.is_billable"> Non-Billable </Badge>

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

@@ -10,12 +10,10 @@ import { storeToRefs } from 'pinia';
 import OrganizationBillableRateModal from '@/Components/Common/Organization/OrganizationBillableRateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { Checkbox } from '@/packages/ui/src';
-import { useBillableRatesLock } from '@/packages/ui/src/utils/useBillableRatesLock';
 
 const store = useOrganizationStore();
 const { fetchOrganization, updateOrganization } = store;
 const { organization } = storeToRefs(store);
-const { locked: billableRatesLocked, requestUpgrade } = useBillableRatesLock();
 const saving = ref(false);
 const organizationBody = ref<UpdateOrganizationBody>({
     name: '',
@@ -77,8 +75,9 @@ function checkForConfirmationModal() {
                     <Checkbox
                         v-if="organization"
                         id="organizationShowBillableRatesToEmployees"
-                        v-model:checked="organizationBody.employees_can_see_billable_rates"
-                        :disabled="billableRatesLocked"></Checkbox>
+                        v-model:checked="
+                            organizationBody.employees_can_see_billable_rates
+                        "></Checkbox>
                     <FieldLabel for="organizationShowBillableRatesToEmployees"
                         >Show Billable Rates to Employees</FieldLabel
                     >
@@ -86,10 +85,7 @@ function checkForConfirmationModal() {
             </div>
         </template>
         <template #actions>
-            <PrimaryButton v-if="billableRatesLocked" @click="requestUpgrade"
-                >Upgrade</PrimaryButton
-            >
-            <PrimaryButton v-else @click="checkForConfirmationModal">Save</PrimaryButton>
+            <PrimaryButton @click="checkForConfirmationModal">Save</PrimaryButton>
         </template>
     </FormSection>
 </template>

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

@@ -8,8 +8,6 @@ import {
     NumberFieldIncrement,
     NumberFieldInput,
 } from '..';
-import UpgradeLockedField from './UpgradeLockedField.vue';
-import { useBillableRatesLock } from '../utils/useBillableRatesLock';
 
 const props = defineProps<{
     name: string;
@@ -22,8 +20,6 @@ const model = defineModel<number | null>({
     default: null,
 });
 
-const { locked } = useBillableRatesLock();
-
 const billableRateInput = ref<HTMLInputElement | null>(null);
 useFocus(billableRateInput, { initialValue: props.focus });
 
@@ -34,9 +30,7 @@ function formatValue(modelValue: number | null) {
 
 <template>
     <div class="relative">
-        <UpgradeLockedField v-if="locked" />
         <NumberField
-            v-else
             :id="name"
             ref="billableRateInput"
             :model-value="formatValue(model)"

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

@@ -1,23 +0,0 @@
-<script setup lang="ts">
-import { LockClosedIcon } from '@heroicons/vue/20/solid';
-import { useBillableRatesLock } from '../utils/useBillableRatesLock';
-
-const { requestUpgrade } = useBillableRatesLock();
-</script>
-
-<template>
-    <button
-        type="button"
-        data-testid="billable_rates_locked"
-        class="flex h-9 w-full items-center justify-between gap-2 rounded-md border border-input-border bg-input-background px-3 text-left text-sm text-text-tertiary shadow-sm transition hover:border-border-tertiary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-        @click.prevent.stop="requestUpgrade">
-        <span class="flex min-w-0 items-center gap-2">
-            <LockClosedIcon class="w-3.5 shrink-0 text-icon-default" />
-            <span class="truncate"><slot>Billable rates</slot></span>
-        </span>
-        <span
-            class="shrink-0 rounded border border-border-secondary bg-secondary px-2 py-0.5 text-xs font-semibold text-text-secondary">
-            Upgrade
-        </span>
-    </button>
-</template>

resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue

@@ -10,15 +10,12 @@ import {
 } from '@/packages/ui/src/tooltip';
 import { computed, onMounted, ref, watch } from 'vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import { useBillableRatesLock } from '../utils/useBillableRatesLock';
 
 const props = defineProps<{
     currency: string;
     organizationBillableRate: number | null;
 }>();
 
-const { locked: billableRatesLocked } = useBillableRatesLock();
-
 type RateType = 'default-rate' | 'custom-rate';
 
 const billableDefault = ref<'billable' | 'non-billable'>('non-billable');
@@ -94,12 +91,7 @@ const emit = defineEmits(['submit']);
     </Field>
     <Field>
         <FieldLabel :icon="BillableIcon" for="billableRateType">Billable Rate</FieldLabel>
-        <BillableRateInput
-            v-if="billableRatesLocked"
-            v-model="displayedRate"
-            :currency="currency"
-            name="billableRate" />
-        <div v-else class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
             <Select v-model="rateType">
                 <SelectTrigger id="billableRateType">
                     <SelectValue />

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

@@ -1,17 +0,0 @@
-<script setup lang="ts">
-import { LockClosedIcon } from '@heroicons/vue/20/solid';
-import { useBillableRatesLock } from './utils/useBillableRatesLock';
-
-const { requestUpgrade } = useBillableRatesLock();
-</script>
-
-<template>
-    <button
-        type="button"
-        data-testid="billable_rates_locked_badge"
-        class="inline-flex items-center space-x-1 rounded border border-border-secondary bg-secondary px-2 py-1 hover:border-border-tertiary hover:bg-tertiary"
-        @click.prevent.stop="requestUpgrade">
-        <LockClosedIcon class="w-3 text-text-tertiary"></LockClosedIcon>
-        <span class="text-xs font-semibold text-text-secondary"><slot>Upgrade</slot></span>
-    </button>
-</template>

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

@@ -21,8 +21,6 @@ export type { CalendarSettings } from './FullCalendar/calendarSettings';
 export type { ActivityPeriod } from './FullCalendar/activityTypes';
 export { cn } from './utils/cn';
 export { useCssVariable } from './utils/useCssVariable';
-export { billableRatesLockKey, useBillableRatesLock } from './utils/useBillableRatesLock';
-export type { BillableRatesLock } from './utils/useBillableRatesLock';
 
 import Badge from './Badge.vue';
 import Button from './Buttons/Button.vue';

resources/js/packages/ui/src/utils/useBillableRatesLock.ts

@@ -1,22 +0,0 @@
-import { computed, inject, type ComputedRef, type InjectionKey } from 'vue';
-
-export interface BillableRatesLock {
-    locked: ComputedRef<boolean>;
-    requestUpgrade: () => void;
-}
-
-export const billableRatesLockKey: InjectionKey<BillableRatesLock> = Symbol('billableRatesLock');
-
-/**
- * Whether billable rates are locked behind a plan upgrade for the current organization.
- *
- * The app layout provides the lock state and opens the upgrade dialog. Without a
- * provider (e.g. public report views or other consumers of this package) billable
- * rates count as unlocked.
- */
-export function useBillableRatesLock(): BillableRatesLock {
-    return inject(billableRatesLockKey, {
-        locked: computed(() => false),
-        requestUpgrade: () => {},
-    });
-}

resources/js/utils/billing.ts

@@ -70,13 +70,3 @@ export function isAllowedToPerformPremiumAction() {
         (isBillingActivated() && isInTrial())
     );
 }
-
-export function canUseBillableRates() {
-    const page = usePage<{
-        billing: {
-            can_use_billable_rates?: boolean;
-        } | null;
-    }>();
-
-    return !isBillingActivated() || page.props.billing?.can_use_billable_rates !== false;
-}

resources/testfiles/clockify_projects_import_test_5.csv

@@ -0,0 +1,4 @@
+"Project","Client","Status","Visibility","Tasks","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Progress(%)","Project members","Project manager","Note"
+"Project for Big Company","Big Company","Active","Public","Task 1, Task 2, Task 3","1.38","","","","","Constantin Graf","",""
+"Project without Client","","Active","Public","","0.00","","","","","Constantin Graf","",""
+"TEST","Big Company","Active","Public","","0.00","","","","","Constantin Graf","",""

tests/TestCase.php

@@ -89,7 +89,6 @@ abstract class TestCase extends BaseTestCase
             $mock->shouldReceive('hasTrial')->andReturn(false);
             $mock->shouldReceive('getTrialUntil')->andReturn(null);
             $mock->shouldReceive('isBlocked')->andReturn(false);
-            $mock->shouldReceive('canUseBillableRates')->andReturn(true);
         });
     }
 
@@ -100,18 +99,6 @@ abstract class TestCase extends BaseTestCase
             $mock->shouldReceive('hasTrial')->andReturn(false);
             $mock->shouldReceive('getTrialUntil')->andReturn(null);
             $mock->shouldReceive('isBlocked')->andReturn(false);
-            $mock->shouldReceive('canUseBillableRates')->andReturn(true);
-        });
-    }
-
-    protected function actAsOrganizationWithoutBillableRates(): void
-    {
-        $this->mock(BillingContract::class, function (MockInterface $mock): void {
-            $mock->shouldReceive('hasSubscription')->andReturn(false);
-            $mock->shouldReceive('hasTrial')->andReturn(false);
-            $mock->shouldReceive('getTrialUntil')->andReturn(null);
-            $mock->shouldReceive('isBlocked')->andReturn(false);
-            $mock->shouldReceive('canUseBillableRates')->andReturn(false);
         });
     }
 }

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

@@ -1,286 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Endpoint\Api\V1;
-
-use App\Http\Controllers\Api\V1\Controller;
-use App\Models\Member;
-use App\Models\Project;
-use App\Models\ProjectMember;
-use App\Models\TimeEntry;
-use App\Models\User;
-use Illuminate\Support\Carbon;
-use Laravel\Passport\Passport;
-use PHPUnit\Framework\Attributes\UsesClass;
-
-#[UsesClass(Controller::class)]
-class BillableRateRestrictionEndpointTest extends ApiEndpointTestAbstract
-{
-    public function test_project_store_fails_with_billable_rate_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'projects:create',
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.projects.store', [$data->organization->getKey()]), [
-            'name' => 'Project',
-            'color' => '#ef5350',
-            'client_id' => null,
-            'is_billable' => true,
-            'billable_rate' => 10000,
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertJsonPath('error', true);
-        $response->assertJsonPath('key', 'feature_is_not_available_in_free_plan');
-        $this->assertDatabaseMissing(Project::class, [
-            'name' => 'Project',
-        ]);
-    }
-
-    public function test_project_store_without_billable_rate_works_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'projects:create',
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.projects.store', [$data->organization->getKey()]), [
-            'name' => 'Project',
-            'color' => '#ef5350',
-            'client_id' => null,
-            'is_billable' => true,
-            'billable_rate' => null,
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-        $this->assertDatabaseHas(Project::class, [
-            'name' => 'Project',
-            'is_billable' => true,
-            'billable_rate' => null,
-        ]);
-    }
-
-    public function test_project_update_keeps_existing_billable_rate_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'projects:update',
-        ]);
-        $project = Project::factory()->forOrganization($data->organization)->create([
-            'billable_rate' => 10000,
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $responseKeep = $this->putJson(route('api.v1.projects.update', [$data->organization->getKey(), $project->getKey()]), [
-            'name' => 'RenamedKeep',
-            'color' => $project->color,
-            'client_id' => null,
-            'is_billable' => true,
-            'billable_rate' => 10000,
-        ]);
-        $responseChange = $this->putJson(route('api.v1.projects.update', [$data->organization->getKey(), $project->getKey()]), [
-            'name' => 'RenamedChange',
-            'color' => $project->color,
-            'client_id' => null,
-            'is_billable' => true,
-            'billable_rate' => 20000,
-        ]);
-        $responseRemove = $this->putJson(route('api.v1.projects.update', [$data->organization->getKey(), $project->getKey()]), [
-            'name' => 'RenamedRemove',
-            'color' => $project->color,
-            'client_id' => null,
-            'is_billable' => true,
-            'billable_rate' => null,
-        ]);
-
-        // Assert
-        $responseKeep->assertStatus(200);
-        $responseKeep->assertJsonPath('data.name', 'RenamedKeep');
-        $responseChange->assertStatus(400);
-        $responseChange->assertJsonPath('key', 'feature_is_not_available_in_free_plan');
-        $responseRemove->assertStatus(200);
-        $project->refresh();
-        $this->assertSame('RenamedRemove', $project->name);
-        $this->assertSame(10000, $project->billable_rate);
-    }
-
-    public function test_project_update_without_billable_rate_does_not_change_project_rate_or_time_entries_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'projects:update',
-        ]);
-        $project = Project::factory()->forOrganization($data->organization)->create([
-            'billable_rate' => 10000,
-            'is_billable' => true,
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->create([
-            'billable' => true,
-            'billable_rate' => 10000,
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.projects.update', [$data->organization->getKey(), $project->getKey()]), [
-            'name' => 'Renamed',
-            'color' => $project->color,
-            'client_id' => null,
-            'is_billable' => true,
-            'is_archived' => true,
-        ]);
-
-        // Assert
-        $response->assertStatus(200);
-        $project->refresh();
-        $this->assertSame('Renamed', $project->name);
-        $this->assertTrue($project->is_archived);
-        $this->assertSame(10000, $project->billable_rate);
-        $this->assertSame(10000, $timeEntry->refresh()->billable_rate);
-    }
-
-    public function test_organization_update_fails_to_set_billable_rate_or_employee_visibility_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'organizations:update',
-        ]);
-        $data->organization->employees_can_see_billable_rates = false;
-        $data->organization->save();
-        Passport::actingAs($data->user);
-
-        // Act
-        $responseRate = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
-            'name' => 'Organization',
-            'billable_rate' => 10000,
-        ]);
-        $responseVisibility = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
-            'name' => 'Organization',
-            'employees_can_see_billable_rates' => true,
-        ]);
-        $responseUnchanged = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
-            'name' => 'Organization',
-            'billable_rate' => null,
-            'employees_can_see_billable_rates' => false,
-        ]);
-
-        // Assert
-        $responseRate->assertStatus(400);
-        $responseVisibility->assertStatus(400);
-        $responseUnchanged->assertStatus(200);
-        $data->organization->refresh();
-        $this->assertNull($data->organization->billable_rate);
-        $this->assertFalse($data->organization->employees_can_see_billable_rates);
-    }
-
-    public function test_member_update_fails_to_set_billable_rate_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'members:update',
-        ]);
-        $member = Member::factory()->forOrganization($data->organization)->forUser(User::factory()->create())->create([
-            'billable_rate' => null,
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $member->getKey()]), [
-            'billable_rate' => 10000,
-        ]);
-
-        // Assert
-        $response->assertStatus(400);
-        $response->assertJsonPath('key', 'feature_is_not_available_in_free_plan');
-        $this->assertNull($member->refresh()->billable_rate);
-    }
-
-    public function test_project_member_store_and_update_fail_to_set_billable_rate_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'project-members:create',
-            'project-members:update',
-        ]);
-        $project = Project::factory()->forOrganization($data->organization)->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser(User::factory()->create())->create();
-        $projectMember = ProjectMember::factory()->forProject($project)->forMember($data->member)->create([
-            'billable_rate' => null,
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $responseStore = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
-            'member_id' => $otherMember->getKey(),
-            'billable_rate' => 10000,
-        ]);
-        $responseUpdate = $this->putJson(route('api.v1.project-members.update', [$data->organization->getKey(), $projectMember->getKey()]), [
-            'billable_rate' => 10000,
-        ]);
-
-        // Assert
-        $responseStore->assertStatus(400);
-        $responseUpdate->assertStatus(400);
-        $this->assertNull($projectMember->refresh()->billable_rate);
-        $this->assertDatabaseMissing(ProjectMember::class, [
-            'member_id' => $otherMember->getKey(),
-        ]);
-    }
-
-    public function test_aggregate_endpoint_hides_cost_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'time-entries:view:all',
-        ]);
-        $start = Carbon::now()->timezone($data->user->timezone)->subDays(2);
-        TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->startWithDuration($start, 3600)->create([
-            'billable' => true,
-            'billable_rate' => 10000,
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-        ]));
-
-        // Assert
-        $response->assertSuccessful();
-        $response->assertJsonPath('data.seconds', 3600);
-        $response->assertJsonPath('data.cost', null);
-    }
-
-    public function test_total_weekly_billable_amount_is_forbidden_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $data = $this->createUserWithPermission([
-            'charts:view:own',
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.charts.total-weekly-billable-amount', [$data->organization->getKey()]));
-
-        // Assert
-        $response->assertForbidden();
-    }
-}

tests/Unit/Middleware/HandleInertiaRequestsMiddlewareTest.php

@@ -35,7 +35,6 @@ class HandleInertiaRequestsMiddlewareTest extends MiddlewareTestAbstract
             $mock->shouldReceive('hasTrial')->andReturn(false);
             $mock->shouldReceive('getTrialUntil')->andReturn(null);
             $mock->shouldReceive('isBlocked')->andReturn(false);
-            $mock->shouldReceive('canUseBillableRates')->andReturn(true);
         });
         Passport::actingAs($user->user);
 
@@ -48,7 +47,6 @@ class HandleInertiaRequestsMiddlewareTest extends MiddlewareTestAbstract
             ->where('billing.has_trial', false)
             ->where('billing.trial_until', null)
             ->where('billing.is_blocked', false)
-            ->where('billing.can_use_billable_rates', true)
         );
     }
 
@@ -63,7 +61,6 @@ class HandleInertiaRequestsMiddlewareTest extends MiddlewareTestAbstract
             $mock->shouldReceive('hasTrial')->andReturn(true);
             $mock->shouldReceive('getTrialUntil')->andReturn($trialUntil);
             $mock->shouldReceive('isBlocked')->andReturn(false);
-            $mock->shouldReceive('canUseBillableRates')->andReturn(true);
         });
         Passport::actingAs($user->user);
 
@@ -76,7 +73,6 @@ class HandleInertiaRequestsMiddlewareTest extends MiddlewareTestAbstract
             ->where('billing.has_trial', true)
             ->where('billing.trial_until', $trialUntil->toIso8601ZuluString())
             ->where('billing.is_blocked', false)
-            ->where('billing.can_use_billable_rates', true)
         );
     }
 }

tests/Unit/Service/Import/Importers/ClockifyProjectsImporterTest.php

@@ -119,6 +119,24 @@ class ClockifyProjectsImporterTest extends ImporterTestAbstract
         );
     }
 
+    public function test_import_of_test_file_without_billability_column_defaults_to_not_billable(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyProjectsImporter;
+        $importer->init($organization);
+        // Some Clockify exports don't contain a "Billability" column.
+        $data = Storage::disk('testfiles')->get('clockify_projects_import_test_5.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+
+        // Assert
+        $project = Project::query()->where('organization_id', $organization->id)->where('name', 'Project for Big Company')->firstOrFail();
+        $this->assertFalse($project->is_billable);
+    }
+
     public function test_import_supports_activities_column_alias_for_tasks(): void
     {
         // Arrange

tests/Unit/Service/Import/Importers/GenericTimeEntriesImporterTest.php

@@ -66,4 +66,27 @@ class GenericTimeEntriesImporterTest extends ImporterTestAbstract
         $this->assertSame(0, $report->projectsCreated);
         $this->assertSame(0, $report->clientsCreated);
     }
+
+    public function test_import_fails_if_task_name_is_too_long(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new GenericTimeEntriesImporter;
+        $importer->init($organization);
+        $taskName = str_repeat('a', 501);
+        $data = "description,billable,client,project,tags,start,end,task,user_name,user_email\n".
+            '"Working hard","true","Big Company","Project for Big Company","","2024-03-04T09:23:00Z","2024-03-04T10:23:01Z","'.$taskName.'","Peter Tester","peter.test@email.test"';
+
+        // Act
+        try {
+            $importer->importData($data, $timezone);
+        } catch (ImportException $e) {
+            // Assert
+            $this->assertSame('Task name ("'.$taskName.'") is too long, maximum length is 500 characters', $e->getMessage());
+
+            return;
+        }
+        $this->fail();
+    }
 }

tests/Unit/Service/Import/Importers/SolidtimeImporterTest.php

@@ -8,8 +8,6 @@ use App\Enums\TimeEntryType;
 use App\Jobs\RecalculateSpentTimeForProject;
 use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\Organization;
-use App\Models\Project;
-use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Service\Import\Importers\DefaultImporter;
 use App\Service\Import\Importers\ImportException;
@@ -104,34 +102,6 @@ class SolidtimeImporterTest extends ImporterTestAbstract
         Queue::assertPushed(RecalculateSpentTimeForTask::class, 1);
     }
 
-    public function test_import_drops_billable_rates_if_organization_can_not_use_billable_rates(): void
-    {
-        // Arrange
-        $this->actAsOrganizationWithoutBillableRates();
-        $zipPath = $this->createTestZip('solidtime_import_test_1');
-        $timezone = 'Europe/Vienna';
-        $organization = Organization::factory()->create();
-        $importer = new SolidtimeImporter;
-        $importer->init($organization);
-        $data = file_get_contents($zipPath);
-        Queue::fake([
-            RecalculateSpentTimeForProject::class,
-            RecalculateSpentTimeForTask::class,
-        ]);
-
-        // Act
-        $importer->importData($data, $timezone);
-
-        // Assert
-        $this->assertSame(3, Project::query()->whereBelongsTo($organization, 'organization')->whereNull('billable_rate')->count());
-        $this->assertSame(1, ProjectMember::query()->whereBelongsToOrganization($organization)->whereNull('billable_rate')->count());
-        $timeEntries = TimeEntry::query()->whereBelongsTo($organization, 'organization')->get();
-        $this->assertCount(2, $timeEntries);
-        foreach ($timeEntries as $timeEntry) {
-            $this->assertNull($timeEntry->billable_rate);
-        }
-    }
-
     public function test_import_of_test_file_with_type_column_imports_breaks(): void
     {
         // Arrange