diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index 0cef2f0..c9c7148 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -215,14 +215,15 @@ if (!function_exists('activeMenuClass')) { * * @return mixed */ - function activeMenuClass($url){ + function activeMenuClass($route){ // dd(request()->route()->getName()); - // if(request()->route()->getName() == $url){ + // if(request()->route()->getName() == $route){ // return true; // }else{ // return false; // } - if (\Str::is($url, request()->path())) { + + if (\Str::is($route, request()->route()->getName())) { return true; } else { return false; @@ -252,11 +253,11 @@ if (!function_exists('renderMenu')) { $ch1 = count($child2) > 0 ? 'has-arrow' : ''; $link1 = count($child2) > 0 ? '' : ''; $collapse1 = count($child2) > 0 ? 'href="javascript: void(0);"' : ''; - $active = activeMenuClass($p1->url) ? 'mm-active' : ''; + $active = activeMenuClass($p1->module) ? 'mm-active' : ''; // dd($p1->route); if ($access1) { - $active1 = activeMenuClass($p1->url) ? 'mm-active' : ''; + $active1 = activeMenuClass($p1->module) ? 'mm-active' : ''; $html .= '