Merge remote-tracking branch 'origin/develop'

* Prevent multiple checkouts of the same asset.

This adds a new method to the Asset model, availableForCheckout.
Port getDataTable to use availableForCheckout instead of doing the
check manually.

Fixes Issue #2347

* Use availableForCheckout in categories controller.  Also gate the checkin/checkout actions here.

* Use gate and availableForCheckout in manufactuers as well.

.gitignore

@@ -15,6 +15,7 @@ Homestead.yaml
 output
 phpDocumentor.phar
 public/uploads/*.gif
+public/uploads/barcodes/*.png
 public/uploads/*.jpg
 public/uploads/*.png
 public/uploads/*.svg

app/Console/Commands/ObjectImportCommand.php

@@ -660,7 +660,12 @@ class ObjectImportCommand extends Command
             $last_name = $user_email_array['last_name'];
 
             if ($user_email=='') {
-                $user_email = $user_email_array['username'].'@'.Setting::getSettings()->email_domain;
+                if (Setting::getSettings()->email_domain) {
+                    $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
+                } else {
+                    $user_email = '';
+                }
+
             }
 
             if ($user_username=='') {

app/Helpers/Helper.php

@@ -429,4 +429,42 @@ class Helper
         }
     }
 
+
+    /**
+     * Check to see if the given key exists in the array, and trim excess white space before returning it
+     *
+     * @author Daniel Melzter
+     * @since 3.0
+     * @param $array array
+     * @param $key string
+     * @param $default string
+     * @return string
+     */
+    public static function array_smart_fetch(array $array, $key, $default = '')
+    {
+       array_change_key_case($array, CASE_LOWER);
+        return array_key_exists(strtolower($key), array_change_key_case($array)) ? e(trim($array[ $key ])) : $default;
+    }
+
+    /**
+     * Check to see if the given key exists in the array, and trim excess white space before returning it
+     *
+     * @author A. Gianotto
+     * @since 3.2
+     * @param $array array
+     * @return string
+     */
+    public static function getLastDateFromHistoryArray(array $array)
+    {
+        foreach ($array as $key => $value) {
+//            echo '<pre>';
+//            echo 'last:'.$key;
+//            print_r($array);
+//            echo '</pre>';
+        }
+    }
+
+
+
+
 }

app/Http/Controllers/AccessoriesController.php

@@ -19,6 +19,7 @@ use Str;
 use View;
 use Auth;
 use Request;
+use Gate;
 
 /** This controller handles all actions related to Accessories for
  * the Snipe-IT Asset Management application.
@@ -591,7 +592,21 @@ class AccessoriesController extends Controller
         $rows = array();
 
         foreach ($accessories as $accessory) {
-            $actions = '<nobr><a href="'.route('checkout/accessory', $accessory->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($accessory->numRemaining() > 0 ) ? '' : ' disabled').'>'.trans('general.checkout').'</a><a href="'.route('update/accessory', $accessory->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $accessory->id).'" data-content="'.trans('admin/accessories/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($accessory->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
+
+            $actions = '<nobr>';
+            if (Gate::allows('accessories.checkout')) {
+                $actions .= '<a href="' . route('checkout/accessory',
+                        $accessory->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($accessory->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+            if (Gate::allows('accessories.edit')) {
+                $actions .= '<a href="' . route('update/accessory',
+                        $accessory->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('accessories.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/accessory',
+                        $accessory->id) . '" data-content="' . trans('admin/accessories/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($accessory->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .= '</nobr>';
             $company = $accessory->company;
 
             $rows[] = array(
@@ -654,10 +669,20 @@ class AccessoriesController extends Controller
         $rows = array();
 
         foreach ($accessory_users as $user) {
-            $actions = '<a href="'.route('checkin/accessory', $user->pivot->id).'" class="btn btn-info btn-sm">Checkin</a>';
+            $actions = '';
+            if (Gate::allows('accessories.checkin')) {
+                $actions .= '<a href="' . route('checkin/accessory',
+                        $user->pivot->id) . '" class="btn btn-info btn-sm">Checkin</a>';
+            }
+
+            if (Gate::allows('users.view')) {
+                $name = (string) link_to('/admin/users/'.$user->id.'/view', e($user->fullName()));
+            } else {
+                $name = e($user->fullName());
+            }
 
             $rows[] = array(
-              'name'          =>(string) link_to('/admin/users/'.$user->id.'/view', e($user->fullName())),
+              'name'          => $name,
               'actions'       => $actions
               );
         }

app/Http/Controllers/AssetMaintenancesController.php

@@ -309,7 +309,7 @@ class AssetMaintenancesController extends Controller
                                     '' => 'Select an improvement type',
                                 ] + AssetMaintenance::getImprovementOptions();
 
-        $assets = Company::scopeCompanyables(Asset::all(), 'assets.company_id')->lists('detailed_name', 'id');
+        $assets = Company::scopeCompanyables(Asset::with('model','assignedUser')->get(), 'assets.company_id')->lists('detailed_name', 'id');
         // Get Supplier List
         $supplier_list = Helper::suppliersList();
 

app/Http/Controllers/AssetsController.php

@@ -23,6 +23,7 @@ use Validator;
 use Artisan;
 use Auth;
 use Config;
+use League\Csv\Reader;
 use DB;
 use Image;
 use Input;
@@ -40,6 +41,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use TCPDF;
 use View;
 use Carbon\Carbon;
+use Gate;
 
 /**
  * This class controls all actions related to assets for
@@ -238,7 +240,7 @@ class AssetsController extends Controller
                     $constraint->upsize();
                 })->save($path);
                 $asset->image = $file_name;
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 \Input::flash();
                 $messageBag = new \Illuminate\Support\MessageBag();
                 $messageBag->add('image', $e->getMessage());
@@ -264,13 +266,8 @@ class AssetsController extends Controller
         if ($asset->save()) {
 
             if (Input::get('assigned_to')!='') {
-                    $logaction = new Actionlog();
-                    $logaction->asset_id = $asset->id;
-                    $logaction->checkedout_to = $asset->assigned_to;
-                    $logaction->asset_type = 'hardware';
-                    $logaction->user_id = Auth::user()->id;
-                    $logaction->note = e(Input::get('note'));
-                    $log = $logaction->logaction('checkout');
+                $user = User::find(e(Input::get('assigned_to')));
+                $asset->checkOutToUser($user, Auth::user(), date('Y-m-d h:i:s'), '', 'Checked out on asset creation', e(Input::get('name')));
             }
             // Redirect to the asset listing page
             \Session::flash('success', trans('admin/hardware/message.create.success'));
@@ -357,7 +354,7 @@ class AssetsController extends Controller
         }
 
         if ($request->has('purchase_cost')) {
-            $asset->purchase_cost = e($request->input('purchase_cost'));
+            $asset->purchase_cost = e(number_format($request->input('purchase_cost'), 2, '.', ''));
         } else {
             $asset->purchase_cost =  null;
         }
@@ -421,7 +418,7 @@ class AssetsController extends Controller
                     $constraint->upsize();
                 })->save($path);
                 $asset->image = $file_name;
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 \Input::flash();
                 $messageBag = new \Illuminate\Support\MessageBag();
                 $messageBag->add('image', $e->getMessage());
@@ -533,6 +530,8 @@ class AssetsController extends Controller
             return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
         } elseif (!Company::isCurrentUserHasAccess($asset)) {
             return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
+        } elseif (!$asset->availableForCheckout()) {
+            return redirect()->to('hardware')->with('error', trans('admin/hardware/message.checkout.not_available'));
         }
 
         $user = User::find(e(Input::get('assigned_to')));
@@ -761,14 +760,20 @@ class AssetsController extends Controller
         if ($settings->qr_code == '1') {
             $asset = Asset::find($assetId);
             $size = Helper::barcodeDimensions($settings->barcode_type);
-
-
+            $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'.png';
 
             if (isset($asset->id,$asset->asset_tag)) {
-                $barcode = new \Com\Tecnick\Barcode\Barcode();
-                $barcode_obj =  $barcode->getBarcodeObj($settings->barcode_type, route('view/hardware', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2));
 
-                return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+                if (file_exists($qr_file)) {
+                    $header = ['Content-type' => 'image/png'];
+                    return response()->file($qr_file, $header);
+                } else {
+                    $barcode = new \Com\Tecnick\Barcode\Barcode();
+                    $barcode_obj =  $barcode->getBarcodeObj($settings->barcode_type, route('view/hardware', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2));
+                    file_put_contents($qr_file, $barcode_obj->getPngData());
+                    return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+                }
+
             }
         }
 
@@ -788,12 +793,20 @@ class AssetsController extends Controller
 
         $settings = Setting::getSettings();
         $asset = Asset::find($assetId);
+        $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';
 
 
         if (isset($asset->id,$asset->asset_tag)) {
-            $barcode = new \Com\Tecnick\Barcode\Barcode();
-            $barcode_obj =  $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, 250, 20);
-            return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+
+            if (file_exists($barcode_file)) {
+                $header = ['Content-type' => 'image/png'];
+                return response()->file($barcode_file, $header);
+            } else {
+                $barcode = new \Com\Tecnick\Barcode\Barcode();
+                $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, 250, 20);
+                file_put_contents($barcode_file, $barcode_obj->getPngData());
+                return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
+            }
         }
 
     }
@@ -879,11 +892,11 @@ class AssetsController extends Controller
                 try {
                     $file->move($path, $date.'-'.$fixed_filename);
                 } catch (\Symfony\Component\HttpFoundation\File\Exception\FileException $exception) {
-                        $results['error']=trans('admin/hardware/message.upload.error');
-                        if( config('app.debug')) {
-                            $results['error'].= ' ' . $exception->getMessage();
-                        }
-                        return $results;
+                    $results['error']=trans('admin/hardware/message.upload.error');
+                    if (config('app.debug')) {
+                        $results['error'].= ' ' . $exception->getMessage();
+                    }
+                    return $results;
                 }
                 $name = date('Y-m-d-his').'-'.$fixed_filename;
                 $filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
@@ -994,6 +1007,171 @@ class AssetsController extends Controller
     }
 
 
+    /**
+     * Return history import view
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getImportHistory()
+    {
+
+        return View::make('hardware/history');
+    }
+
+    /**
+     * Import history
+     *
+     * This needs a LOT of love. It's done very inelegantly right now, and there are
+     * a ton of optimizations that could (and should) be done.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.3]
+     * @return View
+     */
+    public function postImportHistory(Request $request)
+    {
+
+        if (!ini_get("auto_detect_line_endings")) {
+            ini_set("auto_detect_line_endings", '1');
+        }
+
+        $assets = Asset::all(['asset_tag']);
+
+        $csv = Reader::createFromPath(Input::file('user_import_csv'));
+        $csv->setNewline("\r\n");
+        //get the first row, usually the CSV header
+        //$headers = $csv->fetchOne();
+
+        $results = $csv->fetchAssoc();
+        $item = array();
+        $status = array();
+
+
+        foreach($results as $row) {
+
+            if (is_array($row)) {
+
+                $row = array_change_key_case($row, CASE_LOWER);
+                $asset_tag = Helper::array_smart_fetch($row, "asset tag");
+                if (!array_key_exists($asset_tag, $item)) {
+                    $item[$asset_tag] = array();
+                }
+                $batch_counter = count($item[$asset_tag]);
+
+                $item[$asset_tag][$batch_counter]['checkout_date'] = Carbon::parse(Helper::array_smart_fetch($row, "date"))->format('Y-m-d H:i:s');
+
+                $item[$asset_tag][$batch_counter]['asset_tag'] = Helper::array_smart_fetch($row, "asset tag");
+                $item[$asset_tag][$batch_counter]['name'] = Helper::array_smart_fetch($row, "name");
+                $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, "email");
+
+                $asset = Asset::where('asset_tag','=',$asset_tag)->first();
+                $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id;
+
+                $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format,$item[$asset_tag][$batch_counter]['name']);
+                $user = User::where('username','=',$base_username['username']);
+                $user_query = ' on username '.$base_username['username'];
+
+                if ($request->input('match_firstnamelastname')=='1') {
+                    $firstnamedotlastname = User::generateFormattedNameFromFullName('firstname.lastname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $firstnamedotlastname['username'];
+                    $user->orWhere('username','=',$firstnamedotlastname['username']);
+                    $user_query .= ', or on username '.$firstnamedotlastname['username'];
+                }
+
+                if ($request->input('match_flastname')=='1') {
+                    $flastname = User::generateFormattedNameFromFullName('filastname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $flastname['username'];
+                    $user->orWhere('username','=',$flastname['username']);
+                    $user_query .= ', or on username '.$flastname['username'];
+                }
+                if ($request->input('match_firstname')=='1') {
+                    $firstname = User::generateFormattedNameFromFullName('firstname',$item[$asset_tag][$batch_counter]['name']);
+                    $item[$asset_tag][$batch_counter]['username'][] = $firstname['username'];
+                    $user->orWhere('username','=',$firstname['username']);
+                    $user_query .= ', or on username '.$firstname['username'];
+                }
+                if ($request->input('match_email')=='1') {
+                    if ($item[$asset_tag][$batch_counter]['email']=='') {
+                        $item[$asset_tag][$batch_counter]['username'][] = $user_email = User::generateEmailFromFullName($item[$asset_tag][$batch_counter]['name']);
+                        $user->orWhere('username','=',$user_email);
+                        $user_query .= ', or on username '.$user_email;
+                    }
+                }
+
+                // A matching user was found
+                if ($user = $user->first()) {
+                    $item[$asset_tag][$batch_counter]['checkedout_to'] = $user->id;
+
+                    $status['success'][] = 'Found user '.Helper::array_smart_fetch($row, "name").$user_query;
+
+                    if ($asset) {
+
+                        $item[$asset_tag][$batch_counter]['user_id'] = $user->id;
+
+                        Actionlog::firstOrCreate(array(
+                            'asset_id' => $asset->id,
+                            'asset_type' => 'hardware',
+                            'user_id' =>  Auth::user()->id,
+                            'note' => 'Checkout imported by '.Auth::user()->fullName().' from history importer',
+                            'checkedout_to' => $item[$asset_tag][$batch_counter]['user_id'],
+                            'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
+                            'action_type'   => 'checkout'
+                            )
+                        );
+
+                        $asset->assigned_to = $user->id;
+                        $asset->save();
+
+                    } else {
+                        $status['error'][] = 'Asset does not exist so no checkin log was created.';
+                    }
+
+
+                } else {
+                    $item[$asset_tag][$batch_counter]['checkedout_to'] = null;
+                    $status['error'][] = 'No matching user for '.Helper::array_smart_fetch($row, "name");
+                }
+
+            }
+        }
+
+        // Loop through and backfill the checkins
+        foreach ($item as $key => $asset_batch) {
+            $total_in_batch = count($asset_batch);
+            for($x = 0; $x < $total_in_batch; $x++) {
+                $next = $x + 1;
+
+                // Only do this if a matching user was found
+                if ($asset_batch[$x]['checkedout_to']!='') {
+
+                    if (($total_in_batch > 1) && ($x < $total_in_batch) && (array_key_exists($next,$asset_batch))) {
+                        $checkin_date = Carbon::parse($asset_batch[$next]['checkout_date'])->subDay(1)->format('Y-m-d H:i:s');
+                        $asset_batch[$x]['real_checkin'] = $checkin_date;
+
+                        Actionlog::firstOrCreate(array(
+                                'asset_id' => $asset_batch[$x]['asset_id'],
+                                'asset_type' => 'hardware',
+                                'user_id' => Auth::user()->id,
+                                'note' => 'Checkin imported by ' . Auth::user()->fullName() . ' from history importer',
+                                'checkedout_to' => null,
+                                'created_at' => $checkin_date,
+                                'action_type' => 'checkin'
+                            )
+                        );
+                    }
+                }
+
+
+            }
+        }
+
+
+        return View::make('hardware/history')->with('status',$status);
+    }
+
+
     /**
     * Retore a deleted asset.
     *
@@ -1533,19 +1711,40 @@ class AssetsController extends Controller
             $inout = '';
             $actions = '';
             if ($asset->deleted_at=='') {
-                $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm" title="Edit asset" data-toggle="tooltip"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.trans('admin/hardware/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+                if (Gate::allows('assets.create')) {
+                    $actions = '<div style=" white-space: nowrap;"><a href="' . route('clone/hardware',
+                            $asset->id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"><i class="fa fa-clone"></i>';
+                }
+                if (Gate::allows('assets.edit')) {
+                    $actions .= '</a> <a href="' . route('update/hardware',
+                            $asset->id) . '" class="btn btn-warning btn-sm" title="Edit asset" data-toggle="tooltip"><i class="fa fa-pencil icon-white"></i></a> ';
+                }
+                if (Gate::allows('assets.delete')) {
+                    $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/hardware',
+                            $asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
+                }
             } elseif ($asset->model->deleted_at=='') {
                 $actions = '<a href="'.route('restore/hardware', $asset->id).'" title="Restore asset" data-toggle="tooltip" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
             }
 
-            if ($asset->assetstatus) {
-                if (($asset->assetstatus->deployable != 0) && ($asset->deleted_at=='')) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">'.trans('general.checkin').'</a>';
-                    } else {
-                        $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">'.trans('general.checkout').'</a>';
-                    }
+            if (($asset->availableForCheckout()))
+            {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="' . route('checkout/hardware',
+                            $asset->id) . '" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">' . trans('general.checkout') . '</a>';
                 }
+
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="' . route('checkin/hardware',
+                            $asset->id) . '" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">' . trans('general.checkin') . '</a>';
+                }
+            }
+
+            // Lots going on here.  Importer has parsed numbers before importing, so we need to check and see if it's a number before trying to parse.
+            $purchase_cost = $asset->purchase_cost ?: '';
+            if (is_numeric($purchase_cost)) {
+                $purchase_cost = number_format($purchase_cost, 2);
             }
 
             $row = array(
@@ -1563,7 +1762,7 @@ class AssetsController extends Controller
             'category'      => (($asset->model) && ($asset->model->category)) ?(string)link_to('/admin/settings/categories/'.$asset->model->category->id.'/view', e($asset->model->category->name)) : '',
             'manufacturer'      => (($asset->model) && ($asset->model->manufacturer)) ? (string)link_to('/admin/settings/manufacturers/'.$asset->model->manufacturer->id.'/view', e($asset->model->manufacturer->name)) : '',
             'eol'           => ($asset->eol_date()) ? $asset->eol_date() : '',
-            'purchase_cost'           => ($asset->purchase_cost) ? number_format($asset->purchase_cost, 2) : '',
+            'purchase_cost'           => $purchase_cost,
             'purchase_date'           => ($asset->purchase_date) ? $asset->purchase_date : '',
             'notes'         => e($asset->notes),
             'order_number'  => ($asset->order_number!='') ? '<a href="'.config('app.url').'/hardware?order_number='.e($asset->order_number).'">'.e($asset->order_number).'</a>' : '',

app/Http/Controllers/Auth/AuthController.php

@@ -108,7 +108,7 @@ class AuthController extends Controller
                         LOG::debug("Creating local user ".Input::get('username'));
 
                         if ($newuser = Ldap::createUserFromLdap($userattr)) {
-                            LOG::debug("Local user created..");
+                            LOG::debug("Local user created.");
                         } else {
                             LOG::debug("Could not create local user.");
                         }
@@ -131,12 +131,21 @@ class AuthController extends Controller
 
                     LOG::debug("Valid LDAP login. Updating the local data.");
 
-                    $user->password = bcrypt($request->input('password'));
+                    if (Setting::getSettings()->ldap_pw_sync=='1') {
+                        $user->password = bcrypt($request->input('password'));
+                    }
+
                     $user->email = $ldap_attr['email'];
                     $user->first_name = $ldap_attr['firstname'];
                     $user->last_name = $ldap_attr['lastname'];
                     $user->save();
 
+                    if (Setting::getSettings()->ldap_pw_sync!='1') {
+                        Auth::login($user, true);
+                        // Redirect to the users page
+                        return redirect()->to('/home')->with('success', trans('auth/message.signin.success'));
+                    }
+
                 } else {
                     LOG::debug("User ".Input::get('username')." did not authenticate correctly against LDAP. Local user was not updated.");
                 }// End LDAP auth
@@ -146,14 +155,17 @@ class AuthController extends Controller
         // NO LDAP enabled - just try to login the user normally
         }
 
+
         LOG::debug("Authenticating user against database.");
         // Try to log the user in
         if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {
             LOG::debug("Local authentication failed.");
-          // throw new Cartalyst\Sentry\Users\UserNotFoundException();
+            // throw new Cartalyst\Sentry\Users\UserNotFoundException();
             return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
         }
 
+
+
         // Get the page we were before
         $redirect = \Session::get('loginRedirect', 'home');
 

app/Http/Controllers/CategoriesController.php

@@ -1,13 +1,14 @@
 <?php
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Helpers\Helper;
 use App\Models\Category as Category;
 use App\Models\Company;
 use App\Models\Setting;
 use Auth;
 use DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Input;
 use Lang;
 use Redirect;
@@ -344,13 +345,13 @@ class CategoriesController extends Controller
                 $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
             }
 
-            if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                    } else {
-                        $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                    }
+            if ($asset->availableForCheckout()) {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
+                }
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
                 }
             }
 

app/Http/Controllers/ComponentsController.php

@@ -20,6 +20,7 @@ use Str;
 use View;
 use Validator;
 use Illuminate\Http\Request;
+use Gate;
 
 /**
  * This class controls all actions related to Components for
@@ -454,7 +455,23 @@ class ComponentsController extends Controller
         $rows = array();
 
         foreach ($components as $component) {
-            $actions = '<nobr><a href="'.route('checkout/component', $component->id).'" style="margin-right:5px;" class="btn btn-info btn-sm '.(($component->numRemaining() > 0 ) ? '' : ' disabled').'" '.(($component->numRemaining() > 0 ) ? '' : ' disabled').'>'.trans('general.checkout').'</a><a href="'.route('update/component', $component->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/component', $component->id).'" data-content="'.trans('admin/components/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($component->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
+            $actions = '<nobr>';
+            if (Gate::allows('components.checkout')) {
+                $actions .= '<a href="' . route('checkout/component',
+                        $component->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '" ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+
+            if (Gate::allows('components.edit')) {
+                $actions .= '<a href="' . route('update/component',
+                        $component->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+
+            if (Gate::allows('components.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/component',
+                        $component->id) . '" data-content="' . trans('admin/components/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($component->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+
+            $actions .='</nobr>';
             $company = $component->company;
 
             $rows[] = array(

app/Http/Controllers/ConsumablesController.php

@@ -18,6 +18,7 @@ use Redirect;
 use Slack;
 use Str;
 use View;
+use Gate;
 
 /**
  * This controller handles all actions related to Consumables for
@@ -444,7 +445,23 @@ class ConsumablesController extends Controller
         $rows = array();
 
         foreach ($consumables as $consumable) {
-            $actions = '<nobr><a href="'.route('checkout/consumable', $consumable->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($consumable->numRemaining() > 0 ) ? '' : ' disabled').'>'.trans('general.checkout').'</a><a href="'.route('update/consumable', $consumable->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $consumable->id).'" data-content="'.trans('admin/consumables/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($consumable->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></nobr>';
+            $actions = '<nobr>';
+            if (Gate::allows('consumables.checkout')) {
+                $actions .= '<a href="' . route('checkout/consumable',
+                        $consumable->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm" ' . (($consumable->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
+            }
+
+            if (Gate::allows('consumables.edit')) {
+                $actions .= '<a href="' . route('update/consumable',
+                        $consumable->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('consumables.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/consumable',
+                        $consumable->id) . '" data-content="' . trans('admin/consumables/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($consumable->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+
+            $actions .='</nobr>';
+
             $company = $consumable->company;
 
             $rows[] = array(

app/Http/Controllers/LicensesController.php

@@ -23,6 +23,7 @@ use Config;
 use Session;
 use App\Helpers\Helper;
 use Auth;
+use Gate;
 
 /**
  * This controller handles all actions related to Licenses for
@@ -983,7 +984,26 @@ class LicensesController extends Controller
         $rows = array();
 
         foreach ($licenses as $license) {
-            $actions = '<span style="white-space: nowrap;"><a href="'.route('freecheckout/license', $license->id).'" class="btn btn-primary btn-sm'.(($license->remaincount() > 0) ? '' : ' disabled').'" style="margin-right:5px;">'.trans('general.checkout').'</a> <a href="'.route('clone/license', $license->id).'" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a><a href="'.route('update/license', $license->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/license', $license->id).'" data-content="'.trans('admin/licenses/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($license->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></span>';
+            $actions = '<span style="white-space: nowrap;">';
+
+            if (Gate::allows('licenses.checkout')) {
+                $actions .= '<a href="' . route('freecheckout/license',
+                        $license->id) . '" class="btn btn-primary btn-sm' . (($license->remaincount() > 0) ? '' : ' disabled') . '" style="margin-right:5px;">' . trans('general.checkout') . '</a> ';
+            }
+
+            if (Gate::allows('licenses.create')) {
+                $actions .= '<a href="' . route('clone/license',
+                        $license->id) . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+            }
+            if (Gate::allows('licenses.edit')) {
+                $actions .= '<a href="' . route('update/license',
+                        $license->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
+            }
+            if (Gate::allows('licenses.delete')) {
+                $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/license',
+                        $license->id) . '" data-content="' . trans('admin/licenses/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($license->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            }
+            $actions .='</span>';
 
             $rows[] = array(
                 'id'                => $license->id,

app/Http/Controllers/ManufacturersController.php

@@ -2,14 +2,15 @@
 namespace App\Http\Controllers;
 
 use App\Models\Company;
+use App\Models\Manufacturer;
+use App\Models\Setting;
+use Auth;
+use Illuminate\Support\Facades\Gate;
 use Input;
 use Lang;
-use App\Models\Manufacturer;
 use Redirect;
-use App\Models\Setting;
 use Str;
 use View;
-use Auth;
 
 /**
  * This controller handles all actions related to Manufacturers for
@@ -293,13 +294,13 @@ class ManufacturersController extends Controller
                 $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
             }
 
-            if ($asset->assetstatus) {
-                if ($asset->assetstatus->deployable != 0) {
-                    if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
-                        $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
-                    } else {
-                        $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
-                    }
+            if ($asset->availableForCheckout()) {
+                if (Gate::allows('assets.checkout')) {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.trans('general.checkout').'</a>';
+                }
+            } else {
+                if (Gate::allows('assets.checkin')) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.trans('general.checkin').'</a>';
                 }
             }
 

app/Http/Controllers/ReportsController.php

@@ -6,7 +6,6 @@ use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use Carbon\Carbon;
-use Category;
 use App\Models\Company;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Log;
@@ -17,6 +16,7 @@ use League\Csv\Reader;
 use App\Models\License;
 use App\Models\Location;
 use App\Models\AssetModel;
+use App\Models\CustomField;
 use Redirect;
 use App\Models\Setting;
 use App\Models\User;
@@ -415,8 +415,8 @@ class ReportsController extends Controller
     */
     public function getCustomReport()
     {
-
-        return View::make('reports/custom');
+        $customfields = CustomField::get();
+        return View::make('reports/custom')->with('customfields',$customfields);
     }
 
     /**
@@ -430,6 +430,7 @@ class ReportsController extends Controller
     public function postCustom()
     {
         $assets = Asset::orderBy('created_at', 'DESC')->get();
+        $customfields = CustomField::get();
 
         $rows   = [ ];
         $header = [ ];
@@ -471,6 +472,9 @@ class ReportsController extends Controller
         if (e(Input::get('assigned_to')) == '1') {
             $header[] = 'Assigned To';
         }
+        if (e(Input::get('username')) == '1') {
+            $header[] = 'Username';
+        }
         if (e(Input::get('status')) == '1') {
             $header[] = 'Status';
         }
@@ -484,6 +488,13 @@ class ReportsController extends Controller
             $header[] = 'Diff';
         }
 
+        foreach ($customfields as $customfield) {
+            if (e(Input::get($customfield->db_column_name())) == '1') {
+                $header[] = $customfield->name;
+            }
+        }
+
+
         $header = array_map('trim', $header);
         $rows[] = implode($header, ',');
 
@@ -562,6 +573,16 @@ class ReportsController extends Controller
                     $row[] = ''; // Empty string if unassigned
                 }
             }
+
+            if (e(Input::get('username')) == '1') {
+                if ($asset->assigned_to > 0) {
+                    $user  = User::find($asset->assigned_to);
+                    $row[] = '"' .e($user->username). '"';
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+
             if (e(Input::get('status')) == '1') {
                 if (( $asset->status_id == '0' ) && ( $asset->assigned_to == '0' )) {
                     $row[] = trans('general.ready_to_deploy');
@@ -588,6 +609,15 @@ class ReportsController extends Controller
                 $row[]        = '"' . number_format($depreciation, 2) . '"';
                 $row[]        = '"' . number_format($asset->purchase_cost - $depreciation, 2) . '"';
             }
+
+            foreach ($customfields as $customfield) {
+                $column_name = $customfield->db_column_name();
+                if (e(Input::get($customfield->db_column_name())) == '1') {
+                    $row[] = $asset->$column_name;
+                }
+            }
+
+
             $rows[] = implode($row, ',');
         }
 

app/Http/Controllers/SettingsController.php

@@ -417,6 +417,7 @@ class SettingsController extends Controller
         $setting->ad_domain = e(Input::get('ad_domain'));
         $setting->is_ad = e(Input::get('is_ad', '0'));
         $setting->ldap_tls = e(Input::get('ldap_tls', '0'));
+        $setting->ldap_pw_sync = e(Input::get('ldap_pw_sync', '0'));
 
         // If validation fails, we'll exit the operation now.
         if ($setting->save()) {

app/Http/Controllers/StatuslabelsController.php

@@ -47,23 +47,32 @@ class StatuslabelsController extends Controller
     {
         $colors = [];
 
-        $statuslabels = Statuslabel::get();
+        $statuslabels = Statuslabel::with('assets')->get();
         $labels=[];
         $points=[];
-
+        $colors=[];
         foreach ($statuslabels as $statuslabel) {
-            $labels[]=$statuslabel->name;
-            $points[]=$statuslabel->assets()->whereNull('assigned_to')->count();
+            if ($statuslabel->assets->count() > 0) {
+                $labels[]=$statuslabel->name;
+                $points[]=$statuslabel->assets()->whereNull('assigned_to')->count();
+                if ($statuslabel->color!='') {
+                    $colors[]=$statuslabel->color;
+                }
+            }
+
+
         }
         $labels[]='Deployed';
         $points[]=Asset::whereNotNull('assigned_to')->count();
 
+        $colors_array = array_merge($colors, Helper::chartColors());
+
         $result= [
             "labels" => $labels,
             "datasets" => [ [
                 "data" => $points,
-                "backgroundColor" => Helper::chartColors(),
-                "hoverBackgroundColor" =>  Helper::chartColors()
+                "backgroundColor" => $colors_array,
+                "hoverBackgroundColor" =>  $colors_array
             ]]
         ];
         return $result;
@@ -110,6 +119,7 @@ class StatuslabelsController extends Controller
         $statuslabel->deployable          =  $statustype['deployable'];
         $statuslabel->pending          =  $statustype['pending'];
         $statuslabel->archived          =  $statustype['archived'];
+        $statuslabel->color          =  e(Input::get('color'));
 
 
         // Was the asset created?
@@ -197,6 +207,7 @@ class StatuslabelsController extends Controller
         $statuslabel->deployable          =  $statustype['deployable'];
         $statuslabel->pending          =  $statustype['pending'];
         $statuslabel->archived          =  $statustype['archived'];
+        $statuslabel->color          =  e(Input::get('color'));
 
 
         // Was the asset created?
@@ -247,7 +258,7 @@ class StatuslabelsController extends Controller
 
     public function getDatatable()
     {
-        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived'))
+        $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color'))
         ->whereNull('deleted_at');
 
         if (Input::has('search')) {
@@ -291,10 +302,18 @@ class StatuslabelsController extends Controller
 
             $actions = '<a href="'.route('update/statuslabel', $statuslabel->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/statuslabel', $statuslabel->id).'" data-content="'.trans('admin/statuslabels/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($statuslabel->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
 
+            if ($statuslabel->color!='') {
+                $color = '<div class="pull-left" style="margin-right: 5px; height: 20px; width: 20px; background-color: '.e($statuslabel->color).'"></div>'.e($statuslabel->color);
+            } else {
+                $color = '';
+            }
+
+
             $rows[] = array(
                 'id'            => e($statuslabel->id),
                 'type'          => e($label_type),
                 'name'          => e($statuslabel->name),
+                'color'          => $color,
                 'actions'       => $actions
             );
         }

app/Http/Controllers/UsersController.php

@@ -876,7 +876,7 @@ class UsersController extends Controller
         }
 
         $users = User::select(array('users.id','users.employee_num','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at','users.activated'))
-        ->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company');
+        ->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle');
         $users = Company::scopeCompanyables($users);
 
         switch ($status) {
@@ -923,32 +923,39 @@ class UsersController extends Controller
                 $group_names .= '<a href="' . config('app.url') . '/admin/groups/' . $group->id . '/edit" class="label  label-default">' . $group->name . '</a> ';
             }
 
-            if (Gate::allows('users:edit')) {
-                if (!is_null($user->deleted_at)) {
 
-                    $actions .= '<a href="' . route('restore/user',
-                            $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
+                if (!is_null($user->deleted_at)) {
+                    if (Gate::allows('users.delete')) {
+                        $actions .= '<a href="' . route('restore/user',
+                                $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
+                    }
                 } else {
 
-                    if ($user->accountStatus() == 'suspended') {
-                        $actions .= '<a href="' . route('unsuspend/user',
-                                $user->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
+                    if (Gate::allows('users.delete')) {
+                        if ($user->accountStatus() == 'suspended') {
+                            $actions .= '<a href="' . route('unsuspend/user',
+                                    $user->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
+                        }
                     }
+                    if (Gate::allows('users.edit')) {
+                        $actions .= '<a href="' . route('update/user',
+                                $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
 
-                    $actions .= '<a href="' . route('update/user',
-                            $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
-
-                    $actions .= '<a href="' . route('clone/user',
-                            $user->id) . '" class="btn btn-info btn-sm"><i class="fa fa-clone"></i></a>';
-
-                    if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords'))) {
-                        $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user',
-                                $user->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($user->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+                        $actions .= '<a href="' . route('clone/user',
+                                $user->id) . '" class="btn btn-info btn-sm"><i class="fa fa-clone"></i></a>';
+                    }
+                    if (Gate::allows('users.delete')) {
+                        if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords'))) {
+                            $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user',
+                                    $user->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($user->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+                        } else {
+                            $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+                        }
                     } else {
-                        $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+                        $actions.='foo';
                     }
                 }
-            }
+
             $actions .= '</nobr>';
 
             $rows[] = array(
@@ -1142,7 +1149,6 @@ class UsersController extends Controller
 
     protected $ldapValidationRules = array(
         'firstname' => 'required|string|min:2',
-        'lastname' => 'required|string|min:2',
         'employee_number' => 'string',
         'username' => 'required|min:2|unique:users,username',
         'email' => 'email|unique:users,email',
@@ -1155,7 +1161,7 @@ class UsersController extends Controller
     * @since [v1.8]
     * @return Redirect
     */
-    public function postLDAP()
+    public function postLDAP(Request $request)
     {
         ini_set('max_execution_time', 600); //600 seconds = 10 minutes
         ini_set('memory_limit', '500M');
@@ -1168,9 +1174,6 @@ class UsersController extends Controller
         $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
         $ldap_result_email = Setting::getSettings()->ldap_email;
 
-
-        $location_id = e(Input::get('location_id'));
-
         try {
             $ldapconn = Ldap::connectToLdap();
         } catch (\Exception $e) {
@@ -1218,7 +1221,9 @@ class UsersController extends Controller
                 $user->email = e($item["email"]);
                 $user->employee_num = e($item["employee_number"]);
                 $user->activated = 1;
-                $user->location_id = e($location_id);
+                if ($request->input('location_id')!='') {
+                    $user->location_id = e($request->input('location_id'));
+                }
                 $user->notes = 'Imported from LDAP';
                 $user->ldap_import = 1;
 
@@ -1228,9 +1233,7 @@ class UsersController extends Controller
                     $item["note"] = $item["createorupdate"];
                     $item["status"]='success';
                 } else {
-                  //$errors_array = array($user->getErrors());
                     foreach ($user->getErrors()->getMessages() as $key => $err) {
-                      //echo $user->getErrors();
                         $errors .='<li>'.$err[0];
                     }
                     $item["note"] = $errors;

app/Http/Kernel.php

@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \MisterPhilip\MaintenanceMode\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\FrameGuard::class,

app/Http/Requests/AssetRequest.php

@@ -37,6 +37,7 @@ class AssetRequest extends Request
           'supplier_id'     => 'integer',
           'status'          => 'integer',
           'asset_tag'       => 'required',
+          'purchase_cost'   => 'numeric',
     
         ];
 

app/Http/routes.php

@@ -184,79 +184,138 @@ Route::group([ 'prefix' => 'api', 'middleware' => 'auth' ], function () {
 Route::group(
     [ 'prefix' => 'hardware',
     'middleware' => ['web',
-    'auth',
-    'authorize:assets.view']],
+    'auth']],
     function () {
 
+        Route::get('history', [
+            'as' => 'asset.import-history',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@getImportHistory'
+        ]);
+
+        Route::post('history', [
+            'as' => 'asset.process-import-history',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@postImportHistory'
+        ]);
+
+
         Route::get('create/{model?}', [
                 'as'   => 'create/hardware',
+                'middleware' => 'authorize:assets.create',
                 'uses' => 'AssetsController@getCreate'
             ]);
 
         Route::post('create', [
                 'as'   => 'savenew/hardware',
+                'middleware' => 'authorize:assets.create',
                 'uses' => 'AssetsController@postCreate'
             ]);
 
         Route::get('{assetId}/edit', [
                 'as'   => 'update/hardware',
+                'middleware' => 'authorize:assets.edit',
                 'uses' => 'AssetsController@getEdit'
             ]);
         Route::get('/bytag', [
             'as'   => 'findbytag/hardware',
+            'middleware' => 'authorize:assets.view',
             'uses' => 'AssetsController@getAssetByTag'
         ]);
 
-        Route::get('{assetId}/clone', [ 'as' => 'clone/hardware', 'uses' => 'AssetsController@getClone' ]);
+        Route::get('{assetId}/clone', [
+            'as' => 'clone/hardware',
+            'middleware' => 'authorize:assets.create',
+            'uses' => 'AssetsController@getClone'
+        ]);
+
         Route::post('{assetId}/clone', 'AssetsController@postCreate');
-        Route::get('{assetId}/delete', [ 'as' => 'delete/hardware', 'uses' => 'AssetsController@getDelete' ]);
-        Route::get(
-            '{assetId}/checkout',
-            [ 'as' => 'checkout/hardware', 'uses' => 'AssetsController@getCheckout' ]
-        );
-        Route::post('{assetId}/checkout', 'AssetsController@postCheckout');
-        Route::get(
-            '{assetId}/checkin/{backto?}',
-            [ 'as' => 'checkin/hardware', 'uses' => 'AssetsController@getCheckin' ]
-        );
-        Route::post('{assetId}/checkin/{backto?}', 'AssetsController@postCheckin');
-        Route::get('{assetId}/view', [ 'as' => 'view/hardware', 'uses' => 'AssetsController@getView' ]);
+        Route::get('{assetId}/delete', [
+            'as' => 'delete/hardware',
+            'middleware' => 'authorize:assets.delete',
+            'uses' => 'AssetsController@getDelete'
+        ]);
+        Route::get('{assetId}/checkout', [
+            'as' => 'checkout/hardware',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@getCheckout'
+        ]);
+        Route::post('{assetId}/checkout', [
+            'as' => 'checkout/hardware',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@postCheckout'
+        ]);
+        Route::get('{assetId}/checkin/{backto?}', [
+            'as' => 'checkin/hardware',
+            'middleware' => 'authorize:assets.checkin',
+            'uses' => 'AssetsController@getCheckin'
+        ]);
+
+        Route::post('{assetId}/checkin/{backto?}', [
+            'as' => 'checkin/hardware',
+            'middleware' => 'authorize:assets.checkin',
+            'uses' => 'AssetsController@postCheckin'
+        ]);
+        Route::get('{assetId}/view', [
+            'as' => 'view/hardware',
+            'middleware' => ['authorize:assets.view'],
+            'uses' => 'AssetsController@getView'
+        ]);
         Route::get('{assetId}/qr-view', [ 'as' => 'qr-view/hardware', 'uses' => 'AssetsController@getView' ]);
         Route::get('{assetId}/qr_code', [ 'as' => 'qr_code/hardware', 'uses' => 'AssetsController@getQrCode' ]);
         Route::get('{assetId}/barcode', [ 'as' => 'barcode/hardware', 'uses' => 'AssetsController@getBarCode' ]);
-        Route::get('{assetId}/restore', [ 'as' => 'restore/hardware', 'uses' => 'AssetsController@getRestore' ]);
-        Route::post('{assetId}/upload', [ 'as' => 'upload/asset', 'uses' => 'AssetsController@postUpload' ]);
-        Route::get(
-            '{assetId}/deletefile/{fileId}',
-            [ 'as' => 'delete/assetfile', 'uses' => 'AssetsController@getDeleteFile' ]
-        );
-        Route::get(
-            '{assetId}/showfile/{fileId}',
-            [ 'as' => 'show/assetfile', 'uses' => 'AssetsController@displayFile' ]
-        );
+        Route::get('{assetId}/restore', [
+            'as' => 'restore/hardware',
+            'middleware' => 'authorize:assets.delete',
+            'uses' => 'AssetsController@getRestore'
+        ]);
+        Route::post('{assetId}/upload', [
+            'as' => 'upload/asset',
+            'middleware' => 'authorize:assets.edit',
+            'uses' => 'AssetsController@postUpload'
+        ]);
 
-        Route::get(
-            'import/delete-import/{filename}',
-            [ 'as' => 'assets/import/delete-file', 'uses' => 'AssetsController@getDeleteImportFile' ]
-        );
+        Route::get('{assetId}/deletefile/{fileId}', [
+            'as' => 'delete/assetfile',
+            'middleware' => 'authorize:assets.edit',
+            'uses' => 'AssetsController@getDeleteFile'
+        ]);
 
-        Route::get(
-            'import/process/{filename}',
-            [ 'as' => 'assets/import/process-file', 'uses' => 'AssetsController@getProcessImportFile' ]
-        );
+        Route::get('{assetId}/showfile/{fileId}', [
+            'as' => 'show/assetfile',
+            'middleware' => 'authorize:assets.view',
+            'uses' => 'AssetsController@displayFile'
+        ]);
 
-        Route::get(
-            'import',
-            [ 'as' => 'assets/import', 'uses' => 'AssetsController@getImportUpload' ]
-        );
+        Route::get('import/delete-import/{filename}',  [
+                'as' => 'assets/import/delete-file',
+                'middleware' => 'authorize:assets.create',
+                'uses' => 'AssetsController@getDeleteImportFile'
+        ]);
+
+        Route::get( 'import/process/{filename}', [ 'as' => 'assets/import/process-file',
+                'middleware' => 'authorize:assets.create',
+                'uses' => 'AssetsController@getProcessImportFile'
+        ]);
+
+        Route::get('import',[
+                'as' => 'assets/import',
+                'middleware' => 'authorize:assets.create',
+                'uses' => 'AssetsController@getImportUpload'
+        ]);
 
 
-        Route::post('{assetId}/edit', 'AssetsController@postEdit');
+        Route::post('{assetId}/edit',[
+            'as' => 'assets/import',
+            'middleware' => 'authorize:assets.edit',
+            'uses' => 'AssetsController@postEdit'
+        ]);
 
         Route::post(
             'bulkedit',
             [
                 'as'   => 'hardware/bulkedit',
+                'middleware' => 'authorize:assets.edit',
                 'uses' => 'AssetsController@postBulkEdit'
             ]
         );
@@ -264,6 +323,7 @@ Route::group(
             'bulkdelete',
             [
                 'as'   => 'hardware/bulkdelete',
+                'middleware' => 'authorize:assets.delete',
                 'uses' => 'AssetsController@postBulkDelete'
             ]
         );
@@ -271,16 +331,22 @@ Route::group(
             'bulksave',
             [
                 'as'   => 'hardware/bulksave',
+                'middleware' => 'authorize:assets.edit',
                 'uses' => 'AssetsController@postBulkSave'
             ]
         );
 
         # Bulk checkout / checkin
-         Route::get(
-             'bulkcheckout',
-             [ 'as' => 'hardware/bulkcheckout', 'uses' => 'AssetsController@getBulkCheckout' ]
-         );
-         Route::post('bulkcheckout', 'AssetsController@postBulkCheckout');
+         Route::get( 'bulkcheckout',  [
+                 'as' => 'hardware/bulkcheckout',
+                 'middleware' => 'authorize:assets.checkout',
+                 'uses' => 'AssetsController@getBulkCheckout'
+         ]);
+        Route::post( 'bulkcheckout',  [
+            'as' => 'hardware/bulkcheckout',
+            'middleware' => 'authorize:assets.checkout',
+            'uses' => 'AssetsController@postBulkCheckout'
+        ]);
 
         # Asset Model Management
         Route::group([ 'prefix' => 'models', 'middleware' => 'auth' ], function () {
@@ -300,6 +366,7 @@ Route::group(
 
         Route::get('/', [
                 'as'   => 'hardware',
+                'middleware' => 'authorize:assets.view',
                 'uses' => 'AssetsController@getIndex'
             ]);
 
@@ -320,41 +387,57 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
     # Licenses
     Route::group([ 'prefix' => 'licenses', 'middleware'=>'authorize:licenses.view' ], function () {
 
-        Route::get('create', [ 'as' => 'create/licenses', 'uses' => 'LicensesController@getCreate' ]);
-        Route::post('create', 'LicensesController@postCreate');
-        Route::get('{licenseId}/edit', [ 'as' => 'update/license', 'uses' => 'LicensesController@getEdit' ]);
-        Route::post('{licenseId}/edit', 'LicensesController@postEdit');
-        Route::get('{licenseId}/clone', [ 'as' => 'clone/license', 'uses' => 'LicensesController@getClone' ]);
-        Route::post('{licenseId}/clone', 'LicensesController@postCreate');
-        Route::get('{licenseId}/delete', [ 'as' => 'delete/license', 'uses' => 'LicensesController@getDelete' ]);
-        Route::get(
-            '{licenseId}/freecheckout',
-            [ 'as' => 'freecheckout/license', 'uses' => 'LicensesController@getFreeLicense' ]
-        );
+        Route::get('create', [ 'as' => 'create/licenses', 'middleware' => 'authorize:licenses.create','uses' => 'LicensesController@getCreate' ]);
+        Route::post('create', [ 'as' => 'create/licenses', 'middleware' => 'authorize:licenses.create','uses' => 'LicensesController@postCreate' ]);
+        Route::get('{licenseId}/edit', [ 'as' => 'update/license', 'middleware' => 'authorize:licenses.edit', 'uses' => 'LicensesController@getEdit' ]);
+        Route::post('{licenseId}/edit', [ 'as' => 'update/license', 'middleware' => 'authorize:licenses.edit', 'uses' => 'LicensesController@postEdit' ]);
+        Route::get('{licenseId}/clone', [ 'as' => 'clone/license', 'middleware' => 'authorize:licenses.create', 'uses' => 'LicensesController@getClone' ]);
+        Route::post('{licenseId}/clone', [ 'as' => 'clone/license', 'middleware' => 'authorize:licenses.create', 'uses' => 'LicensesController@postCreate' ]);
+        Route::get('{licenseId}/delete', [ 'as' => 'delete/license', 'middleware' => 'authorize:licenses.delete', 'uses' => 'LicensesController@getDelete' ]);
+        Route::get('{licenseId}/freecheckout', [
+            'as' => 'freecheckout/license',
+            'middleware' => 'authorize:licenses.checkout',
+            'uses' => 'LicensesController@getFreeLicense'
+        ]);
         Route::get(
             '{licenseId}/checkout',
-            [ 'as' => 'checkout/license', 'uses' => 'LicensesController@getCheckout' ]
+            [ 'as' => 'checkout/license', 'middleware' => 'authorize:licenses.checkout','uses' => 'LicensesController@getCheckout' ]
         );
-        Route::post('{licenseId}/checkout', 'LicensesController@postCheckout');
-        Route::get(
-            '{licenseId}/checkin/{backto?}',
-            [ 'as' => 'checkin/license', 'uses' => 'LicensesController@getCheckin' ]
+        Route::post(
+            '{licenseId}/checkout',
+            [ 'as' => 'checkout/license', 'middleware' => 'authorize:licenses.checkout','uses' => 'LicensesController@postCheckout' ]
         );
-        Route::post('{licenseId}/checkin/{backto?}', 'LicensesController@postCheckin');
-        Route::get('{licenseId}/view', [ 'as' => 'view/license', 'uses' => 'LicensesController@getView' ]);
+        Route::get('{licenseId}/checkin/{backto?}', [
+            'as' => 'checkin/license',
+            'middleware' => 'authorize:licenses.checkin',
+            'uses' => 'LicensesController@getCheckin'
+        ]);
+
+        Route::post('{licenseId}/checkin/{backto?}', [
+            'as' => 'checkin/license',
+            'middleware' => 'authorize:licenses.checkin',
+            'uses' => 'LicensesController@postCheckin'
+        ]);
+
+        Route::get('{licenseId}/view', [
+            'as' => 'view/license',
+            'middleware' => 'authorize:licenses.view',
+            'uses' => 'LicensesController@getView'
+        ]);
+
         Route::post(
             '{licenseId}/upload',
-            [ 'as' => 'upload/license', 'uses' => 'LicensesController@postUpload' ]
+            [ 'as' => 'upload/license', 'middleware' => 'authorize:licenses.edit','uses' => 'LicensesController@postUpload' ]
         );
         Route::get(
             '{licenseId}/deletefile/{fileId}',
-            [ 'as' => 'delete/licensefile', 'uses' => 'LicensesController@getDeleteFile' ]
+            [ 'as' => 'delete/licensefile', 'middleware' => 'authorize:licenses.edit', 'uses' => 'LicensesController@getDeleteFile' ]
         );
         Route::get(
             '{licenseId}/showfile/{fileId}',
-            [ 'as' => 'show/licensefile', 'uses' => 'LicensesController@displayFile' ]
+            [ 'as' => 'show/licensefile', 'middleware' => 'authorize:licenses.view','uses' => 'LicensesController@displayFile' ]
         );
-        Route::get('/', [ 'as' => 'licenses', 'uses' => 'LicensesController@getIndex' ]);
+        Route::get('/', [ 'as' => 'licenses', 'middleware' => 'authorize:licenses.view','uses' => 'LicensesController@getIndex' ]);
     });
 
     # Asset Maintenances
@@ -384,84 +467,103 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
     # Accessories
     Route::group([ 'prefix' => 'accessories', 'middleware'=>'authorize:accessories.view'  ], function () {
 
-        Route::get('create', [ 'as' => 'create/accessory', 'uses' => 'AccessoriesController@getCreate' ]);
+        Route::get('create', [ 'as' => 'create/accessory', 'middleware' => 'authorize:accessories.create','uses' => 'AccessoriesController@getCreate' ]);
         Route::post('create', 'AccessoriesController@postCreate');
         Route::get(
             '{accessoryID}/edit',
-            [ 'as' => 'update/accessory', 'uses' => 'AccessoriesController@getEdit' ]
+            [ 'as' => 'update/accessory', 'middleware' => 'authorize:accessories.edit','uses' => 'AccessoriesController@getEdit' ]
         );
         Route::post('{accessoryID}/edit', 'AccessoriesController@postEdit');
         Route::get(
             '{accessoryID}/delete',
-            [ 'as' => 'delete/accessory', 'uses' => 'AccessoriesController@getDelete' ]
+            [ 'as' => 'delete/accessory', 'middleware' => 'authorize:accessories.delete','uses' => 'AccessoriesController@getDelete' ]
         );
-        Route::get('{accessoryID}/view', [ 'as' => 'view/accessory', 'uses' => 'AccessoriesController@getView' ]);
+        Route::get('{accessoryID}/view', [ 'as' => 'view/accessory', 'middleware' => 'authorize:accessories.view','uses' => 'AccessoriesController@getView' ]);
         Route::get(
             '{accessoryID}/checkout',
-            [ 'as' => 'checkout/accessory', 'uses' => 'AccessoriesController@getCheckout' ]
+            [ 'as' => 'checkout/accessory', 'middleware' => 'authorize:accessories.checkout','uses' => 'AccessoriesController@getCheckout' ]
         );
-        Route::post('{accessoryID}/checkout', 'AccessoriesController@postCheckout');
+        Route::post(
+            '{accessoryID}/checkout',
+            [ 'as' => 'checkout/accessory', 'middleware' => 'authorize:accessories.checkout','uses' => 'AccessoriesController@postCheckout' ]
+        );
+
         Route::get(
             '{accessoryID}/checkin/{backto?}',
-            [ 'as' => 'checkin/accessory', 'uses' => 'AccessoriesController@getCheckin' ]
+            [ 'as' => 'checkin/accessory', 'middleware' => 'authorize:accessories.checkin','uses' => 'AccessoriesController@getCheckin' ]
+        );
+        Route::post(
+            '{accessoryID}/checkin/{backto?}',
+            [ 'as' => 'checkin/accessory', 'middleware' => 'authorize:accessories.checkin','uses' => 'AccessoriesController@postCheckin' ]
         );
-        Route::post('{accessoryID}/checkin/{backto?}', 'AccessoriesController@postCheckin');
 
-        Route::get('/', [ 'as' => 'accessories', 'uses' => 'AccessoriesController@getIndex' ]);
+        Route::get('/', [ 'as' => 'accessories', 'middleware'=>'authorize:accessories.view', 'uses' => 'AccessoriesController@getIndex' ]);
     });
 
     # Consumables
     Route::group([ 'prefix' => 'consumables', 'middleware'=>'authorize:consumables.view'  ], function () {
 
-        Route::get('create', [ 'as' => 'create/consumable', 'uses' => 'ConsumablesController@getCreate' ]);
-        Route::post('create', 'ConsumablesController@postCreate');
+        Route::get('create', [ 'as' => 'create/consumable','middleware'=>'authorize:consumables.create', 'uses' => 'ConsumablesController@getCreate' ]);
+        Route::post('create', [ 'as' => 'create/consumable','middleware'=>'authorize:consumables.create', 'uses' => 'ConsumablesController@postCreate' ]);
         Route::get(
             '{consumableID}/edit',
-            [ 'as' => 'update/consumable', 'uses' => 'ConsumablesController@getEdit' ]
+            [ 'as' => 'update/consumable', 'middleware'=>'authorize:consumables.edit', 'uses' => 'ConsumablesController@getEdit' ]
+        );
+        Route::post(
+            '{consumableID}/edit',
+            [ 'as' => 'update/consumable', 'middleware'=>'authorize:consumables.edit', 'uses' => 'ConsumablesController@postEdit' ]
         );
-        Route::post('{consumableID}/edit', 'ConsumablesController@postEdit');
         Route::get(
             '{consumableID}/delete',
-            [ 'as' => 'delete/consumable', 'uses' => 'ConsumablesController@getDelete' ]
+            [ 'as' => 'delete/consumable',  'middleware'=>'authorize:consumables.delete','uses' => 'ConsumablesController@getDelete' ]
         );
         Route::get(
             '{consumableID}/view',
-            [ 'as' => 'view/consumable', 'uses' => 'ConsumablesController@getView' ]
+            [ 'as' => 'view/consumable',  'middleware'=>'authorize:consumables.view','uses' => 'ConsumablesController@getView' ]
         );
         Route::get(
             '{consumableID}/checkout',
-            [ 'as' => 'checkout/consumable', 'uses' => 'ConsumablesController@getCheckout' ]
+            [ 'as' => 'checkout/consumable',  'middleware'=>'authorize:consumables.checkout','uses' => 'ConsumablesController@getCheckout' ]
         );
-        Route::post('{consumableID}/checkout', 'ConsumablesController@postCheckout');
-        Route::get('/', [ 'as' => 'consumables', 'uses' => 'ConsumablesController@getIndex' ]);
+        Route::post(
+            '{consumableID}/checkout',
+            [ 'as' => 'checkout/consumable',  'middleware'=>'authorize:consumables.checkout','uses' => 'ConsumablesController@postCheckout' ]
+        );
+        Route::get('/', [ 'as' => 'consumables', 'middleware'=>'authorize:consumables.view','uses' => 'ConsumablesController@getIndex' ]);
     });
 
     # Components
     Route::group([ 'prefix' => 'components', 'middleware'=>'authorize:components.view'  ], function () {
 
-        Route::get('create', [ 'as' => 'create/component', 'uses' => 'ComponentsController@getCreate' ]);
-        Route::post('create', 'ComponentsController@postCreate');
+        Route::get('create', [ 'as' => 'create/component', 'middleware'=>'authorize:components.create','uses' => 'ComponentsController@getCreate' ]);
+        Route::post('create', [ 'as' => 'create/component', 'middleware'=>'authorize:components.create','uses' => 'ComponentsController@postCreate' ]);
         Route::get(
             '{componentID}/edit',
-            [ 'as' => 'update/component', 'uses' => 'ComponentsController@getEdit' ]
+            [ 'as' => 'update/component', 'middleware'=>'authorize:components.edit','uses' => 'ComponentsController@getEdit' ]
+        );
+        Route::post(
+            '{componentID}/edit',
+            [ 'as' => 'update/component', 'middleware'=>'authorize:components.edit','uses' => 'ComponentsController@postEdit' ]
         );
-        Route::post('{componentID}/edit', 'ComponentsController@postEdit');
         Route::get(
             '{componentID}/delete',
-            [ 'as' => 'delete/component', 'uses' => 'ComponentsController@getDelete' ]
+            [ 'as' => 'delete/component', 'middleware'=>'authorize:components.delete','uses' => 'ComponentsController@getDelete' ]
         );
         Route::get(
             '{componentID}/view',
-            [ 'as' => 'view/component', 'uses' => 'ComponentsController@getView' ]
+            [ 'as' => 'view/component', 'middleware'=>'authorize:components.view','uses' => 'ComponentsController@getView' ]
         );
         Route::get(
             '{componentID}/checkout',
-            [ 'as' => 'checkout/component', 'uses' => 'ComponentsController@getCheckout' ]
+            [ 'as' => 'checkout/component', 'middleware'=>'authorize:components.checkout','uses' => 'ComponentsController@getCheckout' ]
         );
-        Route::post('{componentID}/checkout', 'ComponentsController@postCheckout');
-        Route::post('bulk', [ 'as' => 'component/bulk-form', 'uses' => 'ComponentsController@postBulk' ]);
-        Route::post('bulksave', [ 'as' => 'component/bulk-save', 'uses' => 'ComponentsController@postBulkSave' ]);
-        Route::get('/', [ 'as' => 'components', 'uses' => 'ComponentsController@getIndex' ]);
+        Route::post(
+            '{componentID}/checkout',
+            [ 'as' => 'checkout/component', 'middleware'=>'authorize:components.checkout','uses' => 'ComponentsController@postCheckout' ]
+        );
+        Route::post('bulk', [ 'as' => 'component/bulk-form', 'middleware'=>'authorize:components.checkout','uses' => 'ComponentsController@postBulk' ]);
+        Route::post('bulksave', [ 'as' => 'component/bulk-save', 'middleware'=>'authorize:components.edit','uses' => 'ComponentsController@postBulkSave' ]);
+        Route::get('/', [ 'as' => 'components', 'middleware'=>'authorize:components.view','uses' => 'ComponentsController@getIndex' ]);
     });
 
     # Admin Settings Routes (for categories, maufactureres, etc)

app/Models/Accessory.php

@@ -22,11 +22,12 @@ class Accessory extends Model
     * Accessory validation rules
     */
     public $rules = array(
-      'name'        => 'required|min:3|max:255',
-      'qty'         => 'required|integer|min:1',
-      'category_id' => 'required|integer',
-      'company_id'  => 'integer',
-      'min_amt'     => 'integer|min:1',
+        'name'              => 'required|min:3|max:255',
+        'qty'               => 'required|integer|min:1',
+        'category_id'       => 'required|integer',
+        'company_id'        => 'integer',
+        'min_amt'           => 'integer|min:1',
+        'purchase_cost'     => 'numeric',
     );
 
 

app/Models/Actionlog.php

@@ -21,7 +21,7 @@ class Actionlog extends Model implements ICompanyableChild
 
     protected $table      = 'asset_logs';
     public $timestamps = true;
-    protected $fillable   = [ 'created_at', 'asset_type' ];
+    protected $fillable   = [ 'created_at', 'asset_type','user_id','asset_id','action_type','note','checkedout_to' ];
 
     public function getCompanyableParents()
     {
@@ -85,6 +85,13 @@ class Actionlog extends Model implements ICompanyableChild
                     ->withTrashed();
     }
 
+    public function userasassetlog()
+    {
+
+        return $this->belongsTo('\App\Models\User', 'asset_id')
+            ->withTrashed();
+    }
+
     public function childlogs()
     {
 

app/Models/Asset.php

@@ -55,6 +55,7 @@ class Asset extends Depreciable
     'supplier_id'     => 'integer',
     'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
     'status'          => 'integer',
+    'purchase_cost'   => 'numeric',
     ];
 
 
@@ -72,22 +73,36 @@ class Asset extends Depreciable
     }
 
 
-
+    public function availableForCheckout()
+    {
+      return (
+          empty($this->assigned_to) &&
+          $this->assetstatus->deployable == 1 &&
+          empty($this->deleted_at)
+        );
+    }
 
   /**
   * Checkout asset
   */
     public function checkOutToUser($user, $admin, $checkout_at = null, $expected_checkin = null, $note = null, $name = null)
     {
+        if (!$user) {
+            return false;
+        }
 
         if ($expected_checkin) {
-            $this->expected_checkin = $expected_checkin ;
+            $this->expected_checkin = $expected_checkin;
         }
 
         $this->last_checkout = $checkout_at;
 
         $this->assigneduser()->associate($user);
-        $this->name = $name;
+
+        if($name != null)
+        {
+            $this->name = $name;
+        }
 
         $settings = Setting::getSettings();
 
@@ -95,9 +110,7 @@ class Asset extends Depreciable
             $this->accepted="pending";
         }
 
-        if (!$user) {
-            return false;
-        }
+
 
         if ($this->save()) {
 

app/Models/Component.php

@@ -34,6 +34,7 @@ class Component extends Model
         'category_id' => 'required|integer',
         'company_id'  => 'integer',
         'purchase_date'  => 'date',
+        'purchase_cost'   => 'numeric',
     );
 
     /**

app/Models/Consumable.php

@@ -29,6 +29,7 @@ class Consumable extends Model
         'category_id' => 'required|integer',
         'company_id'  => 'integer',
         'min_amt'     => 'integer|min:1',
+        'purchase_cost'   => 'numeric',
     );
 
     /**

app/Models/Ldap.php

@@ -35,6 +35,11 @@ class Ldap extends Model
             putenv('LDAPTLS_REQCERT=never');
         }
 
+        // If the user specifies where CA Certs are, make sure to use them
+        if(env("LDAPTLS_CACERT")) {
+          putenv("LDAPTLS_CACERT=".env("LDAPTLS_CACERT"));
+        }
+
         $connection = @ldap_connect($ldap_host);
 
         if (!$connection) {
@@ -186,6 +191,7 @@ class Ldap extends Model
     {
         $item = Ldap::parseAndMapLdapAttributes($ldapatttibutes);
 
+
         // Create user from LDAP data
         if (!empty($item["username"])) {
             $user = new User;
@@ -193,7 +199,14 @@ class Ldap extends Model
             $user->last_name = $item["lastname"];
             $user->username = $item["username"];
             $user->email = $item["email"];
-            $user->password = bcrypt(Input::get("password"));
+
+            if (Setting::getSettings()->ldap_pw_sync=='1') {
+                $user->password = bcrypt(Input::get("password"));
+            } else {
+                $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 25);
+                $user->password = bcrypt($pass);
+            }
+
             $user->activated = 1;
             $user->ldap_import = 1;
             $user->notes = 'Imported on first login from LDAP';

app/Models/User.php

@@ -232,10 +232,10 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     public function accountStatus()
     {
-        if ($this->sentryThrottle) {
-            if ($this->sentryThrottle->suspended==1) {
+        if ($this->throttle) {
+            if ($this->throttle->suspended==1) {
                 return 'suspended';
-            } elseif ($this->sentryThrottle->banned==1) {
+            } elseif ($this->throttle->banned==1) {
                 return 'banned';
             } else {
                 return false;
@@ -262,7 +262,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             ->orderBy('created_at', 'desc');
     }
 
-    public function sentryThrottle()
+    public function throttle()
     {
         return $this->hasOne('\App\Models\Throttle');
     }
@@ -302,6 +302,10 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             ->orWhere('username', '=', $user_email);
     }
 
+    public static function generateEmailFromFullName($name) {
+        $username = User::generateFormattedNameFromFullName(Setting::getSettings()->email_format, $name);
+        return $username['username'].'@'.Setting::getSettings()->email_domain;
+    }
 
     public static function generateFormattedNameFromFullName($format = 'filastname', $users_name)
     {
@@ -333,8 +337,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             } elseif ($format=='firstname') {
                 $email_last_name.=str_replace(' ', '', $last_name);
                 $email_prefix = $first_name;
-
             }
+
+
         }
 
         $user_username = $email_prefix;

app/Providers/AuthServiceProvider.php

@@ -91,6 +91,19 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        $gate->define('assets.edit', function ($user) {
+            if (($user->hasAccess('assets.edit')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
+        // Checks for some level of management
+        $gate->define('assets.manage', function ($user) {
+            if (($user->hasAccess('assets.checkin')) || ($user->hasAccess('assets.edit')) || ($user->hasAccess('assets.delete')) || ($user->hasAccess('assets.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
 
         # -----------------------------------------
         # Accessories
@@ -131,6 +144,13 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // Checks for some level of management
+        $gate->define('accessories.manage', function ($user) {
+            if (($user->hasAccess('accessories.checkin')) || ($user->hasAccess('accessories.edit')) || ($user->hasAccess('accessories.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
         # -----------------------------------------
         # Consumables
         # -----------------------------------------
@@ -170,6 +190,13 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // Checks for some level of management
+        $gate->define('consumables.manage', function ($user) {
+            if (($user->hasAccess('consumables.checkin')) || ($user->hasAccess('consumables.edit')) || ($user->hasAccess('consumables.delete')) || ($user->hasAccess('consumables.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
 
 
         # -----------------------------------------
@@ -228,6 +255,13 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // Checks for some level of management
+        $gate->define('components.manage', function ($user) {
+            if (($user->hasAccess('components.edit')) || ($user->hasAccess('components.delete')) || ($user->hasAccess('components.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
 
         # -----------------------------------------
         # Licenses
@@ -274,6 +308,13 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // Checks for some level of management
+        $gate->define('licenses.manage', function ($user) {
+            if (($user->hasAccess('licenses.checkin')) || ($user->hasAccess('licenses.edit')) || ($user->hasAccess('licenses.delete')) || ($user->hasAccess('licenses.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
 
     }
 }

composer.json

@@ -21,7 +21,8 @@
       "doctrine/common": "v2.5.3",
       "doctrine/dbal": "v2.4.2",
       "barryvdh/laravel-debugbar": "^2.1",
-      "spatie/laravel-backup": "3.8.1"
+      "spatie/laravel-backup": "3.8.1",
+      "misterphilip/maintenance-mode": "1.0.*"
     },
     "require-dev": {
       "fzaninotto/faker": "~1.4",

composer.lock

@@ -4,21 +4,21 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "bf63c53f99a010e882f5c4b797e9f098",
-    "content-hash": "47c6ecb6331ff36a3e58ca8ddac195f8",
+    "hash": "a770010d0ebb93a2e1b5f4acadd5a7f3",
+    "content-hash": "59772418a4612685eea10dde38ca77b7",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.18.30",
+            "version": "3.18.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1"
+                "reference": "85f1fddaeb40b95106b2a2764268e9c89fc258ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbce85229b913a9e1aded54e464a9bbff0787bf1",
-                "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/85f1fddaeb40b95106b2a2764268e9c89fc258ce",
+                "reference": "85f1fddaeb40b95106b2a2764268e9c89fc258ce",
                 "shasum": ""
             },
             "require": {
@@ -85,7 +85,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-18 16:15:53"
+            "time": "2016-08-11 16:40:35"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -754,12 +754,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e"
+                "reference": "f671ae73647b6666c1442cbaac98e5d60208e409"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/490a8f35a4163f59230f53c34f1fbb22a864c01e",
-                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/f671ae73647b6666c1442cbaac98e5d60208e409",
+                "reference": "f671ae73647b6666c1442cbaac98e5d60208e409",
                 "shasum": ""
             },
             "require": {
@@ -788,7 +788,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2016-03-09 17:02:39"
+            "time": "2016-07-27 08:05:24"
         },
         {
             "name": "fideloper/proxy",
@@ -1221,16 +1221,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.2.39",
+            "version": "v5.2.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
+                "reference": "5490b8f00564bb60839002f86828e27edd1e5610"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
-                "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/5490b8f00564bb60839002f86828e27edd1e5610",
+                "reference": "5490b8f00564bb60839002f86828e27edd1e5610",
                 "shasum": ""
             },
             "require": {
@@ -1287,7 +1287,8 @@
                 "illuminate/support": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "tightenco/collect": "self.version"
             },
             "require-dev": {
                 "aws/aws-sdk-php": "~3.0",
@@ -1346,7 +1347,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2016-06-17 19:25:12"
+            "time": "2016-08-10 12:23:59"
         },
         {
             "name": "laravelcollective/html",
@@ -1461,16 +1462,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.25",
+            "version": "1.0.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a76afa4035931be0c78ca8efc6abf3902362f437"
+                "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437",
-                "reference": "a76afa4035931be0c78ca8efc6abf3902362f437",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
+                "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
                 "shasum": ""
             },
             "require": {
@@ -1540,7 +1541,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2016-07-18 12:22:57"
+            "time": "2016-08-10 08:55:11"
         },
         {
             "name": "maknz/slack",
@@ -1548,12 +1549,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/maknz/slack.git",
-                "reference": "e44a4685743c2286466ce5f0dbc025cf23248333"
+                "reference": "e9bab77eb7344f4697756ca55386576b05dc8e5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maknz/slack/zipball/e44a4685743c2286466ce5f0dbc025cf23248333",
-                "reference": "e44a4685743c2286466ce5f0dbc025cf23248333",
+                "url": "https://api.github.com/repos/maknz/slack/zipball/e9bab77eb7344f4697756ca55386576b05dc8e5a",
+                "reference": "e9bab77eb7344f4697756ca55386576b05dc8e5a",
                 "shasum": ""
             },
             "require": {
@@ -1590,7 +1591,7 @@
                 "laravel",
                 "slack"
             ],
-            "time": "2016-06-26 05:15:48"
+            "time": "2016-07-27 23:17:40"
         },
         {
             "name": "maximebf/debugbar",
@@ -1654,17 +1655,62 @@
             "time": "2016-01-22 12:22:23"
         },
         {
-            "name": "monolog/monolog",
-            "version": "1.20.0",
+            "name": "misterphilip/maintenance-mode",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037"
+                "url": "https://github.com/MisterPhilip/maintenance-mode.git",
+                "reference": "35e061703edb3c0703baea677335c03085f2b179"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/55841909e2bcde01b5318c35f2b74f8ecc86e037",
-                "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037",
+                "url": "https://api.github.com/repos/MisterPhilip/maintenance-mode/zipball/35e061703edb3c0703baea677335c03085f2b179",
+                "reference": "35e061703edb3c0703baea677335c03085f2b179",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "5.0 - 5.2",
+                "nesbot/carbon": "~1.19",
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "MisterPhilip\\MaintenanceMode": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Philip Lawrence",
+                    "email": "philip@misterphilip.com",
+                    "homepage": "http://misterphilip.com"
+                }
+            ],
+            "description": "An enhanced drop-in replacement for Laravel 5's maintenance mode",
+            "keywords": [
+                "l5",
+                "laravel",
+                "laravel5",
+                "maintenance"
+            ],
+            "time": "2015-12-23 07:24:42"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.21.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+                "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
                 "shasum": ""
             },
             "require": {
@@ -1729,7 +1775,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-07-02 14:02:10"
+            "time": "2016-07-29 03:23:52"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -1978,16 +2024,16 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
@@ -2015,6 +2061,7 @@
                 }
             ],
             "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
             "keywords": [
                 "http",
                 "http-message",
@@ -2023,7 +2070,7 @@
                 "request",
                 "response"
             ],
-            "time": "2015-05-04 20:22:00"
+            "time": "2016-08-06 14:39:51"
         },
         {
             "name": "psr/log",
@@ -2302,16 +2349,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f"
+                "reference": "926061e74229e935d3c5b4e9ba87237316c6693f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a7abb7153f6d1da47f87ec50274844e246b09d9f",
-                "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f",
+                "reference": "926061e74229e935d3c5b4e9ba87237316c6693f",
                 "shasum": ""
             },
             "require": {
@@ -2358,20 +2405,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 07:02:21"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2"
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/c54bc3539c3b87e86799533801e8ae0e971d78c2",
-                "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
+                "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
                 "shasum": ""
             },
             "require": {
@@ -2415,20 +2462,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
                 "shasum": ""
             },
             "require": {
@@ -2475,11 +2522,11 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-19 10:45:57"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -2528,16 +2575,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "1341139f906d295baa4f4abd55293d07e25a065a"
+                "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1341139f906d295baa4f4abd55293d07e25a065a",
-                "reference": "1341139f906d295baa4f4abd55293d07e25a065a",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82",
+                "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82",
                 "shasum": ""
             },
             "require": {
@@ -2577,20 +2624,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 07:02:21"
+            "time": "2016-07-17 13:54:30"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb"
+                "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
-                "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d97ba4425e36e79c794e7d14ff36f00f081b37b3",
+                "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3",
                 "shasum": ""
             },
             "require": {
@@ -2659,7 +2706,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-30 16:30:17"
+            "time": "2016-07-30 09:10:37"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2830,16 +2877,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d7cde1f9d94d87060204f863779389b61c382eeb"
+                "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d7cde1f9d94d87060204f863779389b61c382eeb",
-                "reference": "d7cde1f9d94d87060204f863779389b61c382eeb",
+                "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505",
+                "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
                 "shasum": ""
             },
             "require": {
@@ -2875,11 +2922,11 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-28 11:13:34"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
@@ -2954,16 +3001,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8"
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/6bf844e1ee3c820c012386c10427a5c67bbefec8",
-                "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26",
+                "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26",
                 "shasum": ""
             },
             "require": {
@@ -3014,20 +3061,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.0.8",
+            "version": "v3.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "2f046e9a9d571f22cc8b26783564876713b06579"
+                "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2f046e9a9d571f22cc8b26783564876713b06579",
-                "reference": "2f046e9a9d571f22cc8b26783564876713b06579",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377",
+                "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377",
                 "shasum": ""
             },
             "require": {
@@ -3077,7 +3124,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2016-06-29 05:40:00"
+            "time": "2016-07-26 08:03:56"
         },
         {
             "name": "tecnickcom/tc-lib-barcode",
@@ -4289,16 +4336,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.8.26",
+            "version": "4.8.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
+                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
+                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
                 "shasum": ""
             },
             "require": {
@@ -4357,7 +4404,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-05-17 03:09:28"
+            "time": "2016-07-21 06:48:14"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4867,16 +4914,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
+                "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d2a07cc11c5fa94820240b1e67592ffb18e347b9",
+                "reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9",
                 "shasum": ""
             },
             "require": {
@@ -4920,11 +4967,11 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-26 08:04:17"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4977,16 +5024,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
+                "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
+                "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
                 "shasum": ""
             },
             "require": {
@@ -5029,20 +5076,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-26 08:04:17"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac",
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
                 "shasum": ""
             },
             "require": {
@@ -5078,32 +5125,33 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:41:56"
+            "time": "2016-07-17 14:02:08"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
+                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3|^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -5127,7 +5175,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2015-08-24 13:29:44"
+            "time": "2016-08-09 15:02:57"
         }
     ],
     "aliases": [],

config/app.php

@@ -197,6 +197,8 @@ return [
         Collective\Html\HtmlServiceProvider::class,
         Spatie\Backup\BackupServiceProvider::class,
         Fideloper\Proxy\TrustedProxyServiceProvider::class,
+        MisterPhilip\MaintenanceMode\MaintenanceModeServiceProvider::class,
+        MisterPhilip\MaintenanceMode\MaintenanceCommandServiceProvider::class,
 
         /*
          * Custom service provider

config/permissions.php

@@ -46,19 +46,19 @@ return array(
             'permission' => 'assets.create',
             'label'      => 'Create ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'assets.edit',
-            'label'      => 'Edit ',
+            'label'      => 'Edit  ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'assets.delete',
             'label'      => 'Delete ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'assets.checkout',
@@ -71,7 +71,14 @@ return array(
             'permission' => 'assets.checkin',
             'label'      => 'Checkin ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
+        ),
+
+        array(
+            'permission' => 'assets.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
+            'display'    => true,
         ),
 
         array(
@@ -88,6 +95,7 @@ return array(
             'note'       => '',
             'display'    => true,
         ),
+
     ),
 
     'Accessories' => array(
@@ -101,31 +109,31 @@ return array(
             'permission' => 'accessory.create',
             'label'      => 'Create ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'accessories.edit',
             'label'      => 'Edit ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'accessories.delete',
             'label'      => 'Delete ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'accessories.checkout',
             'label'      => 'Checkout ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'accessories.checkin',
             'label'      => 'Checkin ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
     ),
 
@@ -140,25 +148,25 @@ return array(
             'permission' => 'consumables.create',
             'label'      => 'Create ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'consumables.edit',
             'label'      => 'Edit ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'consumables.delete',
             'label'      => 'Delete ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'consumables.checkout',
             'label'      => 'Checkout ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
     ),
 
@@ -172,27 +180,27 @@ return array(
         ),
         array(
             'permission' => 'licenses.create',
-            'label'      => 'Create Licenses',
+            'label'      => 'Create ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'licenses.edit',
-            'label'      => 'Edit Licenses',
+            'label'      => 'Edit ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'licenses.delete',
-            'label'      => 'Delete Licenses',
+            'label'      => 'Delete ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'licenses.checkout',
-            'label'      => 'Checkout Licenses',
+            'label'      => 'Checkout ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'licenses.keys',
@@ -212,33 +220,33 @@ return array(
         ),
         array(
             'permission' => 'components.create',
-            'label'      => 'Create Components',
+            'label'      => 'Create ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'components.edit',
-            'label'      => 'Edit Components',
+            'label'      => 'Edit ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'components.delete',
-            'label'      => 'Delete Components',
+            'label'      => 'Delete ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'components.checkout',
-            'label'      => 'Checkout Components',
+            'label'      => 'Checkout ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'components.checkin',
-            'label'      => 'Checkin Components',
+            'label'      => 'Checkin ',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
 
     ),
@@ -254,19 +262,19 @@ return array(
             'permission' => 'users.create',
             'label'      => 'Create Users',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'users.edit',
             'label'      => 'Edit Users',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
         array(
             'permission' => 'users.delete',
             'label'      => 'Delete Users',
             'note'       => '',
-            'display'    => false,
+            'display'    => true,
         ),
 
     ),

config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.1',
-  'hash_version' => 'v3.1-84-g139325d',
+  'app_version' => 'v3.3.0',
+  'hash_version' => 'v3.3.0-3-g7ef4f23',
 );

database/migrations/2016_08_02_124944_add_color_to_statuslabel.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColorToStatuslabel extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('status_labels', function (Blueprint $table) {
+            $table->string('color', 10)->nullable()->default(NULL);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('status_labels', function ($table) {
+            $table->dropColumn('color');
+        });
+    }
+}

database/migrations/2016_08_04_134500_add_disallow_ldap_pw_sync_to_settings.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDisallowLdapPwSyncToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('ldap_pw_sync')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('ldap_pw_sync');
+        });
+    }
+}

docker/001-default-ssl.conf

@@ -50,7 +50,7 @@
 		#   when the CA certificates are directly appended to the server
 		#   certificate for convinience.
 		#SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
-		SSLCertificateChainFile /etc/ssl/private/snipeit-ssl.crt
+		SSLCertificateChainFile /var/lib/snipeit/ssl/snipeit-ssl.crt
 
 		#   Certificate Authority (CA):
 		#   Set the CA certificate verification path where to find CA

gulpfile.js

@@ -38,7 +38,7 @@ elixir(function(mix) {
     mix.version(['assets/css/app.css','assets/js/all.js']);
 
 
-  //  mix.codeception();
+    mix.codeception();
 
 
 

public/assets/js/all.js

@@ -34248,7 +34248,7 @@ var pieOptions = {
     //String - A tooltip template
     tooltipTemplate: "<%=value %> <%=label%> "
 };
-console.dir(pieOptions);
+//console.dir(pieOptions);
 //Create pie or douhnut chart
 // You can switch between pie and douhnut using the method below.
 //pieChart.Doughnut(PieData, pieOptions);

public/build/assets/js/all-5ba6978224.js

@@ -34248,7 +34248,7 @@ var pieOptions = {
     //String - A tooltip template
     tooltipTemplate: "<%=value %> <%=label%> "
 };
-console.dir(pieOptions);
+//console.dir(pieOptions);
 //Create pie or douhnut chart
 // You can switch between pie and douhnut using the method below.
 //pieChart.Doughnut(PieData, pieOptions);

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
   "assets/css/app.css": "assets/css/app-de75b6d10a.css",
-  "assets/js/all.js": "assets/js/all-edd914620a.js"
+  "assets/js/all.js": "assets/js/all-5ba6978224.js"
 }

resources/assets/js/snipeit.js

@@ -35,7 +35,7 @@ var pieOptions = {
     //String - A tooltip template
     tooltipTemplate: "<%=value %> <%=label%> "
 };
-console.dir(pieOptions);
+//console.dir(pieOptions);
 //Create pie or douhnut chart
 // You can switch between pie and douhnut using the method below.
 //pieChart.Doughnut(PieData, pieOptions);

resources/lang/en/admin/hardware/message.php

@@ -52,7 +52,8 @@ return array(
     'checkout' => array(
         'error'   		=> 'Asset was not checked out, please try again',
         'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!'
     ),
 
     'checkin' => array(

resources/lang/en/admin/settings/general.php

@@ -51,6 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',

resources/lang/en/admin/statuslabels/table.php

@@ -4,6 +4,7 @@ return array(
     'about'      	=> 'About Status Labels',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
     'deployable'      	=> 'Deployable',
     'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
     'name'      	=> 'Status Name',

resources/lang/en/general.php

@@ -76,6 +76,7 @@
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
     'import'         	    => 'Import',
+    'import-history'        => 'Import History',
     'asset_maintenance'        => 'Asset Maintenance',
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',

resources/views/accessories/index.blade.php

@@ -7,7 +7,9 @@
 @stop
 
 @section('header_right')
-<a href="{{ route('create/accessory') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @can('accessories.create')
+        <a href="{{ route('create/accessory') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @endcan
 @stop
 
 {{-- Page content --}}

resources/views/accessories/view.blade.php

@@ -10,20 +10,28 @@
 
 {{-- Right header --}}
 @section('header_right')
-<div class="dropdown pull-right">
-  <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
-      <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
-        @if ($accessory->assigned_to != '')
-          <li role="presentation"><a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a></li>
-        @else
-          <li role="presentation"><a href="{{ route('checkout/accessory', $accessory->id)  }}">{{ trans('admin/accessories/general.checkout') }}</a></li>
-        @endif
-        <li role="presentation"><a href="{{ route('update/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.edit') }}</a></li>
+    @can('accessories.manage')
+        <div class="dropdown pull-right">
+          <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
+              <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
+                @if ($accessory->assigned_to != '')
+                  @can('accessories.checkin')
+                  <li role="presentation"><a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a></li>
+                  @endcan
+                @else
+                  @can('accessories.checkout')
+                  <li role="presentation"><a href="{{ route('checkout/accessory', $accessory->id)  }}">{{ trans('admin/accessories/general.checkout') }}</a></li>
+                  @endcan
+                @endif
+                    @can('accessories.edit')
+                <li role="presentation"><a href="{{ route('update/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.edit') }}</a></li>
+                        @endcan
 
-  </ul>
-</div>
+          </ul>
+        </div>
+    @endcan
 @stop
 
 {{-- Page content --}}
@@ -64,7 +72,9 @@
     <h4>{{ trans('admin/accessories/general.about_accessories_title') }}</h4>
     <p>{{ trans('admin/accessories/general.about_accessories_text') }} </p>
     <div class="text-center">
+        @can('accessories.checkout')
         <a href="{{ route('checkout/accessory', $accessory->id) }}" style="margin-right:5px;" class="btn btn-info btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+        @endcan
     </div>
 
 </div>

resources/views/account/accept-asset.blade.php

@@ -23,7 +23,7 @@
     <div class="col-md-12">
 
         <h3>
-        Accept {{ $item->name }}</h3>
+        Accept {{ $item->showAssetName() }}</h3>
     </div>
 </div>
 

resources/views/asset_maintenances/edit.blade.php

@@ -42,8 +42,8 @@
           <!-- Asset -->
           <div class="form-group {{ $errors->has('asset_id') ? ' has-error' : '' }}">
               <label for="asset_id" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/table.asset_name') }}
-                  <i class='fa fa-asterisk'></i></label>
-              <div class="col-md-7">
+                 </label>
+              <div class="col-md-7{{  (\App\Helpers\Helper::checkIfRequired($assetMaintenance, 'asset_id')) ? ' required' : '' }}">
                   @if ($selectedAsset == null)
                       {{ Form::select('asset_id', $asset_list , Input::old('asset_id', $assetMaintenance->asset_id), ['class'=>'select2', 'style'=>'min-width:350px']) }}
                   @else
@@ -56,8 +56,8 @@
           <!-- Supplier -->
           <div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
               <label for="supplier_id" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/table.supplier_name') }}
-                  <i class='fa fa-asterisk'></i></label>
-              <div class="col-md-7">
+                 </label>
+              <div class="col-md-7{{  (\App\Helpers\Helper::checkIfRequired($assetMaintenance, 'supplier_id')) ? ' required' : '' }}">
                   {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $assetMaintenance->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px']) }}
                   {!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
               </div>
@@ -66,8 +66,8 @@
           <!-- Improvement Type -->
           <div class="form-group {{ $errors->has('asset_maintenance_type') ? ' has-error' : '' }}">
               <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
-                  <i class='fa fa-asterisk'></i></label>
-              <div class="col-md-7">
+              </label>
+              <div class="col-md-7{{  (\App\Helpers\Helper::checkIfRequired($assetMaintenance, 'asset_maintenance_type')) ? ' required' : '' }}">
                   {{ Form::select('asset_maintenance_type', $assetMaintenanceType , Input::old('asset_maintenance_type', $assetMaintenance->asset_maintenance_type), ['class'=>'select2', 'style'=>'min-width:350px']) }}
                   {!! $errors->first('asset_maintenance_type', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
               </div>
@@ -76,9 +76,9 @@
           <!-- Title -->
           <div class="form-group {{ $errors->has('title') ? ' has-error' : '' }}">
               <label for="title" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.title') }}
-                  <i class='fa fa-asterisk'></i></label>
+                  </label>
               </label>
-              <div class="col-md-7">
+              <div class="col-md-7{{  (\App\Helpers\Helper::checkIfRequired($assetMaintenance, 'title')) ? ' required' : '' }}">
                   <input class="form-control" type="text" name="title" id="title" value="{{ Input::old('title', $assetMaintenance->title) }}" />
                   {!! $errors->first('title', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
               </div>
@@ -87,8 +87,8 @@
           <!-- Start Date -->
           <div class="form-group {{ $errors->has('start_date') ? ' has-error' : '' }}">
               <label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.start_date') }}
-                  <i class='fa fa-asterisk'></i></label>
-              <div class="input-group col-md-2">
+                  </label>
+              <div class="input-group col-md-2{{  (\App\Helpers\Helper::checkIfRequired($assetMaintenance, 'start_date')) ? ' required' : '' }}">
                   <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="start_date" id="start_date" value="{{ Input::old('start_date', $assetMaintenance->start_date) }}">
                   <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                   {!! $errors->first('start_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}

resources/views/auth/passwords/email.blade.php

@@ -12,7 +12,7 @@
 
             <div class="col-md-4 col-md-offset-4">
 
-                    <div class="box login-box">
+                <div class="box login-box" style="width: 100%">
                         <div class="box-header">
                             <h3 class="box-title"> {{ trans('auth/general.send_password_link')  }}</h3>
                         </div>

resources/views/auth/passwords/reset.blade.php

@@ -13,7 +13,7 @@
 
 
 
-                <div class="col-md-4 col-md-offset-4">
+                <div class="col-md-6 col-md-offset-3">
 
                     <div class="box login-box" style="width: 100%">
                         <div class="box-header">

resources/views/components/index.blade.php

@@ -7,7 +7,9 @@
 @stop
 
 @section('header_right')
-<a href="{{ route('create/component') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @can('components.create')
+        <a href="{{ route('create/component') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @endcan
 @stop
 
 {{-- Page content --}}

resources/views/components/view.blade.php

@@ -10,20 +10,28 @@
 
 {{-- Right header --}}
 @section('header_right')
+    @can('components.manage')
 <div class="dropdown pull-right">
   <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
       <span class="caret"></span>
   </button>
   <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
         @if ($component->assigned_to != '')
+          @can('components.checkin')
           <li role="presentation"><a href="{{ route('checkin/component', $component->id) }}">{{ trans('admin/components/general.checkin') }}</a></li>
+          @endcan
         @else
+          @can('components.checkout')
           <li role="presentation"><a href="{{ route('checkout/component', $component->id)  }}">{{ trans('admin/components/general.checkout') }}</a></li>
+          @endcan
         @endif
+         @can('components.edit')
         <li role="presentation"><a href="{{ route('update/component', $component->id) }}">{{ trans('admin/components/general.edit') }}</a></li>
+       @endcan
 
   </ul>
 </div>
+    @endcan
 @stop
 
 

resources/views/consumables/index.blade.php

@@ -7,7 +7,9 @@
 @stop
 
 @section('header_right')
-<a href="{{ route('create/consumable') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @can('consumables.create')
+        <a href="{{ route('create/consumable') }}" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    @endcan
 @stop
 
 {{-- Page content --}}

resources/views/dashboard.blade.php

@@ -24,7 +24,9 @@
           <div class="icon">
             <i class="fa fa-barcode"></i>
           </div>
-          <a href="{{ route('hardware') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @can('assets.view')
+                <a href="{{ route('hardware') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+             @endcan
         </div>
       </div><!-- ./col -->
 
@@ -38,7 +40,9 @@
           <div class="icon">
             <i class="fa fa-floppy-o"></i>
           </div>
-          <a href="{{ route('licenses') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @can('licenses.view')
+                <a href="{{ route('licenses') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @endcan
         </div>
       </div><!-- ./col -->
 
@@ -52,7 +56,9 @@
           <div class="icon">
             <i class="fa fa-keyboard-o"></i>
           </div>
-          <a href="{{ route('accessories') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @can('accessories.view')
+                <a href="{{ route('accessories') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @endcan
         </div>
       </div><!-- ./col -->
 
@@ -66,7 +72,9 @@
           <div class="icon">
             <i class="fa fa-tint"></i>
           </div>
-          <a href="{{ route('consumables') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @can('consumables.view')
+                <a href="{{ route('consumables') }}" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
+            @endcan
         </div>
       </div><!-- ./col -->
 
@@ -132,7 +140,7 @@
                             {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
                         </td>
                        <td>
-                            @if (($activity->assetlog) && ($activity->asset_type=="hardware"))
+                           @if (($activity->assetlog) && ($activity->asset_type=="hardware"))
                               <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
                             @elseif (($activity->licenselog) && ($activity->asset_type=="software"))
                               <a href="{{ route('view/license', $activity->asset_id) }}">{{ $activity->licenselog->name }}</a>
@@ -142,16 +150,17 @@
                               <a href="{{ route('view/accessory', $activity->accessory_id) }}">{{ $activity->accessorylog->name }}</a>
                             @elseif (($activity->componentlog) && ($activity->asset_type=="component"))
                                <a href="{{ route('view/component', $activity->component_id) }}">{{ $activity->componentlog->name }}</a>
-                            @elseif (($activity->assetlog) && ($activity->action_type=="uploaded"))
+                            @elseif (($activity->assetlog) && ($activity->action_type=="uploaded") && ($activity->asset_type=="hardware"))
                                    <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
-                            @else
-                                {{ trans('general.bad_data') }}
+
                             @endif
 
                             </td>
 
                        <td>
-                        @if (($activity->componentlog) && ($activity->asset_type=="component"))
+                        @if (($activity->userasassetlog) && ($activity->action_type=="uploaded") && ($activity->asset_type=="user"))
+                            <a href="{{ route('view/user', $activity->asset_id) }}">{{ $activity->userasassetlog->fullName() }}</a>
+                        @elseif (($activity->componentlog) && ($activity->asset_type=="component"))
                            <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
                         @elseif($activity->action_type=='requested')
                             @if ($activity->adminlog)
@@ -179,7 +188,7 @@
       <div class="col-md-3">
           <div class="box box-default">
               <div class="box-header with-border">
-                  <h3 class="box-title">{{ trans('general.status') }}</h3>
+                  <h3 class="box-title">{{ trans('general.assets') }}</h3>
 
                   <div class="box-tools pull-right">
                       <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>

resources/views/hardware/edit.blade.php

@@ -215,7 +215,7 @@
 
 
                                </span>
-                               <input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', number_format($asset->purchase_cost,2)) }}" />
+                               <input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', number_format($asset->purchase_cost,2, '.', '')) }}" />
                                {!! $errors->first('purchase_cost', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                         </div>
                 </div>

resources/views/hardware/history.blade.php

@@ -0,0 +1,138 @@
+@extends('layouts/default')
+
+{{-- Page title --}}
+@section('title')
+    Import History
+    @parent
+@stop
+
+@section('header_right')
+    <a href="{{ route('hardware') }}" class="btn btn-default"> {{ trans('general.back') }}</a>
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="box box-default">
+                <div class="box-body">
+                    <div class="col-md-12">
+                    <form class="form-horizontal" role="form" method="post" enctype="multipart/form-data" action="">
+                        <!-- CSRF Token -->
+                        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+
+                        @if (Session::get('message'))
+                            <p class="alert-danger">
+                                You have an error in your CSV file:<br />
+                                {{ Session::get('message') }}
+                            </p>
+                        @endif
+
+                        <p>
+                           Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &lt; Settings.
+                        </p>
+
+                        <p>Fields included in the CSV must match the headers: <strong>Date, Tag, Name</strong>. Any additional fields will be ignored. </p>
+
+                        <p><strong>Date</strong> should be the checkout date. <strong>Tag</strong> should be the asset tag. <strong>Name</strong> should be the user's name (firstname lastname).</p>
+
+                        <p><strong>History should be ordered by date in ascending order.</strong></p>
+
+                        <div class="form-group">
+                            <label for="first_name" class="col-sm-3 control-label">{{ trans('admin/users/general.usercsv') }}</label>
+                            <div class="col-sm-9">
+                                <input type="file" name="user_import_csv" id="user_import_csv">
+                            </div>
+                        </div>
+
+
+
+
+                <!-- Match firstname.lastname -->
+                <div class="form-group">
+                    <div class="col-sm-2">
+                    </div>
+                    <div class="col-sm-10">
+                        {{ Form::checkbox('match_firstnamelastname', '1', Input::old('match_firstnamelastname')) }} Try to match users by firstname.lastname (jane.smith) format
+                    </div>
+                </div>
+
+                <!-- Match flastname -->
+                <div class="form-group">
+                    <div class="col-sm-2">
+                    </div>
+                    <div class="col-sm-10">
+                        {{ Form::checkbox('match_flastname', '1', Input::old('match_flastname')) }} Try to match users by first initial last name (jsmith) format
+                    </div>
+                </div>
+
+                <!-- Match firstname -->
+                <div class="form-group">
+                    <div class="col-sm-2">
+                    </div>
+                    <div class="col-sm-10">
+                        {{ Form::checkbox('match_firstname', '1', Input::old('match_firstname')) }} Try to match users by first name (jane) format
+                    </div>
+                </div>
+
+                <!-- Match email -->
+                <div class="form-group">
+                    <div class="col-sm-2">
+                    </div>
+                    <div class="col-sm-10">
+                        {{ Form::checkbox('match_email', '1', Input::old('match_email')) }} Try to match users by email as username
+                    </div>
+                </div>
+
+
+               </div>
+
+
+
+        </div>
+
+    <!-- Form Actions -->
+    <div class="box-footer text-right">
+      <button type="submit" class="btn btn-default">{{ trans('button.submit') }}</button>
+    </div>
+
+</form>
+
+
+
+
+</div>
+
+            @if (isset($status))
+                <table class="table">
+                    @foreach($status['error'] as $type => $msg)
+                        <tr class="danger"><td>{{ $msg  }}</td></tr>
+                    @endforeach
+
+                    @foreach($status['success'] as $type => $msg)
+                        <tr class="success"><td>{{ $msg  }}</td></tr>
+                    @endforeach
+                </table>
+            @endif
+
+        </div></div></div>
+<script>
+$(document).ready(function(){
+
+    $('#generate-password').pGenerator({
+        'bind': 'click',
+        'passwordElement': '#password',
+        'displayElement': '#password-display',
+        'passwordLength': 10,
+        'uppercase': true,
+        'lowercase': true,
+        'numbers':   true,
+        'specialChars': false,
+
+    });
+});
+
+</script>
+@stop

resources/views/hardware/view.blade.php

@@ -11,6 +11,7 @@
 
 {{-- Right header --}}
 @section('header_right')
+    @can('assets.manage')
 <div class="dropdown pull-right">
   <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
       <span class="caret"></span>
@@ -27,6 +28,7 @@
         <li role="presentation"><a href="{{ route('clone/hardware', $asset->id) }}">{{ trans('admin/hardware/general.clone') }}</a></li>
   </ul>
 </div>
+    @endcan
 @stop
 
 
@@ -285,7 +287,7 @@
                     <ul class="list-unstyled">
 
 
-                      @if (isset($asset->assigneduser->email))
+                      @if ((isset($asset->assigneduser->email)) && ($asset->assigneduser->email!=''))
                         <li><i class="fa fa-envelope-o"></i> <a href="mailto:{{ $asset->assigneduser->email }}">{{ $asset->assigneduser->email }}</a></li>
                       @endif
 
@@ -296,24 +298,32 @@
                       @if (isset($asset->userloc))
                         <li>{{ $asset->userloc->name }}
                         <li>{{ $asset->userloc->address }}
-                        @if (isset($asset->userloc->address2))
+                        @if ($asset->userloc->address2!='')
                           {{ $asset->userloc->address2 }}
                         @endif
                         </li>
-                        @if (isset($asset->assetloc->city))
-                          <li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
-                        @endif
+
+                          <li>{{ $asset->userloc->city }}
+                              @if (($asset->userloc->city!='') && ($asset->userloc->state!=''))
+                                  ,
+                              @endif
+                              {{ $asset->userloc->state }} {{ $asset->userloc->zip }}</li>
+
 
                       @elseif (isset($asset->assetloc))
                           <li>{{ $asset->assetloc->name }}
                           <li>{{ $asset->assetloc->address }}
-                          @if (isset($asset->assetloc->address2))
+                          @if ($asset->assetloc->address2!='')
                             {{ $asset->assetloc->address2 }}
                           @endif
                           </li>
-                          @if (isset($asset->assetloc->city))
-                            <li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
-                          @endif
+
+                            <li>{{ $asset->assetloc->city }}
+                                @if (($asset->assetloc->city!='') && ($asset->assetloc->state!=''))
+                                ,
+                                @endif
+                                {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
+         
 
                       @endif
                     </ul>
@@ -403,6 +413,7 @@
                       <th>{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
                       <th>{{ trans('admin/asset_maintenances/form.start_date') }}</th>
                       <th>{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
+                      <th>{{ trans('admin/asset_maintenances/form.notes') }}</th>
                       <th>{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
                       <th>{{ trans('admin/asset_maintenances/form.cost') }}</th>
                       <th>{{ trans('general.admin') }}</th>
@@ -420,6 +431,7 @@
                           <td>{{ $assetMaintenance->asset_maintenance_type }}</td>
                           <td>{{ $assetMaintenance->start_date }}</td>
                           <td>{{ $assetMaintenance->completion_date }}</td>
+                          <td>{{ $assetMaintenance->notes }}</td>
                           <td>{{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
                           <td class="text-right"><nobr>{{ $use_currency.$assetMaintenance->cost }}</nobr></td>
                           <td>
@@ -438,7 +450,7 @@
                   </tbody>
                   <tfoot>
                   <tr>
-                      <td colspan="7" class="text-right">{{ $use_currency.number_format($totalCost, 2) }}</td>
+                      <td colspan="8" class="text-right">{{ $use_currency.number_format($totalCost, 2) }}</td>
                   </tr>
                   </tfoot>
               </table>
@@ -474,22 +486,28 @@
                   <tr>
                       <td>{{ $log->created_at }}</td>
                       <td>
-                          @if (isset($log->user_id))
+                          @if (isset($log->adminlog))
                           {{ $log->adminlog->fullName() }}
+                          @else
+                          Deleted Admin
                           @endif
                       </td>
                       <td>{{ $log->action_type }}</td>
                       <td>
                           @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
 
-                              @if ($log->userlog->deleted_at=='')
+                              @if ($log->userlog)
+
+                                @if ($log->userlog->deleted_at=='')
                                   <a href="{{ route('view/user', $log->checkedout_to) }}">
                                   {{ $log->userlog->fullName() }}
                                    </a>
-                              @else
-                                  <del>{{ $log->userlog->fullName() }}</del>
-                              @endif
-
+                                  @else
+                                      <del>{{ $log->userlog->fullName() }}</del>
+                                  @endif
+                                @else
+                                  Deleted User
+                                  @endif
                           @endif
                       </td>
                       <td>
@@ -506,7 +524,7 @@
                           @if ($asset->adminuser)
                               {{ $asset->adminuser->fullName() }}
                           @else
-                              @trans('general.unknown_admin')
+                              {{ trans('general.unknown_admin') }}
                           @endif
 
                       </td>

resources/views/layouts/basic.blade.php

@@ -33,12 +33,36 @@
     <link rel="stylesheet" href="{{ asset('assets/css/bootstrap-table.css') }}">
 
     <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
 
 
+    @if (\App\Models\Setting::getSettings()->header_color)
+        <style>
+        .main-header .navbar, .main-header .logo {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        background: -webkit-linear-gradient(top,  {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        background: linear-gradient(to bottom, {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
+        border-left-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+
+        .btn-primary {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        </style>
+
+    @endif
+
 </head>
 
 <body class="hold-transition login-page">
 
+    @if (\App\Models\Setting::getSettings()->logo!='')
+    <center><img class="logo" style="padding-top: 20px; padding-bottom: 10px;" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}"></center>
+    @endif
   <!-- Content -->
   @yield('content')
 

resources/views/layouts/default.blade.php

@@ -32,6 +32,8 @@
 
     <link rel="stylesheet" href="{{ asset(elixir('assets/css/app.css')) }}">
 
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
+
     <style>
     @if (\App\Models\Setting::getSettings()->header_color)
     .main-header .navbar, .main-header .logo {
@@ -166,6 +168,7 @@
                       </div>
                   </form>
                   @endcan
+
                   @can('admin')
                   <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -173,36 +176,48 @@
                       <b class="caret"></b>
                     </a>
                    <ul class="dropdown-menu">
+                     @can('assets.create')
                       <li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
                               <a href="{{ route('create/hardware') }}">
                                   <i class="fa fa-barcode fa-fw"></i>
                                   @lang('general.asset')</a>
                       </li>
+                       @endcan
+                       @can('licenses.create')
                        <li {!! (Request::is('admin/licenses/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('create/licenses') }}">
                                <i class="fa fa-floppy-o fa-fw"></i>
                                @lang('general.license')</a>
                        </li>
+                       @endcan
+                       @can('accessories.create')
                        <li {!! (Request::is('admin/accessories/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('create/accessory') }}">
                                <i class="fa fa-keyboard-o fa-fw"></i>
                                @lang('general.accessory')</a>
                        </li>
+                       @endcan
+                       @can('consumables.create')
                        <li {!! (Request::is('admin/consumables/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('create/consumable') }}">
                                <i class="fa fa-tint fa-fw"></i>
                                @lang('general.consumable')</a>
                        </li>
+                       @endcan
+                       @can('users.create')
                        <li {!! (Request::is('admin/users/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('create/user') }}">
                            <i class="fa fa-user fa-fw"></i>
                            @lang('general.user')</a>
                        </li>
+                       @endcan
+                       @can('components.create')
                        <li {!! (Request::is('admin/components/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('create/component') }}">
                            <i class="fa fa-hdd-o"></i>
                            @lang('general.component')</a>
                        </li>
+                       @endcan
                    </ul>
                </li>
                @endcan
@@ -400,12 +415,11 @@
                   </li>
                   <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Pending') }}">@lang('general.pending')</a></li>
                   <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ URL::to('hardware?status=Undeployable') }}">@lang('general.undeployable')</a></li>
-                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!} >@lang('admin/hardware/general.archived')</a></li>
-                    <li><a href="{{ URL::to('hardware?status=Requestable') }}" {!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Archived') }}" >@lang('admin/hardware/general.requestable')</a></li>
+                  <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Archived') }}">@lang('admin/hardware/general.archived')</a></li>
+                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Requestable') }}"><a href="{{ URL::to('hardware?status=Requestable') }}" >@lang('admin/hardware/general.requestable')</a></li>
 
                   <li class="divider">&nbsp;</li>
                     <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active>"' : '') !!}>
-                        <small class="label pull-right bg-orange">{{ trans('general.new')  }}</small>
                         <a href="{{ route('hardware/bulkcheckout') }}">
                             {{ trans('general.bulk_checkout') }}</a>
                     </li>
@@ -413,7 +427,8 @@
                   <li><a href="{{ URL::to('admin/settings/categories') }}" {!! (Request::is('admin/settings/categories*') ? ' class="active"' : '') !!} >@lang('general.categories')</a></li>
                   <li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Deleted') }}">@lang('general.deleted')</a></li>
                   <li><a href="{{ URL::to('admin/asset_maintenances') }}"  >@lang('general.asset_maintenances') </a></li>
-                  <li><a href="{{ URL::to('hardware/import') }}"  >@lang('general.import') </a></li>
+                  <li><a href="{{ URL::to('hardware/import') }}">@lang('general.import') </a></li>
+                  <li><small class="label pull-right bg-orange">{{ trans('general.new')  }}</small><a href="{{ URL::to('hardware/history') }}">@lang('general.import-history') </a></li>
                 </ul>
               </li>
               @endcan

resources/views/licenses/index.blade.php

@@ -8,9 +8,11 @@
 
 
 @section('header_right')
-<a href="{{ route('create/licenses') }}" class="btn btn-primary pull-right">
-  {{ trans('general.create') }}
-</a>
+@can('licenses.create')
+    <a href="{{ route('create/licenses') }}" class="btn btn-primary pull-right">
+      {{ trans('general.create') }}
+    </a>
+    @endcan
 @stop
 
 {{-- Page content --}}

resources/views/locations/edit.blade.php

@@ -43,7 +43,7 @@
           <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
             <label for="name" class="col-md-3 control-label">{{ trans('admin/locations/table.name') }}
             </label>
-            <div class="col-md-8 required">
+            <div class="col-md-8{{  (\App\Helpers\Helper::checkIfRequired($location, 'name')) ? ' required' : '' }}">
                 <input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $location->name) }}" />
                 {!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
             </div>
@@ -55,7 +55,7 @@
             <label for="parent_id" class="col-md-3 control-label">
               {{ trans('admin/locations/table.parent') }}
             </label>
-            <div class="col-md-9">
+            <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'parent_id')) ? ' required' : '' }}">
               {!! Form::select('parent_id', $location_options , Input::old('parent_id', $location->parent_id), array('class'=>'select2 parent', 'style'=>'width:350px')) !!}
               {!! $errors->first('parent_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
             </div>
@@ -66,7 +66,7 @@
                 <label for="currency" class="col-md-3 control-label">
                   {{ trans('admin/locations/table.currency') }}
                 </label>
-                      <div class="col-md-9">
+                      <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'currency')) ? ' required' : '' }}">
                         {{ Form::text('currency', Input::old('currency', $location->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
                         {!! $errors->first('currency', '<span class="alert-msg">:message</span>') !!}
                       </div>
@@ -77,7 +77,7 @@
                     <label for="address" class="col-md-3 control-label">
                       {{ trans('admin/locations/table.address') }}
                     </label>
-                        <div class="col-md-9">
+                        <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'address')) ? ' required' : '' }}">
                             <input class="form-control" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
                             {!! $errors->first('address', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                         </div>
@@ -94,10 +94,9 @@
 
                 <!-- City -->
                 <div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
-                    <label for="city" class="col-md-3 control-label">{{ trans('admin/locations/table.city') }}
-                     <i class='fa fa-asterisk'></i></label>
+                    <label for="city" class="col-md-3 control-label">{{ trans('admin/locations/table.city') }}</label>
                      </label>
-                        <div class="col-md-9">
+                        <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'city')) ? ' required' : '' }}">
                             <input class="form-control" type="text" name="city" id="city" value="{{ Input::old('city', $location->city) }}" />
                         {!! $errors->first('city', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                         </div>
@@ -115,7 +114,7 @@
                 <!-- Zip -->
                 <div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
                     <label for="zip" class="col-md-3 control-label">{{ trans('admin/locations/table.zip') }}</label>
-                        <div class="col-md-9">
+                        <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'zip')) ? ' required' : '' }}">
                             <input class="form-control" type="text" name="zip" id="zip" value="{{ Input::old('zip', $location->zip) }}" />
                         {!! $errors->first('zip', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                         </div>
@@ -123,10 +122,9 @@
 
                 <!-- Country -->
                 <div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
-                    <label for="country" class="col-md-3 control-label">{{ trans('admin/locations/table.country') }}
-                     <i class='fa fa-asterisk'></i></label>
+                    <label for="country" class="col-md-3 control-label">{{ trans('admin/locations/table.country') }}</label>
                      </label>
-                        <div class="col-md-9">
+                        <div class="col-md-9{{  (\App\Helpers\Helper::checkIfRequired($location, 'country')) ? ' required' : '' }}">
                          {!! Form::countries('country', Input::old('country', $location->country), 'select2 country') !!}
                         {!! $errors->first('country', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                         </div>

resources/views/reports/custom.blade.php

@@ -101,6 +101,14 @@
             {{ trans('admin/licenses/table.assigned_to') }}
             </label>
         </div>
+
+          <div class="checkbox col-md-12">
+            <label>
+              {{ Form::checkbox('username', '1') }}
+              {{ trans('admin/users/table.username') }}
+            </label>
+          </div>
+
         <div class="checkbox col-md-12">
         	<label>
             {{ Form::checkbox('status', '1') }}
@@ -119,6 +127,15 @@
             {{ trans('general.depreciation') }}
             </label>
         </div>
+
+          @foreach ($customfields as $customfield)
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox($customfield->db_column_name(), '1') }}
+                {{ $customfield->name }}
+              </label>
+            </div>
+          @endforeach
       </div>
 
 

resources/views/settings/edit.blade.php

@@ -15,9 +15,11 @@
 .checkbox label {
   padding-right: 40px;
 }
-.input-group {
-    padding-left: 15px;
+
+.input-group-addon {
+  width: 30px;
 }
+
 </style>
 
 <!-- Bootstrap Color Picker -->
@@ -703,6 +705,21 @@
               </div>
               <!-- /.form-group -->
 
+              <!-- LDAP Password Sync -->
+              <div class="form-group">
+                <div class="col-md-3">
+                  {{ Form::label('is_ad', trans('admin/settings/general.ldap_pw_sync')) }}
+                </div>
+                <div class="col-md-9">
+                  {{ Form::checkbox('ldap_pw_sync', '1', Input::old('ldap_pw_sync', $setting->ldap_pw_sync),array('class' => 'minimal')) }}
+                  {{ trans('general.yes') }}
+                  <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
+                  {!! $errors->first('ldap_pw_sync', '<span class="alert-msg">:message</span>') !!}
+
+                </div>
+              </div>
+              <!-- /.form-group -->
+
               <!-- AD Domain -->
               <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
                 <div class="col-md-3">

resources/views/settings/index.blade.php

@@ -151,7 +151,7 @@
 
                       @if ($setting->ldap_enabled == 1)
                           <td>
-                              {{ $setting->ldap_server }}:{{ $setting->ldap_port }}
+                              {{ $setting->ldap_server }}
                           @if ($setting->is_ad == '1')
                                 (Active Directory)
                           @endif

resources/views/statuslabels/edit.blade.php

@@ -19,6 +19,14 @@
 {{-- Page content --}}
 @section('content')
 
+    <style>
+        .input-group-addon {
+            width: 30px;
+        }
+    </style>
+<!-- Bootstrap Color Picker -->
+<link rel="stylesheet" href="{{ asset('assets/js/plugins/colorpicker/bootstrap-colorpicker.min.css') }}">
+
 
 <div class="row">
   <div class="col-md-9">
@@ -43,13 +51,26 @@
           <div class="form-group {{ $errors->has('statuslabel_types') ? 'has-error' : '' }}">
               <label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }}
               </label>
-              </label>
               <div class="col-md-7 required">
                   {{ Form::select('statuslabel_types', $statuslabel_types, $statuslabel->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px')) }}
                   {!! $errors->first('statuslabel_types', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
               </div>
           </div>
 
+              <!-- Chart color -->
+              <div class="form-group{{ $errors->has('color') ? ' has-error' : '' }}">
+                    {{ Form::label('color', trans('admin/statuslabels/table.color'), ['class' => 'col-md-3 control-label']) }}
+                  <div class="col-md-2">
+                      <div class="input-group color">
+                          {{ Form::text('color', Input::old('color', $statuslabel->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }}
+                          <div class="input-group-addon"><i></i></div>
+                      </div><!-- /.input group -->
+
+
+                      {!! $errors->first('header_color', '<span class="alert-msg">:message</span>') !!}
+                  </div>
+              </div>
+
             <!-- Note -->
             <div class="form-group {{ $errors->has('notes') ? 'has-error' : '' }}">
                 <label for="notes" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
@@ -77,5 +98,11 @@
 </div>
 </div>
 
-
+@section('moar_scripts')
+    <!-- bootstrap color picker -->
+    <script>
+        //color picker with addon
+        $(".color").colorpicker();
+    </script>
+@stop
 @stop

resources/views/statuslabels/index.blade.php

@@ -31,6 +31,7 @@
                 <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                 <th data-sortable="true" data-field="name">{{ trans('admin/statuslabels/table.name') }}</th>
                 <th data-sortable="false" data-field="type">{{ trans('admin/statuslabels/table.status_type') }}</th>
+                <th data-sortable="false" data-field="color">{{ trans('admin/statuslabels/table.color') }}</th>
                 <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>

resources/views/users/edit.blade.php

@@ -251,7 +251,7 @@ input[type='text'][disabled], input[disabled], textarea[disabled], input[readonl
                 <div class="col-md-5">
                    <div class="controls">
 
-                    <select name="groups[]" id="groups[]" multiple="multiple" class="form-control" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}>
+                    <select name="groups[]" id="groups[]" multiple="multiple" class="form-control" {{ ((Config::get('app.lock_passwords') || ($user->id==Auth::user()->id) || (!Auth::user()->isSuperUser())) ? ' disabled' : '') }}>
 
                         @foreach ($groups as $id => $group)
                         <option value="{{ $id }}"
@@ -291,38 +291,77 @@ input[type='text'][disabled], input[disabled], textarea[disabled], input[readonl
     <div class="tab-pane" id="tab_2">
         <div class="col-md-10 col-md-offset-2">
 
+
+            @if (!Auth::user()->isSuperUser())
+                <p class="alert alert-warning">Only superadmins may grant a user superadmin access.</p>
+            @endif
+
+
+                <?php $counter = 1; ?>
         @foreach ($permissions as $area => $permission)
 
+
             @for ($i = 0; $i < count($permission); $i++)
                 <?php
                 $permission_name = $permission[$i]['permission'];
+
                 ?>
 
+                @if ($counter == 2)
+                    <div id="nonadmin">
+                 @endif
+
+
                 @if ($permission[$i]['display'])
                     <h3>{{ $area }}: {{ $permission[$i]['label'] }}</h3>
                     <p>{{ $permission[$i]['note'] }}</p>
 
                     <!-- radio -->
                     <div class="form-group" style="padding-left: 15px;">
-                        
+
                         <label class="radio-padding">
-                            {{ Form::radio('permission['.$permission_name.']', '1', $userPermissions[$permission_name] == '1', ['class' => 'minimal']) }}
+
+                            @if (($permission_name == 'superuser') && (!Auth::user()->isSuperUser()))
+                                {{ Form::radio('permission['.$permission_name.']', '1', $userPermissions[$permission_name] == '1', ['disabled'=>'disabled']) }}
+                            @else
+                                {{ Form::radio('permission['.$permission_name.']', '1', $userPermissions[$permission_name] == '1', ['class' => "$permission_name"]) }}
+                            @endif
+
                             Grant</label>
 
                         <label class="radio-padding">
-                            {{ Form::radio('permission['.$permission_name.']', '-1', $userPermissions[$permission_name] == '-1', ['class' => 'minimal']) }}
+
+                            @if (($permission_name == 'superuser') && (!Auth::user()->isSuperUser()))
+                                {{ Form::radio('permission['.$permission_name.']', '-1', $userPermissions[$permission_name] == '-1', ['disabled'=>'disabled']) }}
+
+                            @else
+                                {{ Form::radio('permission['.$permission_name.']', '-1', $userPermissions[$permission_name] == '-1', ['class' => "$permission_name"]) }}
+
+                            @endif
                             Deny</label>
 
                         <label class="radio-padding">
-                            {{ Form::radio('permission['.$permission_name.']', '0', $userPermissions[$permission_name] =='0', ['class' => 'minimal']) }}
-                            Inherit</label>
+                            @if (($permission_name == 'superuser') && (!Auth::user()->isSuperUser()))
+                                {{ Form::radio('permission['.$permission_name.']', '0', $userPermissions[$permission_name] =='0', ['disabled'=>'disabled']) }}
+                            @else
+                                {{ Form::radio('permission['.$permission_name.']', '0', $userPermissions[$permission_name] =='0', ['class' => "$permission_name"]) }}
+                            @endif
+
+                              Inherit</label>
                     </div>
                     <hr>
                 @endif
+
             @endfor
+                        @if ($counter == count($permissions))
+                            
+                    </div>
+                    @endif
+        <?php $counter++; ?>
         @endforeach
             </div>
 
+
     </div><!-- /.tab-pane -->
   </div><!-- /.tab-content -->
   <div class="box-footer text-right">
@@ -354,8 +393,21 @@ $(document).ready(function() {
 <script src="{{ asset('assets/js/pGenerator.jquery.js') }}"></script>
 
 <script>
+
+
 $(document).ready(function(){
 
+    $(".superuser").change(function() {
+        var perms = $(this).val();
+        if (perms =='1') {
+            $("#nonadmin").hide();
+        } else {
+            $("#nonadmin").show();
+        }
+    });
+
+    console.dir($('.superuser'));
+
     $('#genPassword').pGenerator({
         'bind': 'click',
         'passwordElement': '#password',

resources/views/users/index.blade.php

@@ -15,16 +15,20 @@
 @stop
 
 @section('header_right')
-@if (\App\Models\Setting::getSettings()->ldap_enabled == 1)
-  <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fa fa-upload"></span> LDAP</a>
-@endif
-  <a href="{{ route('import/user') }}" class="btn btn-default pull-right" style="margin-right: 5px;"><span class="fa fa-upload"></span> {{ trans('general.import') }}</a>
-  <a href="{{ route('create/user') }}" class="btn btn-primary pull-right" style="margin-right: 5px;">  {{ trans('general.create') }}</a>
-@if (Input::get('status')=='deleted')
-  <a class="btn btn-default pull-right" href="{{ URL::to('admin/users') }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_current') }}</a>
-@else
-  <a class="btn btn-default pull-right" href="{{ URL::to('admin/users?status=deleted') }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_deleted') }}</a>
-@endif
+    @can('users.create')
+        @if (\App\Models\Setting::getSettings()->ldap_enabled == 1)
+          <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fa fa-upload"></span> LDAP</a>
+        @endif
+          <a href="{{ route('import/user') }}" class="btn btn-default pull-right" style="margin-right: 5px;"><span class="fa fa-upload"></span> {{ trans('general.import') }}</a>
+          <a href="{{ route('create/user') }}" class="btn btn-primary pull-right" style="margin-right: 5px;">  {{ trans('general.create') }}</a>
+    @endcan
+
+        @if (Input::get('status')=='deleted')
+          <a class="btn btn-default pull-right" href="{{ URL::to('admin/users') }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_current') }}</a>
+        @else
+          <a class="btn btn-default pull-right" href="{{ URL::to('admin/users?status=deleted') }}" style="margin-right: 5px;">{{ trans('admin/users/table.show_deleted') }}</a>
+        @endif
+
 @stop
 
 {{-- Page content --}}
@@ -43,12 +47,14 @@
                'class' => 'form-inline' ]) }}
 
             @if (Input::get('status')!='deleted')
+                @can('users.delete')
                <div id="toolbar">
                  <select name="bulk_actions" class="form-control select2" style="width: 200px;">
                      <option value="delete">Bulk Checkin &amp; Delete</option>
                  </select>
                  <button class="btn btn-default" id="bulkEdit" disabled>Go</button>
              </div>
+                @endcan
             @endif
 
 

resources/views/users/view.blade.php

@@ -442,7 +442,18 @@
                           @endif
 
                         </td>
-                        <td>{{ $log->adminlog->fullName() }}</td>
+                        <td>@if ($log->adminlog)
+
+                                @if ($log->adminlog->deleted_at=='')
+                                    <a href="{{ route('view/user', $log->checkedout_to) }}">
+                                        {{ $log->adminlog->fullName() }}
+                                    </a>
+                                @else
+                                    <del>{{ $log->adminlog->fullName() }}</del>
+                                @endif
+                            @else
+                                Deleted User
+                            @endif</td>
                     </tr>
                     @endforeach
                 </tbody>

resources/views/vendor/maintenancemode/app-down.blade.php

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="robots" content="noindex,nofollow">
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <title>{{ Lang::get(Config::get('maintenancemode.language-path', 'maintenancemode::defaults.') . '.title') }}</title>
+    <style>
+        html, body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            background-color: #333;
+            -webkit-transform-style: preserve-3d;
+            -moz-transform-style: preserve-3d;
+            transform-style: preserve-3d;
+            font-family: 'Open Sans', sans-serif;
+        }
+        header {
+            width: 80%;
+            color: #fff;
+            position: relative;
+            top: 50%;
+            transform: translateY(-50%);
+            text-align: center;
+            margin: 0 auto;
+        }
+        header h1, header p  {
+            margin: 0;
+            padding: .25em 0;
+        }
+        header p {
+            color: #999;
+            font-size: .8em;
+        }
+    </style>
+</head>
+<body>
+<header>
+    <h1>{{ ${Config::get('maintenancemode.inject.prefix').'Message'} }}</h1>
+    <p>{{ Lang::get(Config::get('maintenancemode.language-path', 'maintenancemode::defaults.') . '.last-updated', ['timestamp' => ${Config::get('maintenancemode.inject.prefix').'Timestamp'}->diffForHumans()]) }}</p>
+</header>
+</body>
+</html>

resources/views/vendor/maintenancemode/notification.blade.php

@@ -0,0 +1,51 @@
+{{--
+    This is a simple notification bar to users who are exempt from the maintenance page, telling them that a
+    maintenance period is going on. You should place this within your main template(s) via a call to:
+
+    @include('maintenancemode::notification')
+--}}
+
+@if(isset(${Config::get('maintenancemode.inject.prefix').'Enabled'}) &&
+    ${Config::get('maintenancemode.inject.prefix').'Enabled'} == true)
+
+    @if(Config::get('maintenancemode.notification-styles', true))
+        <style>
+            .maintenance-mode-alert {
+                width: 100%;
+                padding: .5em;
+                background-color: #FF130F;
+                color: #fff;
+            }
+            .maintenance-mode-alert strong {
+                font-weight: bold;
+            }
+            .maintenance-mode-alert time {
+                opacity: 0.7;
+                font-size: .8em;
+                padding-top: .1em;
+                float: right;
+            }
+        </style>
+    @endif
+
+    <div class="maintenance-mode-alert" id="maintenance-mode-alert" role="alert">
+
+        <strong>Maintenance Mode</strong>
+
+        {{-- Show the truncated message (so it doesn't overflow) --}}
+        @if(isset(${Config::get('maintenancemode.inject.prefix').'Message'}))
+            {{ str_limit(${Config::get('maintenancemode.inject.prefix').'Message'}, 100, "&hellip;") }}
+        @endif
+
+        {{-- And show a human-friendly timestamp --}}
+        @if(isset(${Config::get('maintenancemode.inject.prefix').'Timestamp'}) &&
+            ${Config::get('maintenancemode.inject.prefix').'Timestamp'} instanceof DateTime)
+
+            <time datetime="{{ ${Config::get('maintenancemode.inject.prefix').'Timestamp'} }}" title="{{ ${Config::get('maintenancemode.inject.prefix').'Timestamp'} }}">
+                {{ ${Config::get('maintenancemode.inject.prefix').'Timestamp'}->diffForHumans() }}
+            </time>
+
+        @endif
+    </div>
+
+@endif

snipeit.sh

@@ -51,7 +51,7 @@ elif [ -f /etc/os-release ]; then
 #Order is important here.  If /etc/os-release and /etc/centos-release exist, we're on centos 7.
 #If only /etc/centos-release exist, we're on centos6(or earlier).  Centos-release is less parsable,
 #so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
-elif [ -f /etc/centos-release]; then
+elif [ -f /etc/centos-release ]; then
 	distro="Centos"
 	version="6"
 else
@@ -161,7 +161,7 @@ case $distro in
 		#  Get files and extract to web dir
 		echo ""
 		echo "##  Downloading snipeit and extract to web directory."
-		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file >> /var/log/snipeit-install.log 2>&1
+		wget -P $tmp/ https://github.com/snipe/snipe-it/archive/$file
 		unzip -qo $tmp/$file -d $tmp/
 		cp -R $tmp/$fileName $webdir/$name
 
@@ -170,8 +170,8 @@ case $distro in
 		#Enable mcrypt and rewrite
 		echo "##  Enabling mcrypt and rewrite"
 
-		sudo php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1 
-		sudo a2enmod rewrite >> /var/log/snipeit-install.log 2>&1
+		sudo php5enmod mcrypt
+		sudo a2enmod rewrite
 
 		#Create a new virtual host for Apache.
 		echo "##  Create Virtual host for apache."
@@ -204,7 +204,7 @@ case $distro in
 
 		echo "##  Setting up hosts file."
 		echo >> $hosts "127.0.0.1 $hostname $fqdn"
-		a2ensite $name.conf >> /var/log/snipeit-install.log 2>&1
+		a2ensite $name.conf
 
 		#Modify the Snipe-It files necessary for a production environment.
 		echo "##  Modify the Snipe-It files necessary for a production environment."

tests/acceptance/CategoriesCept.php

@@ -5,8 +5,8 @@ $I->am('logged in user');
 $I->wantTo('ensure that the categories listing page loads without errors');
 $I->lookForwardTo('seeing it load without errors');
 $I->amOnPage('/admin/settings/categories');
-$I->waitForElement('.table', 5); // secs
-$I->seeNumberOfElements('tr', [1,30]);
+$I->waitForElement('.table', 10); // secs
+$I->seeNumberOfElements('tr', [1,100]);
 $I->seeInTitle('Categories');
 $I->see('Categories');
 $I->seeInPageSource('admin/settings/categories/create');
@@ -22,7 +22,7 @@ $I->dontSee('Create Category', '.page-header');
 $I->see('Create Category', 'h1.pull-left');
 $I->dontSee('<span class="');
 
-$I->fillField('name', 'testcategory');
+$I->fillField('name', \App\Helpers\Helper::generateRandomString(15));
 $I->selectOption('form select[name=category_type]', 'Asset');
 $I->click('Save');
 $I->dontSee('<span class="');

tests/acceptance/UsersCept.php

@@ -6,14 +6,13 @@ $I->wantTo('ensure that the users listing page loads without errors');
 $I->lookForwardTo('seeing it load without errors');
 $I->amOnPage('/admin/users');
 //$I->waitForJS("return $.active == 0;", 60);
-//$I->waitForElement('.table', 5); // secs
+$I->waitForElement('.table', 5); // secs
 //$I->seeNumberOfElements('tr', [1,10]);
 $I->seeInTitle('Users');
 $I->see('Users');
 $I->seeInPageSource('admin/users/create');
 $I->dontSee('Users', '.page-header');
 $I->see('Users', 'h1.pull-left');
-$I->seeLink('Create New','/admin/users/create'); // matches <a href="/logout">Logout</a>
 
 
 /* Create form */