removed redundant code

Author: Godmartinz

app/Http/Controllers/Assets/AssetsController.php

@@ -505,30 +505,6 @@ public function getAssetByTag(Request $request, $tag=null) : RedirectResponse
 
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
     }
-    /**
-     * Searches the assets table by asset tag, and redirects if it finds one
-     *
-     * @author [A. Gianotto] [<[email protected]>]
-     * @since [v3.0]
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function getAssetTag(Request $request, $tag=null) : RedirectResponse
-    {
-        $tag = $tag ?: $request->get('assetTag');
-
-        // Search for an exact and unique asset tag match
-        $assets = Asset::where('asset_tag', '=', $tag);
-
-        // If not a unique result, redirect to the index view
-        if ($assets->count() != 1) {
-            return redirect()->route('hardware.index')
-                ->with('search', $tag)
-                ->with('warning', trans('admin/hardware/message.does_not_exist_var', [ 'asset_tag' => $tag ]));
-        }
-
-        return $assets->first()->asset_tag;
-    }
-
 
     /**
      * Return a QR code for the asset

app/View/Label.php

@@ -125,14 +125,13 @@ public function render(callable $callback = null)
                     if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
-                            case 'asset_tag' : $barcode2DTarget = route('assetTag', $asset->asset_tag); break;
+                            case 'asset_tag' : $barcode2DTarget = basename(route('ht/assetTag', $asset->asset_tag)); break;
                             case 'hardware_id':
                             default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
                         }
-
                         $assetData->put('barcode2d', (object)[
                             'type' => $barcode2DType,
-                            'content' => basename($barcode2DTarget),
+                            'content' => $barcode2DTarget,
                         ]);
                     }
                 }

routes/web/hardware.php

@@ -177,6 +177,3 @@ function () {
 Route::get('ht/{any?}',
     [AssetsController::class, 'getAssetByTag']
 )->where('any', '.*')->name('ht/assetTag');
-Route::get('qr/{any?}',
-    [AssetsController::class, 'getAssetTag']
-)->where('any', '.*')->name('assetTag');