putrakuningan/clara
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Conversation 0 Commits 77 Files Changed 2274 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e3f6b2bd9c - Show all commits

3
resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
View File

@ -23,7 +23,7 @@
</div> </div>
<!--end::Actions--> <!--end::Actions-->
@endif @endif
@elseif($route[0]!=='settings' && $route[0]!=='approval') @elseif($route[0]!=='settings' && $route[0]!=='approval' && $route[0]!=='report')
@if(!Auth::user()->hasRole(['ad','dd'])) @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">
@ -68,7 +68,6 @@
<!--end::Primary button--> <!--end::Primary button-->
@endif @endif
<!--begin::Primary button--> <!--begin::Primary button-->
<a href="{{ route($route[0].'.index') }}?id={{ $id }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add/Edit Odner</a>
<a href="{{ route('cardboard.index') }}" class="btn btn-sm fw-bold btn-warning text-capitalize">Back</a> <a href="{{ route('cardboard.index') }}" class="btn btn-sm fw-bold btn-warning text-capitalize">Back</a>
<!--end::Primary button--> <!--end::Primary button-->
@else @else