diff --git a/Modules/Client/Http/Controllers/Api/DashboardController.php b/Modules/Client/Http/Controllers/Api/DashboardController.php index 5e133d47..441c97af 100755 --- a/Modules/Client/Http/Controllers/Api/DashboardController.php +++ b/Modules/Client/Http/Controllers/Api/DashboardController.php @@ -19,7 +19,7 @@ class DashboardController extends Controller $user = Auth::user(); $currentCorporate = $user->managedCorporates() ->with(['currentPolicy', 'employees']) - ->findOrFail($corporate_id); + ->find($corporate_id); $data = DashboardResources::make($currentCorporate); diff --git a/frontend/client-portal/src/pages/Dashboard/Dashboard.tsx b/frontend/client-portal/src/pages/Dashboard/Dashboard.tsx index d20e4870..13abba5d 100755 --- a/frontend/client-portal/src/pages/Dashboard/Dashboard.tsx +++ b/frontend/client-portal/src/pages/Dashboard/Dashboard.tsx @@ -57,6 +57,7 @@ type CardBalanceProps = { export default function Dashboard() { const { themeStretch } = useSettings(); const { user } = useAuth(); + const [currentCorporate, setCurrentCorporate] = useState({id: 1}); // @ts-ignore const [corporateValue, setCorporateValue] = useState(`1`); @@ -79,8 +80,8 @@ export default function Dashboard() { useEffect(() => { (async () => { - const corporates = await axios.get('corporate'); - const dashboard = await axios.get('dashboard'); + const corporates = await axios.get(`${currentCorporate.id}/dashboard`); + const dashboard = await axios.get(`${currentCorporate.id}/dashboard`); setCorporateData(corporates.data); setPolicyData(dashboard.data.policy);