bulk actions are handled before sorting

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -50,7 +50,6 @@ class BulkAssetsController extends Controller
         }
 
         $asset_ids = $request->input('ids');
-
         // Figure out where we need to send the user after the update is complete, and store that in the session
         $bulk_back_url = request()->headers->get('referer');
         session(['bulk_back_url' => $bulk_back_url]);
@@ -93,41 +92,6 @@ class BulkAssetsController extends Controller
 
         $assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids);
 
-        switch ($sort_override) {
-            case 'model':
-                $assets->OrderModels($order);
-                break;
-            case 'model_number':
-                $assets->OrderModelNumber($order);
-                break;
-            case 'category':
-                $assets->OrderCategory($order);
-                break;
-            case 'manufacturer':
-                $assets->OrderManufacturer($order);
-                break;
-            case 'company':
-                $assets->OrderCompany($order);
-                break;
-            case 'location':
-                $assets->OrderLocation($order);
-            case 'rtd_location':
-                $assets->OrderRtdLocation($order);
-                break;
-            case 'status_label':
-                $assets->OrderStatus($order);
-                break;
-            case 'supplier':
-                $assets->OrderSupplier($order);
-                break;
-            case 'assigned_to':
-                $assets->OrderAssigned($order);
-                break;
-            default:
-                $assets->orderBy($column_sort, $order);
-                break;
-        }
-
         $assets = $assets->get();
 
         $models = $assets->unique('model_id');
@@ -135,10 +99,8 @@ class BulkAssetsController extends Controller
         foreach($models as $model) {
             $modelNames[] = $model->model->name;
         }
-
         if ($request->filled('bulk_actions')) {
 
-
             switch ($request->input('bulk_actions')) {
                 case 'labels':
                     $this->authorize('view', Asset::class);
@@ -175,6 +137,43 @@ class BulkAssetsController extends Controller
                         ->with('modelNames', $modelNames);
             }
         }
+        switch ($sort_override) {
+            case 'model':
+                $assets->OrderModels($order);
+                break;
+            case 'model_number':
+                $assets->OrderModelNumber($order);
+                break;
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
+                break;
+            case 'company':
+                $assets->OrderCompany($order);
+                break;
+            case 'location':
+                $assets->OrderLocation($order);
+            case 'rtd_location':
+                $assets->OrderRtdLocation($order);
+                break;
+            case 'status_label':
+                $assets->OrderStatus($order);
+                break;
+            case 'supplier':
+                $assets->OrderSupplier($order);
+                break;
+            case 'assigned_to':
+                $assets->OrderAssigned($order);
+                break;
+            default:
+                $assets->orderBy($column_sort, $order);
+                break;
+        }
+
+
+
 
         return redirect()->back()->with('error', 'No action selected');
     }

app/Models/Labels/DefaultLabel.php

@@ -163,6 +163,7 @@ class DefaultLabel extends RectangleSheet
         // Fields
         $fieldsDone = 0;
         if ($fieldsDone < $this->getSupportFields()) {
+//            dd($record->get('fields'));
             foreach ($record->get('fields') as $field) {
                 static::writeText(
                     $pdf, $field['label'][0]. ': ' . $field['value'],

app/View/Label.php

@@ -126,7 +126,7 @@ class Label implements View
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
                             case 'hardware_id':
-                            default: $barcode2DTarget = route('hardware.show', $asset->id); break;
+                            default: $barcode2DTarget = route('hardware.show',['hardware' => $asset->id]); break;
                         }
                         $assetData->put('barcode2d', (object)[
                             'type' => $barcode2DType,