Update Metronic Version to 8.2.1 #1

Merged
putrakuningan merged 77 commits from dev into master 2024-05-04 09:46:45 +00:00
Showing only changes of commit d9107597c3 - Show all commits

View File

@ -13,8 +13,8 @@
@if(isset($route[0]) && $route[0]!=='cardboard-detail') @if(isset($route[0]) && $route[0]!=='cardboard-detail')
@if(isset($route[1]) && $route[1] == 'index') @if(isset($route[1]) && $route[1] == 'index')
@if($route[0]=='document' || $route[0]=='cardboard') @if($route[0]=='document')
@if(!Auth::user()->hasRole(['ad','dd','eo'])) @if(!Auth::user()->hasRole(['ad','dd']))
<!--begin::Actions--> <!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3"> <div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button--> <!--begin::Primary button-->
@ -24,6 +24,7 @@
<!--end::Actions--> <!--end::Actions-->
@endif @endif
@elseif($route[0]!=='settings' && $route[0]!=='approval') @elseif($route[0]!=='settings' && $route[0]!=='approval')
@if(!Auth::user()->hasRole(['ad','dd']))
<!--begin::Actions--> <!--begin::Actions-->
<div class="d-flex align-items-center gap-2 gap-lg-3"> <div class="d-flex align-items-center gap-2 gap-lg-3">
<!--begin::Primary button--> <!--begin::Primary button-->
@ -32,6 +33,7 @@
</div> </div>
<!--end::Actions--> <!--end::Actions-->
@endif @endif
@endif
@elseif(isset($route[2]) && $route[2] == 'index') @elseif(isset($route[2]) && $route[2] == 'index')
@if($route[1]!=='users' || $route[0] !=='log') @if($route[1]!=='users' || $route[0] !=='log')
<!--begin::Actions--> <!--begin::Actions-->