From 2a6a5d21315d4dd7303616a991ff2c8e36f91c6c Mon Sep 17 00:00:00 2001 From: pbao9 Date: Sat, 7 Feb 2026 16:28:24 +0700 Subject: [PATCH] update --- .../pages/block/product/btn.blade.php | 5 ++- .../categories/datatable/action.blade.php | 5 ++- .../datatable/action_trash.blade.php | 5 +-- .../views/components/button-c-r-m.blade.php | 33 +++++++++---------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/resources/views/administrator/pages/block/product/btn.blade.php b/resources/views/administrator/pages/block/product/btn.blade.php index 20f4609..fa02499 100644 --- a/resources/views/administrator/pages/block/product/btn.blade.php +++ b/resources/views/administrator/pages/block/product/btn.blade.php @@ -1,9 +1,12 @@ @if(auth()->guard('admins')->user()->can("manager product")) + @php + $trashedCount = \App\Models\ProductCategories::onlyTrashed()->count(); + @endphp Thêm sản phẩm Thêm nhóm SP Thùng - rác + rác @if($trashedCount > 0){{ $trashedCount }}@endif @endif \ No newline at end of file diff --git a/resources/views/administrator/pages/product/categories/datatable/action.blade.php b/resources/views/administrator/pages/product/categories/datatable/action.blade.php index 2ff0c12..53a1d72 100644 --- a/resources/views/administrator/pages/product/categories/datatable/action.blade.php +++ b/resources/views/administrator/pages/product/categories/datatable/action.blade.php @@ -1,8 +1,7 @@
- Edit + Delete + data-micromodal-trigger="deleteModal-{{ $row->id }}" />
@include('administrator.pages.product.categories.datatable.modal', [ diff --git a/resources/views/administrator/pages/product/categories/datatable/action_trash.blade.php b/resources/views/administrator/pages/product/categories/datatable/action_trash.blade.php index 0abd20f..daa1aea 100644 --- a/resources/views/administrator/pages/product/categories/datatable/action_trash.blade.php +++ b/resources/views/administrator/pages/product/categories/datatable/action_trash.blade.php @@ -1,6 +1,7 @@
- Restore - Force Delete + +
@include('administrator.pages.product.categories.datatable.modal', [ diff --git a/resources/views/components/button-c-r-m.blade.php b/resources/views/components/button-c-r-m.blade.php index 2979066..ce92d60 100644 --- a/resources/views/components/button-c-r-m.blade.php +++ b/resources/views/components/button-c-r-m.blade.php @@ -52,21 +52,20 @@ $variantClass = $variants[$variant ?? 'primary'] ?? $variants['primary']; $sizeClass = $sizes[$size ?? 'default'] ?? ''; - $classes = "btn {$variantClass} {$sizeClass}"; + $classes = "btn d-flex align-items-center {$variantClass} {$sizeClass}"; @endphp - - @if($tag === 'a') - merge(['class' => $classes]) }}> - @if($icon) - - @endif - {{ $slot }} - - @else - - @endif \ No newline at end of file +@if($tag === 'a') + merge(['class' => $classes]) }}> + @if($icon) + + @endif + @if($slot->isNotEmpty()){{ $slot }}@endif + +@else + +@endif \ No newline at end of file