From 59ddf9264212e183ef2da8ead5b2d2c67ef69fba Mon Sep 17 00:00:00 2001
From: isaacclad <sense.corporate@gmail.com>
Date: Thu, 16 Jul 2026 09:03:00 +0000
Subject: [PATCH] Place Branches & team after Organization on settings.

Keep facility details first so access links follow org settings instead of leading the page.
---
 resources/views/care/settings/edit.blade.php | 68 ++++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/views/care/settings/edit.blade.php b/resources/views/care/settings/edit.blade.php
index d734d30..2947d2c 100644
--- a/resources/views/care/settings/edit.blade.php
+++ b/resources/views/care/settings/edit.blade.php
@@ -1,39 +1,5 @@
 <x-app-layout title="Settings">
     <x-settings.page title="Facility settings" description="Configure facility details, locations, staff access, and messaging for {{ $organization->name }}.">
-        @if ($canViewBranches || $canViewTeam)
-            <x-settings.card title="Branches & team" description="Locations and staff access for this facility. Multi-branch requires Care Pro.">
-                <ul class="space-y-3">
-                    @if ($canViewBranches)
-                        <li>
-                            <a href="{{ route('care.branches.index') }}"
-                               class="flex items-center justify-between rounded-xl border border-slate-100 bg-slate-50 px-4 py-3 text-sm text-slate-700 hover:text-indigo-700">
-                                <span>
-                                    Branches
-                                    @if (! $hasPaidPlan)
-                                        <span class="ml-2 rounded-full bg-amber-50 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-amber-700">Pro</span>
-                                    @endif
-                                    <span class="mt-0.5 block text-xs text-slate-500">Clinic locations and sites ({{ $branchCount }} configured)</span>
-                                </span>
-                                <span class="text-slate-400">&rarr;</span>
-                            </a>
-                        </li>
-                    @endif
-                    @if ($canViewTeam)
-                        <li>
-                            <a href="{{ route('care.members.index') }}"
-                               class="flex items-center justify-between rounded-xl border border-slate-100 bg-slate-50 px-4 py-3 text-sm text-slate-700 hover:text-indigo-700">
-                                <span>
-                                    Team
-                                    <span class="mt-0.5 block text-xs text-slate-500">Invite colleagues and assign Care roles</span>
-                                </span>
-                                <span class="text-slate-400">&rarr;</span>
-                            </a>
-                        </li>
-                    @endif
-                </ul>
-            </x-settings.card>
-        @endif
-
         <form method="POST" action="{{ route('care.settings.update') }}" enctype="multipart/form-data" class="space-y-6">
             @csrf @method('PUT')
 
@@ -82,6 +48,40 @@
                 </div>
             </x-settings.card>
 
+            @if ($canViewBranches || $canViewTeam)
+                <x-settings.card title="Branches & team" description="Locations and staff access for this facility. Multi-branch requires Care Pro.">
+                    <ul class="space-y-3">
+                        @if ($canViewBranches)
+                            <li>
+                                <a href="{{ route('care.branches.index') }}"
+                                   class="flex items-center justify-between rounded-xl border border-slate-100 bg-slate-50 px-4 py-3 text-sm text-slate-700 hover:text-indigo-700">
+                                    <span>
+                                        Branches
+                                        @if (! $hasPaidPlan)
+                                            <span class="ml-2 rounded-full bg-amber-50 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-amber-700">Pro</span>
+                                        @endif
+                                        <span class="mt-0.5 block text-xs text-slate-500">Clinic locations and sites ({{ $branchCount }} configured)</span>
+                                    </span>
+                                    <span class="text-slate-400">&rarr;</span>
+                                </a>
+                            </li>
+                        @endif
+                        @if ($canViewTeam)
+                            <li>
+                                <a href="{{ route('care.members.index') }}"
+                                   class="flex items-center justify-between rounded-xl border border-slate-100 bg-slate-50 px-4 py-3 text-sm text-slate-700 hover:text-indigo-700">
+                                    <span>
+                                        Team
+                                        <span class="mt-0.5 block text-xs text-slate-500">Invite colleagues and assign Care roles</span>
+                                    </span>
+                                    <span class="text-slate-400">&rarr;</span>
+                                </a>
+                            </li>
+                        @endif
+                    </ul>
+                </x-settings.card>
+            @endif
+
             @if ($canManage)
                 <x-settings.card title="Messaging" description="Configure SMS and email credentials for outbound messages.">
                     <a href="{{ route('care.integrations') }}" class="text-sm font-medium text-teal-700 underline">Open messaging integrations →</a>