diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php index 0ba3732..cf8252d 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php @@ -69,7 +69,7 @@ class FractionalRealEstateController extends Controller public function show($id) { $fractionalRealEstate = Product::with('category', 'fractional_real_estate')->fractionalrealestate()->findorFail($id); - + // dd($fractionalRealEstate); return view('Admin.Pages.manage_freeu_investment.view-product.fractional-real-estate', compact('fractionalRealEstate')); } diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php index 46e7bed..8198523 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php @@ -112,14 +112,23 @@ class ManageCategoriesController extends Controller { if ($request->ajax()) { $data = Category::select('*'); + + // Check if dropdownValue is not null and not 'orderby' if ($request->dropdownValue != null && $request->dropdownValue != 'orderby') { $where = $request->dropdownValue; $data->where('status', $where); - }; + } + + // Check if dropdownValue is 'orderby' if ($request->dropdownValue == 'orderby') { $data->orderBy('id', 'desc'); - }; - return Datatables::of($data)->addIndexColumn() + } + + // Fetch categories as active first, then deactivated + $data->orderByRaw('CASE WHEN status = 1 THEN 0 ELSE 1 END'); + + return Datatables::of($data) + ->addIndexColumn() ->editColumn('created_at', function ($row) { $formattedDate = $row->created_at->format('d/m/Y'); return '
{{ $pick->product_name }}
+{{ $pick->product_name }}-{{$pick->categories_id}}
Category: {{ $pick->category_name }}
diff --git a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php index c2d9dd1..f42c208 100644 --- a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php @@ -40,6 +40,7 @@ +