From 7ec28218fade7ea1af7e45c43e40f3b70b49679b Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 24 Aug 2024 18:21:49 +1000
Subject: [PATCH] Remove more old references to @js datatables

---
 .../Wholesale/ReportController.php            | 18 -----------------
 .../backend/adminlte/account/report.blade.php |  5 ++---
 .../backend/adminlte/product/report.blade.php | 20 +++++--------------
 routes/web.php                                |  4 ++--
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 app/Http/Controllers/Wholesale/ReportController.php

diff --git a/app/Http/Controllers/Wholesale/ReportController.php b/app/Http/Controllers/Wholesale/ReportController.php
deleted file mode 100644
index e9d103f..0000000
--- a/app/Http/Controllers/Wholesale/ReportController.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Wholesale;
-
-use App\Http\Controllers\Controller;
-
-class ReportController extends Controller
-{
-	public function accounts()
-	{
-		return view('account/report');
-	}
-
-	public function products()
-	{
-		return view('product/report');
-	}
-}
\ No newline at end of file
diff --git a/resources/views/theme/backend/adminlte/account/report.blade.php b/resources/views/theme/backend/adminlte/account/report.blade.php
index 3c2b033..a231421 100644
--- a/resources/views/theme/backend/adminlte/account/report.blade.php
+++ b/resources/views/theme/backend/adminlte/account/report.blade.php
@@ -47,10 +47,9 @@
 	</div>
 @endsection
 
-@section('page-scripts')
-	@css(datatables,bootstrap4|fixedheader|responsive|rowgroup|select|searchpanes|searchpanes-left)
-	@js(datatables,bootstrap4|fixedheader|responsive|rowgroup|select|searchpanes)
+@pa(datatables,rowgroup|select|searchpanes|searchpanes-left)
 
+@section('page-scripts')
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#table').DataTable({
diff --git a/resources/views/theme/backend/adminlte/product/report.blade.php b/resources/views/theme/backend/adminlte/product/report.blade.php
index c7c5a11..5a4a18b 100644
--- a/resources/views/theme/backend/adminlte/product/report.blade.php
+++ b/resources/views/theme/backend/adminlte/product/report.blade.php
@@ -1,3 +1,5 @@
+@use(App\Models\Service)
+
 @extends('adminlte::layouts.app')
 
 @section('htmlheader_title')
@@ -29,7 +31,7 @@
 					</thead>
 
 					<tbody>
-					@foreach (\App\Models\Service::active()->with(['product.translate'])->get()->groupBy('product_id') as $s)
+					@foreach (Service::ServiceActive()->with(['product.translate'])->get()->groupBy('product_id') as $s)
 						<tr>
 							<td><a href="{{ url('a/product/details',[($x=$s->first())->product_id]) }}">{{ $x->id }}</a></td>
 							<td>{{ $x->product->category_name }}</td>
@@ -45,21 +47,9 @@
 	</div>
 @endsection
 
+@pa(datatables,rowgroup)
+
 @section('page-scripts')
-	@css(datatables,bootstrap4|fixedheader|responsive|rowgroup|buttons)
-	@js(datatables,bootstrap4|fixedheader|responsive|rowgroup|buttons)
-
-	<style>
-		tr.odd td:first-child,
-		tr.even td:first-child {
-			padding-left: 3em;
-		}
-		table.dataTable tr.dtrg-group.dtrg-level-1 td {
-			background-color: #e0e0e0;
-			color: #4c110f;
-		}
-	</style>
-
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#table').DataTable({
diff --git a/routes/web.php b/routes/web.php
index c4f1ced..b8bfd95 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -125,8 +125,8 @@ Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function()
 		->whereIn('type',Supplier::offeringTypeKeys()->toArray())
 		->where('oo','[0-9]+');
 
-	Route::get('report/accounts',[ReportController::class,'accounts']);
-	Route::get('report/products',[ReportController::class,'products']);
+	Route::view('report/accounts','theme.backend.adminlte.account.report');
+	Route::view('report/products','theme.backend.adminlte.product.report');
 	Route::view('report/services','theme.backend.adminlte.service.report');
 
 	// Services