From c9f0f5fe8b428e6c4955fc4a8f621f6438e778c0 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Tue, 24 Jan 2023 17:35:44 -0800
Subject: [PATCH 1/2] Change Accessories report to use server-side pagination
 from URL

---
 app/Http/Controllers/ReportsController.php    |  3 +--
 resources/views/reports/accessories.blade.php | 21 ++++++-------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 6cf2091f60..399e99612c 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -51,9 +51,8 @@ class ReportsController extends Controller
     public function getAccessoryReport()
     {
         $this->authorize('reports.view');
-        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
 
-        return view('reports/accessories', compact('accessories'));
+        return view('reports/accessories');
     }
 
     /**
diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 49db62c7f6..44f90682ba 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -27,6 +27,7 @@
                                 data-sort-order="asc"
                                 id="accessoriesReport"
                                 class="table table-striped snipe-table"
+                                data-url="{{ route('api.accessories.index') }}"
                                 data-export-options='{
                         "fileName": "accessory-report-{{ date('Y-m-d') }}",
                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
@@ -34,27 +35,17 @@
 
                             <thead>
                             <tr>
-                                <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/table.title') }}</th>
-                                <th class="col-sm-1">{{ trans('general.model_no') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/general.total') }}</th>
-                                <th class="col-sm-1">{{ trans('admin/accessories/general.remaining') }}</th>
+                                <th class="col-sm-1" data-field="company">{{ trans('admin/companies/table.title') }}</th>
+                                <th class="col-sm-1" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
+                                <th class="col-sm-1" data-field="model_number">{{ trans('general.model_no') }}</th>
+                                <th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
+                                <th class="col-sm-1" data-field="remaining_qty">{{ trans('admin/accessories/general.remaining') }}</th>
                             </tr>
                             </thead>
                             <tbody>
-                            @foreach ($accessories as $accessory)
-                                <tr>
-                                    <td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td>
-                                    <td>{{ $accessory->name }}</td>
-                                    <td>{{ $accessory->model_number }}</td>
-                                    <td>{{ $accessory->qty }}</td>
-                                    <td>{{ $accessory->numRemaining() }}</td>
-                                </tr>
-                            @endforeach
                             </tbody>
                         </table>
 
-                        </table>
                     </div>
                 </div>
             </div>

From 4a54586690b2ef6340d780e4fdb6cdb7b5b5189f Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Thu, 26 Jan 2023 11:56:06 -0800
Subject: [PATCH 2/2] Add to Accessories#index an additional gate-check against
 reports.view

---
 app/Http/Controllers/Api/AccessoriesController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index a894dc3760..f822509680 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -26,7 +26,10 @@ class AccessoriesController extends Controller
      */
     public function index(Request $request)
     {
-        $this->authorize('view', Accessory::class);
+        if ($request->user()->cannot('reports.view')) {
+            $this->authorize('view', Accessory::class);
+        }
+
 
         // This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations
         // Relations will be handled in query scopes a little further down.