From d78262f52b3b1183475a8f0a8d144e275b2bd780 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 6 Mar 2024 14:48:47 -0800
Subject: [PATCH] resolved merge conflicts

---
 .../Assets/BulkAssetsController.php           | 72 ++++++++++---------
 app/View/Label.php                            |  4 +-
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 1b7f56641..51892e425 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -50,6 +50,7 @@ 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]);
@@ -92,41 +93,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');
@@ -137,6 +103,7 @@ class BulkAssetsController extends Controller
 
         if ($request->filled('bulk_actions')) {
 
+
             switch ($request->input('bulk_actions')) {
                 case 'labels':
                     $this->authorize('view', Asset::class);
@@ -174,6 +141,41 @@ class BulkAssetsController extends Controller
             }
         }
 
+        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');
     }
 
diff --git a/app/View/Label.php b/app/View/Label.php
index e6521c000..b52861d44 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -72,6 +72,7 @@ class Label implements View
         $fieldDefinitions = collect(explode(';', $settings->label2_fields))
             ->filter(fn($fieldString) => !empty($fieldString))
             ->map(fn($fieldString) => Field::fromString($fieldString));
+
         // Prepare data
         $data = $assets
             ->map(function ($asset) use ($template, $settings, $fieldDefinitions) {
@@ -126,7 +127,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',['hardware' => $asset->id]); break;
+                            default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
                         }
                         $assetData->put('barcode2d', (object)[
                             'type' => $barcode2DType,
@@ -146,6 +147,7 @@ class Label implements View
 
                         return $toAdd ? $myFields->push($toAdd) : $myFields;
                     }, new Collection());
+
                 $assetData->put('fields', $fields->take($template->getSupportFields()));
 
                 return $assetData;