Merging master down into develop

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/Assets/AssetsController.php

@@ -235,6 +235,7 @@ class AssetsController extends Controller
             ->with('statuslabel_types', Helper::statusTypeList());
     }
 
+
     /**
      * Returns a view that presents information about an asset for detail view.
      *
@@ -309,6 +310,7 @@ class AssetsController extends Controller
             $asset->location_id = $request->input('rtd_location_id', null);
         }
 
+
         if ($request->filled('image_delete')) {
             try {
                 unlink(public_path().'/uploads/assets/'.$asset->image);
@@ -401,6 +403,24 @@ class AssetsController extends Controller
         return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
     }
 
+    /**
+     * Searches the assets table by serial, and redirects if it finds one
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function getAssetBySerial(Request $request)
+    {
+        $topsearch = ($request->get('topsearch')=="true");
+
+        if (!$asset = Asset::where('serial', '=', $request->get('serial'))->first()) {
+            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+        $this->authorize('view', $asset);
+        return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
+    }
+
     /**
      * Searches the assets table by asset tag, and redirects if it finds one
      *
@@ -420,6 +440,7 @@ class AssetsController extends Controller
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
     }
 
+
     /**
      * Return a QR code for the asset
      *
@@ -792,6 +813,7 @@ class AssetsController extends Controller
         return view('hardware/audit-overdue');
     }
 
+
     public function auditStore(Request $request, $id)
     {
         $this->authorize('audit', Asset::class);
@@ -822,6 +844,7 @@ class AssetsController extends Controller
             $asset->location_id = $request->input('location_id');
         }
 
+
         if ($asset->save()) {
             $file_name = '';
             // Upload an image, if attached