update e2e test setup to use user settings api endpoint

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

@@ -50,6 +50,9 @@ class OrganizationController extends Controller
         if ($request->getName() !== null) {
             $organization->name = $request->getName();
         }
+        if ($request->getCurrency() !== null) {
+            $organization->currency = $request->getCurrency();
+        }
         if ($request->getEmployeesCanSeeBillableRates() !== null) {
             $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
         }

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

@@ -11,6 +11,7 @@ use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
+use App\Rules\CurrencyRule;
 use Illuminate\Validation\Rule;
 
 /**
@@ -21,7 +22,7 @@ class OrganizationUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|\Illuminate\Contracts\Validation\ValidationRule>>
      */
     public function rules(): array
     {
@@ -30,6 +31,10 @@ class OrganizationUpdateRequest extends BaseFormRequest
                 'string',
                 'max:255',
             ],
+            'currency' => [
+                'string',
+                new CurrencyRule,
+            ],
             'billable_rate' => array_merge(
                 [
                     'nullable',
@@ -68,6 +73,11 @@ class OrganizationUpdateRequest extends BaseFormRequest
         return $this->has('name') ? (string) $this->input('name') : null;
     }
 
+    public function getCurrency(): ?string
+    {
+        return $this->has('currency') ? (string) $this->input('currency') : null;
+    }
+
     public function getNumberFormat(): ?NumberFormat
     {
         return $this->has('number_format') ? NumberFormat::from($this->input('number_format')) : null;

e2e/calendar.spec.ts

@@ -12,7 +12,7 @@ import {
     createRunningTimeEntryWithStartViaApi,
     createTaskViaApi,
     createProjectWithClientViaApi,
-    updateUserProfileViaWeb,
+    updateUserProfileViaApi,
     updateOrganizationSettingViaApi,
 } from './utils/api';
 
@@ -1803,28 +1803,22 @@ test.describe('Click-Drag Selection to Create', () => {
 // =============================================
 
 test.describe('Timezone & Localization', () => {
-    test('week start day: monday shows Mon as first column', async ({ page }) => {
-        // Navigate to calendar first to load Inertia page props
+    test('week start day: monday shows Mon as first column', async ({ page, ctx }) => {
+        await updateUserProfileViaApi(ctx, { week_start: 'monday' });
         await goToCalendar(page);
-        await updateUserProfileViaWeb(page, { week_start: 'monday' });
-        await page.reload();
         await expect(page.locator('.fc')).toBeVisible();
 
         const firstHeader = page.locator('.fc-col-header-cell').first();
         await expect(firstHeader).toContainText('Mon');
     });
 
-    test('week start day: sunday shows Sun as first column', async ({ page }) => {
+    test('week start day: sunday shows Sun as first column', async ({ page, ctx }) => {
+        await updateUserProfileViaApi(ctx, { week_start: 'sunday' });
         await goToCalendar(page);
-        await updateUserProfileViaWeb(page, { week_start: 'sunday' });
-        await page.reload();
         await expect(page.locator('.fc')).toBeVisible();
 
         const firstHeader = page.locator('.fc-col-header-cell').first();
         await expect(firstHeader).toContainText('Sun');
-
-        // Reset to monday for other tests
-        await updateUserProfileViaWeb(page, { week_start: 'monday' });
     });
 
     test('12-hour time format shows AM/PM on slot labels', async ({ page, ctx }) => {

e2e/command-palette.spec.ts

@@ -348,7 +348,7 @@ test.describe('Command Palette', () => {
             const newOrgName = 'TestOrg' + Math.floor(Math.random() * 10000);
 
             // Create a new organization
-            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
             await page.getByLabel('Organization Name').fill(newOrgName);
             await page.getByRole('button', { name: 'Create' }).click();
 
@@ -393,7 +393,7 @@ test.describe('Command Palette', () => {
             const newOrgName = 'GroupTestOrg' + Math.floor(Math.random() * 10000);
 
             // Create a new organization to ensure we have multiple
-            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
             await page.getByLabel('Organization Name').fill(newOrgName);
             await page.getByRole('button', { name: 'Create' }).click();
             await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });

e2e/organization.spec.ts

@@ -55,6 +55,33 @@ test('test that organization name can be updated', async ({ page }) => {
     );
 });
 
+test('test that organization currency can be updated', async ({ page }) => {
+    await goToOrganizationSettings(page);
+    await page.getByLabel('Currency', { exact: true }).selectOption('USD');
+    await Promise.all([
+        page.waitForRequest(
+            (request) =>
+                request.url().includes('/api/v1/organizations/') &&
+                request.method() === 'PUT' &&
+                request.postDataJSON().currency === 'USD'
+        ),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/api/v1/organizations/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200 &&
+                (await response.json()).data.currency === 'USD'
+        ),
+        page
+            .locator('form')
+            .filter({ hasText: 'Organization Name' })
+            .getByRole('button', { name: 'Save' })
+            .click(),
+    ]);
+    await page.reload();
+    await expect(page.getByLabel('Currency', { exact: true })).toHaveValue('USD');
+});
+
 test('test that organization billable rate can be updated with all existing time entries', async ({
     page,
 }) => {
@@ -387,7 +414,7 @@ test('test that format settings persist after page reload', async ({ page }) =>
 
 test.describe('Organization Create, Delete & Switch', () => {
     async function createOrganization(page, name: string) {
-        await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+        await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
         await page.getByLabel('Organization Name').fill(name);
         await Promise.all([
             page.waitForResponse(
@@ -413,7 +440,7 @@ test.describe('Organization Create, Delete & Switch', () => {
     });
 
     test('does not create an organization when the name is empty', async ({ page }) => {
-        await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+        await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
 
         // The form posts to the API, which rejects the empty name with a 422.
         await Promise.all([
@@ -427,8 +454,7 @@ test.describe('Organization Create, Delete & Switch', () => {
         ]);
 
         // Validation failed, so we stay on the create form and never reach a
-        // dashboard. ('/teams/create' redirects to '/organizations/create', so
-        // assert on the form rather than the URL.)
+        // dashboard. Assert on the form rather than the URL.
         await expect(page.getByText('Organization Details')).toBeVisible();
         await expect(page.getByRole('alert')).toContainText('The name field is required.');
         await expect(page.getByLabel('Organization Name')).toHaveAttribute('aria-invalid', 'true');
@@ -505,7 +531,7 @@ test.describe('Organization Create, Delete & Switch', () => {
 
 test.describe('Admin Organization Settings Access', () => {
     test('admin can see and edit organization settings', async ({ ctx, admin }) => {
-        await admin.page.goto(PLAYWRIGHT_BASE_URL + '/teams/' + ctx.orgId);
+        await admin.page.goto(PLAYWRIGHT_BASE_URL + '/organizations/' + ctx.orgId);
 
         // Organization Name section is visible
         await expect(
@@ -542,7 +568,7 @@ test.describe('Admin Organization Settings Access', () => {
 
 test.describe('Employee Organization Settings Restrictions', () => {
     test('employee can see org name but not editable settings', async ({ ctx, employee }) => {
-        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/teams/' + ctx.orgId);
+        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/organizations/' + ctx.orgId);
 
         // Organization Name section is visible (but inputs are disabled)
         await expect(

e2e/utils/api.ts

@@ -641,10 +641,13 @@ export async function updateOrganizationCurrencyViaWeb(
     const xsrfCookie = cookies.find((c) => c.name === 'XSRF-TOKEN');
     const xsrfToken = xsrfCookie ? decodeURIComponent(xsrfCookie.value) : '';
 
-    const response = await page.request.put(`${PLAYWRIGHT_BASE_URL}/teams/${ctx.orgId}`, {
-        headers: { 'X-XSRF-TOKEN': xsrfToken },
-        data: { name, currency },
-    });
+    const response = await page.request.put(
+        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}`,
+        {
+            headers: { 'X-XSRF-TOKEN': xsrfToken },
+            data: { name, currency },
+        }
+    );
     expect(response.status()).toBe(200);
 }
 
@@ -801,53 +804,23 @@ export async function getCurrentUserViaApi(ctx: TestContext) {
     };
 }
 
-export async function updateUserProfileViaWeb(
-    page: Page,
+export async function updateUserProfileViaApi(
+    ctx: TestContext,
     settings: { timezone?: string; week_start?: string }
 ) {
-    // Read user info from Inertia's data-page attribute on the root element
-    const userInfo = await page.evaluate(() => {
-        // Try Inertia's data-page attribute (stores initial page props as JSON)
-        const appEl = document.getElementById('app');
-        if (appEl) {
-            const dataPage = appEl.getAttribute('data-page');
-            if (dataPage) {
-                try {
-                    const parsed = JSON.parse(dataPage);
-                    const user = parsed?.props?.auth?.user;
-                    if (user) {
-                        return {
-                            name: user.name,
-                            email: user.email,
-                            timezone: user.timezone,
-                            week_start: user.week_start,
-                        };
-                    }
-                } catch {
-                    // JSON parse failed
-                }
-            }
-        }
-        return null;
-    });
-    if (!userInfo) throw new Error('Could not read user info from Inertia data-page attribute');
+    const user = await getCurrentUserViaApi(ctx);
 
-    const cookies = await page.context().cookies();
-    const xsrfCookie = cookies.find((c) => c.name === 'XSRF-TOKEN');
-    const xsrfToken = xsrfCookie ? decodeURIComponent(xsrfCookie.value) : '';
+    // Only send the fields under test; the endpoint leaves omitted fields untouched.
+    const data: Record<string, string> = {};
+    if (settings.timezone !== undefined) {
+        data.timezone = settings.timezone;
+    }
+    if (settings.week_start !== undefined) {
+        data.week_start = settings.week_start;
+    }
 
-    const response = await page.request.put(`${PLAYWRIGHT_BASE_URL}/user/profile-information`, {
-        headers: {
-            'X-XSRF-TOKEN': xsrfToken,
-            'Content-Type': 'application/json',
-            Accept: 'application/json',
-        },
-        data: {
-            name: userInfo.name,
-            email: userInfo.email,
-            timezone: settings.timezone ?? userInfo.timezone,
-            week_start: settings.week_start ?? userInfo.week_start,
-        },
+    const response = await ctx.request.put(`${PLAYWRIGHT_BASE_URL}/api/v1/users/${user.id}`, {
+        data,
     });
     expect(response.status()).toBe(200);
 }

resources/js/Components/OrganizationSwitcher.vue

@@ -61,7 +61,7 @@ const switchToTeam = (organization: Organization) => {
 
                 <DropdownMenuItem as-child>
                     <Link
-                        :href="route('teams.show', page.props.auth.user.current_team.id)"
+                        :href="route('organizations.show', page.props.auth.user.current_team.id)"
                         class="inline-flex items-center gap-2.5 w-full">
                         <Cog6ToothIcon class="w-5 h-5 text-icon-default" />
                         <span>Organization Settings</span>
@@ -74,7 +74,7 @@ const switchToTeam = (organization: Organization) => {
 
                 <DropdownMenuItem as-child>
                     <Link
-                        :href="route('teams.create')"
+                        :href="route('organizations.create')"
                         class="inline-flex items-center gap-2.5 w-full">
                         <PlusCircleIcon class="w-5 h-5 text-icon-default" />
                         <span>Create new organization</span>

resources/js/Layouts/AppLayout.vue

@@ -280,10 +280,15 @@ const page = usePage<{
                                 v-if="canUpdateOrganization()"
                                 title="Settings"
                                 :icon="Cog6ToothIcon"
-                                :href="route('teams.show', page.props.auth.user.current_team.id)"
+                                :href="
+                                    route(
+                                        'organizations.show',
+                                        page.props.auth.user.current_team.id
+                                    )
+                                "
                                 :current="
                                     route().current(
-                                        'teams.show',
+                                        'organizations.show',
                                         page.props.auth.user.current_team.id
                                     )
                                 "></NavigationSidebarItem>

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

@@ -330,6 +330,7 @@ const OrganizationResource = z
 const OrganizationUpdateRequest = z
     .object({
         name: z.string().max(255),
+        currency: z.string(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
         employees_can_manage_tasks: z.boolean(),

resources/js/utils/commandPaletteCommands.ts

@@ -210,7 +210,7 @@ export function createNavigationCommands(
             icon: Cog6ToothIcon,
             keywords: ['settings', 'organization', 'configuration'],
             group: 'navigation',
-            action: () => navigate('teams.show', { team: currentTeamId() }),
+            action: () => navigate('organizations.show', { organizationId: currentTeamId() }),
             permission: permissions.canUpdateOrganization,
             priority: GROUP_PRIORITIES.navigation - 3,
         },

resources/js/ziggy.d.ts

@@ -114,6 +114,13 @@ declare module 'ziggy-js' {
         'other-browser-sessions.destroy': [];
         'current-user-photo.destroy': [];
         'current-user.destroy': [];
+        'organizations.create': [];
+        'organizations.show': [
+            {
+                'name': 'organizationId';
+                'required': true;
+            },
+        ];
         'teams.create': [];
         'teams.store': [];
         'teams.show': [

resources/js/ziggy.js

@@ -197,6 +197,12 @@ const Ziggy = {
             'methods': ['DELETE'],
         },
         'current-user.destroy': { 'uri': 'user', 'methods': ['DELETE'] },
+        'organizations.create': { 'uri': 'organizations/create', 'methods': ['GET', 'HEAD'] },
+        'organizations.show': {
+            'uri': 'organizations/{organizationId}',
+            'methods': ['GET', 'HEAD'],
+            'parameters': ['organizationId'],
+        },
         'teams.create': { 'uri': 'teams/create', 'methods': ['GET', 'HEAD'] },
         'teams.store': { 'uri': 'teams', 'methods': ['POST'] },
         'teams.show': {

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

@@ -382,6 +382,58 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
+    public function test_update_endpoint_can_update_the_currency_of_the_organization(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:update',
+        ]);
+        $this->assertBillableRateServiceIsUnused();
+        $data->organization->currency = 'EUR';
+        $data->organization->save();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
+            'name' => $data->organization->name,
+            'currency' => 'USD',
+        ]);
+
+        // Assert
+        $response->assertStatus(200);
+        $response->assertJsonPath('data.currency', 'USD');
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+            'currency' => 'USD',
+        ]);
+    }
+
+    public function test_update_endpoint_fails_if_currency_is_invalid(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:update',
+        ]);
+        $this->assertBillableRateServiceIsUnused();
+        $data->organization->currency = 'EUR';
+        $data->organization->save();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
+            'name' => $data->organization->name,
+            'currency' => 'NOT_A_CURRENCY',
+        ]);
+
+        // Assert
+        $response->assertStatus(422);
+        $response->assertJsonValidationErrors(['currency']);
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+            'currency' => 'EUR',
+        ]);
+    }
+
     public function test_delete_endpoint_if_user_does_not_have_permission(): void
     {
         // Arrange