From 7b29ddd283b41152e4356d8e82742806581d43ca Mon Sep 17 00:00:00 2001
From: Cram42 <grant.leroux+github@gmail.com>
Date: Tue, 1 Nov 2022 20:02:12 +0800
Subject: [PATCH] Tie into tag generation

---
 app/Http/Controllers/Assets/AssetsController.php     | 9 ++++++---
 app/Http/Controllers/Assets/BulkAssetsController.php | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index b0fde82c5e..545d874d4b 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -13,6 +13,7 @@ use App\Models\Company;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
+use App\View\Label;
 use Auth;
 use Carbon\Carbon;
 use DB;
@@ -441,11 +442,12 @@ class AssetsController extends Controller
      * @since [v3.0]
      * @return Redirect
      */
-    public function getAssetByTag(Request $request)
+    public function getAssetByTag($tag=null, Request $request)
     {
+        $tag = $tag ? $tag : $request->get('assetTag');
         $topsearch = ($request->get('topsearch') == 'true');
 
-        if (! $asset = Asset::where('asset_tag', '=', $request->get('assetTag'))->first()) {
+        if (! $asset = Asset::where('asset_tag', '=', $tag)->first()) {
             return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
         }
         $this->authorize('view', $asset);
@@ -542,9 +544,10 @@ class AssetsController extends Controller
             $asset = Asset::find($assetId);
             $this->authorize('view', $asset);
 
-            return view('hardware/labels')
+            return (new Label())
                 ->with('assets', collect([ $asset ]))
                 ->with('settings', Setting::getSettings())
+                ->with('offset', request()->get('offset'))
                 ->with('bulkedit', false)
                 ->with('count', 0);
         }
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index ca48d91f43..b9a3a39cf5 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Setting;
+use App\View\Label;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -44,7 +45,7 @@ class BulkAssetsController extends Controller
         if ($request->filled('bulk_actions')) {
             switch ($request->input('bulk_actions')) {
                 case 'labels':
-                    return view('hardware/labels')
+                    return (new Label)
                         ->with('assets', Asset::find($asset_ids))
                         ->with('settings', Setting::getSettings())
                         ->with('bulkedit', true)