diff --git a/app/Http/Controllers/Admin/ActivityLogController.php b/app/Http/Controllers/Admin/ActivityLogController.php index f6609e5..1909742 100644 --- a/app/Http/Controllers/Admin/ActivityLogController.php +++ b/app/Http/Controllers/Admin/ActivityLogController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\ActivityLog; +use App\Models\Tour; use Illuminate\Http\Request; class ActivityLogController extends Controller @@ -16,9 +17,12 @@ class ActivityLogController extends Controller ->when($request->filled('log_name'), function ($query) use ($request) { $query->where('log_name', $request->input('log_name')); }) - ->latest('created_at') + ->orderByDesc('created_at') ->paginate(20); + + + return view('admin.activity-logs.index', compact('logs')); } } diff --git a/app/Http/Controllers/Admin/TourController.php b/app/Http/Controllers/Admin/TourController.php index 15b704c..119a5e6 100644 --- a/app/Http/Controllers/Admin/TourController.php +++ b/app/Http/Controllers/Admin/TourController.php @@ -208,7 +208,7 @@ class TourController extends Controller 'updated_by' => auth('admin')->id(), ]); - logActivity('tours', $tour->id, 'updated', [ + logActivity('tours', $tour->id , 'updated', [ 'before' => $before, 'after' => $tour->only(array_keys($before)), ]); diff --git a/app/Models/ActivityLog.php b/app/Models/ActivityLog.php index 9fa8883..36b32a0 100644 --- a/app/Models/ActivityLog.php +++ b/app/Models/ActivityLog.php @@ -34,4 +34,5 @@ class ActivityLog extends Model { return $this->belongsTo(Admin::class, 'causer_id'); } + } diff --git a/resources/views/account/wishlist.blade.php b/resources/views/account/wishlist.blade.php index a5473c9..6bbf064 100644 --- a/resources/views/account/wishlist.blade.php +++ b/resources/views/account/wishlist.blade.php @@ -4,7 +4,7 @@ @section('account-content') - ``` +