Bumped version for v3.5-beta

Rookie mistake. Fixes missing semicolon in previous pr #2624.

app/Console/Commands/PaveIt.php

@@ -77,6 +77,8 @@ class PaveIt extends Command
                 DB::statement('delete from asset_logs');
                 DB::statement('delete from asset_maintenances');
                 DB::statement('delete from asset_uploads');
+                DB::statement('delete from action_logs');
+                DB::statement('delete from checkout_requests');
                 DB::statement('delete from consumables_users');
                 DB::statement('delete from custom_field_custom_fieldset');
                 DB::statement('delete from custom_fields');
@@ -92,10 +94,12 @@ class PaveIt extends Command
                 \DB::statement('drop table IF EXISTS accessories_users');
                 \DB::statement('drop table IF EXISTS accessories');
                 \DB::statement('drop table IF EXISTS asset_logs');
+                \DB::statement('drop table IF EXISTS action_logs');
                 \DB::statement('drop table IF EXISTS asset_maintenances');
                 \DB::statement('drop table IF EXISTS asset_uploads');
                 \DB::statement('drop table IF EXISTS assets');
                 \DB::statement('drop table IF EXISTS categories');
+                \DB::statement('drop table IF EXISTS checkout_requests');
                 \DB::statement('drop table IF EXISTS companies');
                 \DB::statement('drop table IF EXISTS consumables_users');
                 \DB::statement('drop table IF EXISTS consumables');

app/Http/Controllers/AccessoriesController.php

@@ -309,14 +309,7 @@ class AccessoriesController extends Controller
         'user_id' => Auth::user()->id,
         'assigned_to' => e(Input::get('assigned_to'))));
 
-        $logaction = new Actionlog();
-        $logaction->accessory_id = $accessory->id;
-        $logaction->asset_id = 0;
-        $logaction->checkedout_to = $accessory->assigned_to;
-        $logaction->asset_type = 'accessory';
-        $logaction->location_id = $user->location_id;
-        $logaction->user_id = Auth::user()->id;
-        $logaction->note = e(Input::get('note'));
+        $logaction = $accessory->logCheckout(e(Input::get('note')));
 
 
 
@@ -340,11 +333,11 @@ class AccessoriesController extends Controller
                 'fields' => [
                   [
                   'title' => 'Checked Out:',
-                  'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+                  'value' => 'Accessory <'.config('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
                   ],
                   [
                       'title' => 'Note:',
-                      'value' => e($logaction->note)
+                      'value' => e(Input::get('note'))
                   ],
                 ]
                 ])->send('Accessory Checked Out');
@@ -355,9 +348,6 @@ class AccessoriesController extends Controller
         }
 
 
-
-        $log = $logaction->logaction('checkout');
-
         $accessory_user = DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
 
         $data['log_id'] = $logaction->id;
@@ -435,8 +425,7 @@ class AccessoriesController extends Controller
             return redirect()->to('admin/accessories')->with('error', trans('general.insufficient_permissions'));
         }
 
-        $logaction = new Actionlog();
-        $logaction->checkedout_to = e($accessory_user->assigned_to);
+        $logaction = $accessory->logCheckin(e(Input::get('note')));
         $return_to = e($accessory_user->assigned_to);
         $admin_user = Auth::user();
 
@@ -444,12 +433,6 @@ class AccessoriesController extends Controller
       // Was the accessory updated?
         if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
 
-            $logaction->accessory_id = e($accessory->id);
-            $logaction->location_id = null;
-            $logaction->asset_type = 'accessory';
-            $logaction->user_id = e($admin_user->id);
-            $logaction->note = e(Input::get('note'));
-
             $settings = Setting::getSettings();
 
             if ($settings->slack_endpoint) {
@@ -469,7 +452,7 @@ class AccessoriesController extends Controller
                         'fields' => [
                             [
                                 'title' => 'Checked In:',
-                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.config('app.url').'/admin/users/'.e($admin_user->id).'/view'.'|'.e($admin_user->fullName()).'>.'
+                                'value' => class_basename(strtoupper($logaction->item_type)).' <'.config('app.url').'/admin/accessories/'.e($accessory->id).'/view'.'|'.e($accessory->name).'> checked in by <'.config('app.url').'/admin/users/'.e($admin_user->id).'/view'.'|'.e($admin_user->fullName()).'>.'
                             ],
                             [
                                 'title' => 'Note:',
@@ -485,9 +468,6 @@ class AccessoriesController extends Controller
 
             }
 
-
-            $log = $logaction->logaction('checkin from');
-
             if (!is_null($accessory_user->assigned_to)) {
                 $user = User::find($accessory_user->assigned_to);
             }

app/Http/Controllers/AssetModelsController.php

@@ -92,19 +92,19 @@ class AssetModelsController extends Controller
             $model->eol = e(Input::get('eol'));
         }
 
-            // Save the model data
-            $model->name                = e(Input::get('name'));
-            $model->modelno             = e(Input::get('modelno'));
-            $model->manufacturer_id     = e(Input::get('manufacturer_id'));
-            $model->category_id         = e(Input::get('category_id'));
-            $model->note            = e(Input::get('note'));
-            $model->user_id             = Auth::user()->id;
+        // Save the model data
+        $model->name                = e(Input::get('name'));
+        $model->modelno             = e(Input::get('modelno'));
+        $model->manufacturer_id     = e(Input::get('manufacturer_id'));
+        $model->category_id         = e(Input::get('category_id'));
+        $model->note                = e(Input::get('note'));
+        $model->user_id             = Auth::user()->id;
+        $model->requestable         = Input::has('requestable');
+
         if (Input::get('custom_fieldset')!='') {
             $model->fieldset_id = e(Input::get('custom_fieldset'));
         }
 
-            //$model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
-
 
         if (Input::file('image')) {
             $image = Input::file('image');
@@ -227,7 +227,10 @@ class AssetModelsController extends Controller
         $model->modelno             = e(Input::get('modelno'));
         $model->manufacturer_id     = e(Input::get('manufacturer_id'));
         $model->category_id         = e(Input::get('category_id'));
-        $model->note            = e(Input::get('note'));
+        $model->note                = e(Input::get('note'));
+
+        $model->requestable = Input::has('requestable');
+
         if (Input::get('custom_fieldset')=='') {
             $model->fieldset_id = null;
         } else {

app/Http/Controllers/AssetsController.php

@@ -659,7 +659,7 @@ class AssetsController extends Controller
                             'fields' => [
                                 [
                                     'title' => 'Checked In:',
-                                    'value' => strtoupper($logaction->asset_type).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.config('app.url').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.'
+                                    'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.config('app.url').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.'
                                 ],
                                 [
                                     'title' => 'Note:',
@@ -1150,11 +1150,12 @@ class AssetsController extends Controller
                         $item[$asset_tag][$batch_counter]['user_id'] = $user->id;
 
                         Actionlog::firstOrCreate(array(
-                            'asset_id' => $asset->id,
-                            'asset_type' => 'hardware',
+                            'item_id' => $asset->id,
+                            'item_type' => Asset::class,
                             'user_id' =>  Auth::user()->id,
                             'note' => 'Checkout imported by '.Auth::user()->fullName().' from history importer',
-                            'checkedout_to' => $item[$asset_tag][$batch_counter]['user_id'],
+                            'target_id' => $item[$asset_tag][$batch_counter]['user_id'],
+                            'target_type' => User::class,
                             'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
                             'action_type'   => 'checkout'
                             )
@@ -1190,11 +1191,11 @@ class AssetsController extends Controller
                         $asset_batch[$x]['real_checkin'] = $checkin_date;
 
                         Actionlog::firstOrCreate(array(
-                                'asset_id' => $asset_batch[$x]['asset_id'],
-                                'asset_type' => 'hardware',
+                                'item_id' => $asset_batch[$x]['asset_id'],
+                                'item_type' => Asset::class,
                                 'user_id' => Auth::user()->id,
                                 'note' => 'Checkin imported by ' . Auth::user()->fullName() . ' from history importer',
-                                'checkedout_to' => null,
+                                'target_id' => null,
                                 'created_at' => $checkin_date,
                                 'action_type' => 'checkin'
                             )
@@ -1272,15 +1273,8 @@ class AssetsController extends Controller
                 $upload_success = $file->move($destinationPath, $filename);
 
                 //Log the deletion of seats to the log
-                $logaction = new Actionlog();
-                $logaction->asset_id = $asset->id;
-                $logaction->asset_type = 'hardware';
-                $logaction->user_id = Auth::user()->id;
-                $logaction->note = e(Input::get('notes'));
-                $logaction->checkedout_to =  null;
-                $logaction->created_at =  date("Y-m-d H:i:s");
-                $logaction->filename =  $filename;
-                $log = $logaction->logaction('uploaded');
+                $asset->logUpload($filename, e(Input::get('notes')));
+
             }
         } else {
             return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -1537,8 +1531,8 @@ class AssetsController extends Controller
                     ->update($update_array)) {
 
                         $logaction = new Actionlog();
-                        $logaction->asset_id = $key;
-                        $logaction->asset_type = 'hardware';
+                        $logaction->item_type = Asset::class;
+                        $logaction->item_id = $key;
                         $logaction->created_at =  date("Y-m-d H:i:s");
 
                         if (Input::has('rtd_location_id')) {
@@ -1595,8 +1589,8 @@ class AssetsController extends Controller
                 ->update($update_array)) {
 
                     $logaction = new Actionlog();
-                    $logaction->asset_id = $asset->id;
-                    $logaction->asset_type = 'hardware';
+                    $logaction->item_type = Asset::class;
+                    $logaction->item_id = $asset->id;
                     $logaction->created_at =  date("Y-m-d H:i:s");
                     $logaction->user_id = Auth::user()->id;
                     $log = $logaction->logaction('deleted');
@@ -1676,10 +1670,6 @@ class AssetsController extends Controller
             case 'Deployed':
                 $assets->Deployed();
                 break;
-            default:
-                $assets->NotArchived();
-                break;
-
         }
 
         if ($request->has('status_id')) {
@@ -1804,7 +1794,7 @@ class AssetsController extends Controller
             'model_number'  => ($asset->model && $asset->model->modelno) ? (string)$asset->model->modelno : '',
             'status_label'        => ($asset->assigneduser) ? 'Deployed' : ((e($asset->assetstatus)) ? e($asset->assetstatus->name) : ''),
             'assigned_to'        => ($asset->assigneduser) ? (string)link_to(config('app.url').'/admin/users/'.$asset->assigned_to.'/view', e($asset->assigneduser->fullName())) : '',
-            'location'      => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? (string)link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/view', e($asset->assigneduser->userloc->name)) : (($asset->defaultLoc!='') ? (string)link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', e($asset->defaultLoc->name)) : ''),
+            'location'      => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? (string)link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/view', e($asset->assigneduser->userloc->name)) : (($asset->defaultLoc!='') ? (string)link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/view', e($asset->defaultLoc->name)) : ''),
             '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() : '',

app/Http/Controllers/ComponentsController.php

@@ -349,13 +349,7 @@ class ComponentsController extends Controller
         'assigned_qty' => e(Input::get('assigned_qty')),
         'asset_id' => $asset_id));
 
-        $logaction = new Actionlog();
-        $logaction->component_id = $component->id;
-        $logaction->asset_id = $asset_id;
-        $logaction->asset_type = 'component';
-        $logaction->location_id = $asset->location_id;
-        $logaction->user_id = Auth::user()->id;
-        $logaction->note = e(Input::get('note'));
+        $logaction = $component->logCheckout(e(Input::get('note')), $asset_id);
 
         $settings = Setting::getSettings();
 
@@ -375,7 +369,7 @@ class ComponentsController extends Controller
                         'fields' => [
                             [
                                 'title' => 'Checked Out:',
-                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+                                'value' => class_basename(strtoupper($logaction->item_type)).' <'.config('app.url').'/admin/components/'.$component->id.'/view'.'|'.$component->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
                             ],
                             [
                                 'title' => 'Note:',
@@ -389,9 +383,6 @@ class ComponentsController extends Controller
             }
         }
 
-
-        $log = $logaction->logaction('checkout');
-
       // Redirect to the new component page
         return redirect()->to("admin/components")->with('success', trans('admin/components/message.checkout.success'));
 

app/Http/Controllers/ConsumablesController.php

@@ -316,14 +316,7 @@ class ConsumablesController extends Controller
         'user_id' => $admin_user->id,
         'assigned_to' => e(Input::get('assigned_to'))));
 
-        $logaction = new Actionlog();
-        $logaction->consumable_id = $consumable->id;
-        $logaction->checkedout_to = $consumable->assigned_to;
-        $logaction->asset_type = 'consumable';
-        $logaction->asset_id = 0;
-        $logaction->location_id = $user->location_id;
-        $logaction->user_id = Auth::user()->id;
-        $logaction->note = e(Input::get('note'));
+        $logaction = $consumable->logCheckout(e(Input::get('note')));
 
         $settings = Setting::getSettings();
 
@@ -343,7 +336,7 @@ class ConsumablesController extends Controller
                         'fields' => [
                             [
                                 'title' => 'Checked Out:',
-                                'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+                                'value' => 'Consumable <'.config('app.url').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.config('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
                             ],
                             [
                                 'title' => 'Note:',
@@ -357,9 +350,6 @@ class ConsumablesController extends Controller
             }
         }
 
-
-        $log = $logaction->logaction('checkout');
-
         $consumable_user = DB::table('consumables_users')->where('assigned_to', '=', $consumable->assigned_to)->where('consumable_id', '=', $consumable->id)->first();
 
         $data['log_id'] = $logaction->id;

app/Http/Controllers/DashboardController.php

@@ -30,8 +30,8 @@ class DashboardController extends Controller
         // Show the page
         if (Auth::user()->hasAccess('admin')) {
 
-            $recent_activity = Actionlog::orderBy('created_at', 'DESC')
-                ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog', 'componentlog')
+            $recent_activity = Actionlog::latest()
+                ->with('item')
                 ->take(20)
                 ->get();
 

app/Http/Controllers/LicensesController.php

@@ -334,11 +334,11 @@ class LicensesController extends Controller
 
                   //Log the deletion of seats to the log
                     $logaction = new Actionlog();
-                    $logaction->asset_id = $license->id;
-                    $logaction->asset_type = 'software';
+                    $logaction->item_type = License::class;
+                    $logaction->item_id = $license->id;
                     $logaction->user_id = Auth::user()->id;
-                    $logaction->note = abs($difference)." seats";
-                    $logaction->checkedout_to =  null;
+                    $logaction->note = '-'.abs($difference)." seats";
+                    $logaction->target_id =  null;
                     $log = $logaction->logaction('delete seats');
 
                 } else {
@@ -359,10 +359,11 @@ class LicensesController extends Controller
 
                 //Log the addition of license to the log.
                 $logaction = new Actionlog();
-                $logaction->asset_id = $license->id;
-                $logaction->asset_type = 'software';
+                $logaction->item_type = License::class;
+                $logaction->item_id = $license->id;
                 $logaction->user_id = Auth::user()->id;
-                $logaction->note = abs($difference)." seats";
+                $logaction->note = '+'.abs($difference)." seats";
+                $logaction->target_id =  null;
                 $log = $logaction->logaction('add seats');
             }
             $license->seats             = e(Input::get('seats'));
@@ -543,14 +544,10 @@ class LicensesController extends Controller
         // Was the asset updated?
         if ($licenseseat->save()) {
 
-            $logaction = new Actionlog();
-
-            //$logaction->location_id = $assigned_to->location_id;
-            $logaction->asset_type = 'software';
-            $logaction->user_id = Auth::user()->id;
-            $logaction->note = e(Input::get('note'));
-            $logaction->asset_id = $licenseseat->license_id;
+            $licenseseat->logCheckout(e(Input::get('note')));
 
+            $data['license_id'] =$licenseseat->license_id;
+            $data['note'] = e(Input::get('note'));
 
             $license = License::find($licenseseat->license_id);
             $settings = Setting::getSettings();
@@ -558,11 +555,9 @@ class LicensesController extends Controller
 
             // Update the asset data
             if (e(Input::get('assigned_to')) == '') {
-                $logaction->checkedout_to = null;
-                $slack_msg = strtoupper($logaction->asset_type).' license <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
+                $slack_msg = 'License <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
             } else {
-                $logaction->checkedout_to = e(Input::get('assigned_to'));
-                $slack_msg = strtoupper($logaction->asset_type).' license <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$is_assigned_to->fullName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
+                $slack_msg = 'License <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$is_assigned_to->fullName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
             }
 
 
@@ -588,7 +583,7 @@ class LicensesController extends Controller
                                 ],
                                 [
                                     'title' => 'Note:',
-                                    'value' => e($logaction->note)
+                                    'value' => e(Input::get('note'))
                                 ],
 
 
@@ -602,9 +597,6 @@ class LicensesController extends Controller
 
             }
 
-            $log = $logaction->logaction('checkout');
-
-
             // Redirect to the new asset page
             return redirect()->to("admin/licenses")->with('success', trans('admin/licenses/message.checkout.success'));
         }
@@ -683,8 +675,6 @@ class LicensesController extends Controller
             return redirect()->back()->withInput()->withErrors($validator);
         }
         $return_to = $licenseseat->assigned_to;
-        $logaction = new Actionlog();
-        $logaction->checkedout_to = $licenseseat->assigned_to;
 
         // Update the asset data
         $licenseseat->assigned_to                   = null;
@@ -694,11 +684,7 @@ class LicensesController extends Controller
 
         // Was the asset updated?
         if ($licenseseat->save()) {
-            $logaction->asset_id = $licenseseat->license_id;
-            $logaction->location_id = null;
-            $logaction->asset_type = 'software';
-            $logaction->note = e(Input::get('note'));
-            $logaction->user_id = $user->id;
+            $licenseseat->logCheckin(e(Input::get('note')));
 
             $settings = Setting::getSettings();
 
@@ -719,11 +705,11 @@ class LicensesController extends Controller
                             'fields' => [
                                 [
                                     'title' => 'Checked In:',
-                                    'value' => strtoupper($logaction->asset_type).' <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked in by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'
+                                    'value' => 'License: <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked in by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.'
                                 ],
                                 [
                                     'title' => 'Note:',
-                                    'value' => e($logaction->note)
+                                    'value' => e(Input::get('note'))
                                 ],
 
                             ]
@@ -736,9 +722,6 @@ class LicensesController extends Controller
             }
 
 
-            $log = $logaction->logaction('checkin from');
-
-
 
             if ($backto=='user') {
                 return redirect()->to("admin/users/".$return_to.'/view')->with('success', trans('admin/licenses/message.checkin.success'));
@@ -809,7 +792,8 @@ class LicensesController extends Controller
         ->with('supplier_list', $supplier_list)
         ->with('license', $license)
         ->with('maintained_list', $maintained_list)
-        ->with('company_list', $company_list);
+        ->with('company_list', $company_list)
+        ->with('manufacturer_list', Helper::manufacturerList());
 
     }
 
@@ -842,7 +826,7 @@ class LicensesController extends Controller
                 foreach (Input::file('licensefile') as $file) {
 
                     $rules = array(
-                    'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar|max:2000'
+                    'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar,rtf|max:2000'
                     );
                     $validator = Validator::make(array('licensefile'=> $file), $rules);
 
@@ -853,16 +837,8 @@ class LicensesController extends Controller
                         $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension;
                         $upload_success = $file->move($destinationPath, $filename);
 
-                        //Log the deletion of seats to the log
-                        $logaction = new Actionlog();
-                        $logaction->asset_id = $license->id;
-                        $logaction->asset_type = 'software';
-                        $logaction->user_id = Auth::user()->id;
-                        $logaction->note = e(Input::get('notes'));
-                        $logaction->checkedout_to =  null;
-                        $logaction->created_at =  date("Y-m-d h:i:s");
-                        $logaction->filename =  $filename;
-                        $log = $logaction->logaction('uploaded');
+                        //Log the upload to the log
+                        $license->logUpload($filename, e(Input::get('notes')));
                     } else {
                          return redirect()->back()->with('error', trans('admin/licenses/message.upload.invalidfiles'));
                     }

app/Http/Controllers/ReportsController.php

@@ -21,6 +21,7 @@ use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
 use Redirect;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * This controller handles all actions related to Reports for
@@ -32,12 +33,12 @@ class ReportsController extends Controller
 {
 
     /**
-    * Returns a view that displaysthe accessories report.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
+     * Returns a view that displays the accessories report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
     public function getAccessoryReport()
     {
         $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
@@ -46,14 +47,14 @@ class ReportsController extends Controller
     }
 
     /**
-    * Exports the accessories to CSV
-    *
-    * @deprecated Server-side exports have been replaced by datatables export since v2.
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ManufacturersController::getDatatable() method that generates the JSON response
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the accessories to CSV
+     *
+     * @deprecated Server-side exports have been replaced by datatables export since v2.
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ManufacturersController::getDatatable() method that generates the JSON response
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function exportAccessoryReport()
     {
         $accessories = Accessory::orderBy('created_at', 'DESC')->get();
@@ -88,12 +89,12 @@ class ReportsController extends Controller
     }
 
     /**
-    * Display asset report.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
+     * Display asset report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
     public function getAssetsReport()
     {
         $settings = \App\Models\Setting::first();
@@ -108,151 +109,113 @@ class ReportsController extends Controller
             'model.manufacturer',
             'company'
         )
-                       ->orderBy('created_at', 'DESC')
-                       ->get();
+         ->orderBy('created_at', 'DESC')
+        ->get();
 
         return View::make('reports/asset', compact('assets'))->with('settings', $settings);
     }
 
     /**
-    * Exports the assets to CSV
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the assets to CSV
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function exportAssetReport()
     {
-        // Grab all the assets
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
 
-        $rows = [ ];
+        \Debugbar::disable();
 
-        // Create the header row
-        $header = [
-            trans('admin/hardware/table.asset_tag'),
-            trans('admin/hardware/form.manufacturer'),
-            trans('admin/hardware/form.model'),
-            trans('general.model_no'),
-            trans('general.name'),
-            trans('admin/hardware/table.serial'),
-            trans('general.status'),
-            trans('admin/hardware/table.purchase_date'),
-            trans('admin/hardware/table.purchase_cost'),
-            trans('admin/hardware/form.order'),
-            trans('admin/hardware/form.supplier'),
-            trans('admin/hardware/table.checkoutto'),
-            trans('admin/hardware/table.location'),
-            trans('general.notes'),
-        ];
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ',');
+        $response = new StreamedResponse(function(){
+            // Open output stream
+            $handle = fopen('php://output', 'w');
 
-        // Create a row per asset
-        foreach ($assets as $asset) {
-            $row   = [ ];
-            $row[] = e($asset->asset_tag);
-            if ($asset->model->manufacturer) {
-                $row[] = e($asset->model->manufacturer->name);
-            } else {
-                $row[] = '';
-            }
-            $row[] = '"' . e($asset->model->name) . '"';
-            $row[] = '"' . e($asset->model->modelno) . '"';
-            $row[] = e($asset->name);
-            $row[] = e($asset->serial);
-            if ($asset->assetstatus) {
-                $row[] = e($asset->assetstatus->name);
-            } else {
-                $row[] = '';
-            }
-            $row[] = $asset->purchase_date;
-            $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
-            if ($asset->order_number) {
-                $row[] = e($asset->order_number);
-            } else {
-                $row[] = '';
-            }
-            if ($asset->supplier_id) {
-                $row[] = e($asset->supplier->name);
-            } else {
-                $row[] = '';
-            }
+            Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle) {
 
-            if ($asset->assigned_to > 0) {
-                $user  = User::find($asset->assigned_to);
-                $row[] = e($user->fullName());
-            } else {
-                $row[] = ''; // Empty string if unassigned
-            }
+                //BOM
+                fputs($handle, chr(0xEF) . chr(0xBB) . chr(0xBF));
+                fputcsv($handle, [
+                    trans('admin/hardware/table.asset_tag'),
+                    trans('admin/hardware/form.manufacturer'),
+                    trans('admin/hardware/form.model'),
+                    trans('general.model_no'),
+                    trans('general.name'),
+                    trans('admin/hardware/table.serial'),
+                    trans('general.status'),
+                    trans('admin/hardware/table.purchase_date'),
+                    trans('admin/hardware/table.purchase_cost'),
+                    trans('admin/hardware/form.order'),
+                    trans('admin/hardware/form.supplier'),
+                    trans('admin/hardware/table.checkoutto'),
+                    trans('admin/hardware/table.location'),
+                    trans('general.notes'),
+                ]);
 
-            if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) {
-                $location = Location::find($asset->assigneduser->location_id);
-                if ($location) {
-                    $row[] = e($location->name);
-                } else {
-                    $row[] = '';
+                foreach ($assets as $asset) {
+                    // Add a new row with data
+                    fputcsv($handle, [
+                        $asset->asset_tag,
+                        ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
+                        ($asset->model) ? $asset->model->name : '',
+                        ($asset->model->modelno) ? $asset->model->modelno : '',
+                        ($asset->name) ? $asset->name : '',
+                        ($asset->serial) ? $asset->serial : '',
+                        ($asset->assetstatus) ? e($asset->assetstatus->name) : '',
+                        ($asset->purchase_date) ? e($asset->purchase_date) : '',
+                        ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
+                        ($asset->order_number) ? e($asset->order_number) : '',
+                        ($asset->supplier) ? e($asset->supplier->name) : '',
+                        ($asset->assigneduser) ? e($asset->assigneduser->fullName()) : '',
+                        ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
+                            e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
+                        ($asset->notes) ? e($asset->notes) : '',
+                    ]);
                 }
-            } elseif ($asset->rtd_location_id) {
-                $location = Location::find($asset->rtd_location_id);
-                if ($location->name) {
-                    $row[] = e($location->name);
-                } else {
-                    $row[] = '';
-                }
-            } else {
-                $row[] = '';  // Empty string if location is not set
-            }
+            });
 
-            if ($asset->notes) {
-                $row[] = '"' . e($asset->notes) . '"';
-            } else {
-                $row[] = '';
-            }
-
-            $rows[] = implode($row, ',');
-        }
-
-        // spit out a csv
-        $csv      = implode($rows, "\n");
-        $response = Response::make($csv, 200);
-        $response->header('Content-Type', 'text/csv');
-        $response->header('Content-disposition', 'attachment;filename=report.csv');
+            // Close the output stream
+            fclose($handle);
+        }, 200, [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition' => 'attachment; filename="assets-'.date('Y-m-d-his').'.csv"',
+        ]);
 
         return $response;
+
     }
 
     /**
-    * Show depreciation report for assets.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
+     * Show depreciation report for assets.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
     public function getDeprecationReport()
     {
 
         // Grab all the assets
         $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company')
-                       ->orderBy('created_at', 'DESC')->get();
+            ->orderBy('created_at', 'DESC')->get();
 
         return View::make('reports/depreciation', compact('assets'));
     }
 
     /**
-    * Exports the depreciations to CSV
-    *
-    * @deprecated Server-side exports have been replaced by datatables export since v2.
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the depreciations to CSV
+     *
+     * @deprecated Server-side exports have been replaced by datatables export since v2.
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function exportDeprecationReport()
     {
 
         // Grab all the assets
         $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog')
-                       ->orderBy('created_at', 'DESC')->get();
+            ->orderBy('created_at', 'DESC')->get();
 
         $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());
         $csv->setOutputBOM(Reader::BOM_UTF16_BE);
@@ -321,51 +284,143 @@ class ReportsController extends Controller
     }
 
     /**
-    * Displays activity report.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
+     * Displays activity report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
     public function getActivityReport()
     {
         $log_actions = Actionlog::orderBy('created_at', 'DESC')
-                                ->with('adminlog')
-                                ->with('accessorylog')
-                                ->with('assetlog')
-                                ->with('licenselog')
-                                ->with('userlog')
-                                ->orderBy('created_at', 'DESC')
-                                ->get();
+            ->with('item')
+            ->orderBy('created_at', 'DESC')
+            ->get();
 
         return View::make('reports/activity', compact('log_actions'));
     }
 
+
     /**
-    * Displays license report
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
+     * Returns Activity Report JSON.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
+    public function getActivityReportDataTable()
+    {
+        $activitylogs = Actionlog::orderBy('created_at', 'DESC');
+
+        if (Input::has('search')) {
+            $activity = $activity->TextSearch(e(Input::get('search')));
+        }
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+
+        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
+
+
+        $activityCount = $activitylogs->count();
+        $activitylogs = $activitylogs->skip($offset)->take($limit)->get();
+
+        $rows = array();
+
+        foreach ($activitylogs as $activity) {
+
+            if ($activity->itemType() == "asset") {
+                $activity_icons = '<i class="fa fa-barcode"></i>';
+            } elseif ($activity->itemType() == "accessory") {
+                $activity_icons = '<i class="fa fa-keyboard-o"></i>';
+            } elseif ($activity->itemType()=="consumable") {
+                $activity_icons = '<i class="fa fa-tint"></i>';
+            } elseif ($activity->itemType()=="license"){
+                $activity_icons = '<i class="fa fa-floppy-o"></i>';
+            } elseif ($activity->itemType()=="component") {
+                $activity_icons = '<i class="fa fa-hdd-o"></i>';
+            } else {
+                $activity_icons = '<i class="fa fa-paperclip"></i>';
+            }
+
+            if (($activity->item) && ($activity->itemType()=="asset")) {
+              $actvity_item = '<a href="'.route('view/hardware', $activity->item_id).'">'.e($activity->item->asset_tag).' - '. e($activity->item->showAssetName()).'</a>';
+                $item_type = 'asset';
+            } elseif ($activity->item) {
+                $actvity_item = '<a href="'.route('view/'. $activity->itemType(), $activity->item_id).'">'.e($activity->item->name).'</a>';
+                $item_type = $activity->itemType();
+            }
+            
+
+            if (($activity->userasassetlog) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) {
+                $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->userasassetlog->fullName().'</a>';
+            } elseif (($activity->item) && ($activity->target instanceof \App\Models\Asset)) {
+                $activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>';
+            } elseif (($activity->item) && ($activity->target instanceof \App\Models\User)) {
+                $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->target->fullName().'</a>';
+            } elseif ($activity->action_type=='requested') {
+                $activity_target =  '<a href="'.route('view/user', $activity->user_id).'">'.$activity->user->fullName().'</a>';
+            } else {
+                $activity_target = $activity->target;
+            }
+
+            
+            $rows[] = array(
+                'icon'          => $activity_icons,
+                'created_at'    => date("M d, Y g:iA", strtotime($activity->created_at)),
+                'action_type'              => strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))),
+                'admin'         =>  $activity->user ? (string) link_to('/admin/users/'.$activity->user_id.'/view', $activity->user->fullName()) : 'Deleted Admin',
+                'target'          => $activity_target,
+                'item'          => $actvity_item,
+                'item_type'     => $item_type,
+                'note'     => e($activity->note),
+
+            );
+        }
+
+        $data = array('total'=>$activityCount, 'rows'=>$rows);
+
+        return $data;
+
+    }
+
+    /**
+     * Displays license report
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return View
+     */
     public function getLicenseReport()
     {
 
         $licenses = License::orderBy('created_at', 'DESC')
-                           ->with('company')
-                           ->get();
+            ->with('company')
+            ->get();
 
         return View::make('reports/licenses', compact('licenses'));
     }
 
     /**
-    * Exports the licenses to CSV
-    *
-    * @deprecated Server-side exports have been replaced by datatables export since v2.
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the licenses to CSV
+     *
+     * @deprecated Server-side exports have been replaced by datatables export since v2.
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function exportLicenseReport()
     {
         $licenses = License::orderBy('created_at', 'DESC')->get();
@@ -407,13 +462,13 @@ class ReportsController extends Controller
     }
 
     /**
-    * Returns a form that allows the user to generate a custom CSV report.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ReportsController::postCustomReport() method that generates the CSV
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Returns a form that allows the user to generate a custom CSV report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ReportsController::postCustomReport() method that generates the CSV
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function getCustomReport()
     {
         $customfields = CustomField::get();
@@ -421,21 +476,25 @@ class ReportsController extends Controller
     }
 
     /**
-    * Exports the custom report to CSV
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see ReportsController::getCustomReport() method that generates form view
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
+     * Exports the custom report to CSV
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see ReportsController::getCustomReport() method that generates form view
+     * @since [v1.0]
+     * @return \Illuminate\Http\Response
+     */
     public function postCustom()
     {
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
+        $assets = Asset::orderBy('created_at', 'DESC')->with('company','assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->get();
         $customfields = CustomField::get();
 
         $rows   = [ ];
         $header = [ ];
 
+        if (e(Input::get('company_name')) == '1') {
+            $header[] = 'Company Name';
+        }
+        
         if (e(Input::get('asset_name')) == '1') {
             $header[] = 'Asset Name';
         }
@@ -501,6 +560,11 @@ class ReportsController extends Controller
 
         foreach ($assets as $asset) {
             $row = [ ];
+            
+            if (e(Input::get('company_name')) == '1') {
+                $row[] = is_null($asset->company) ? '' : e($asset->company->name);
+            }
+
             if (e(Input::get('asset_name')) == '1') {
                 $row[] = '"' .e($asset->name) . '"';
             }
@@ -632,7 +696,7 @@ class ReportsController extends Controller
             return $response;
         } else {
             return redirect()->to("reports/custom")
-                           ->with('error', trans('admin/reports/message.error'));
+                ->with('error', trans('admin/reports/message.error'));
         }
     }
 
@@ -647,8 +711,8 @@ class ReportsController extends Controller
     {
         // Grab all the improvements
         $assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
-                                              ->orderBy('created_at', 'DESC')
-                                              ->get();
+            ->orderBy('created_at', 'DESC')
+            ->get();
 
         return View::make('reports/asset_maintenances', compact('assetMaintenances'));
 
@@ -665,8 +729,8 @@ class ReportsController extends Controller
     {
         // Grab all the improvements
         $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
-                                             ->orderBy('created_at', 'DESC')
-                                             ->get();
+            ->orderBy('created_at', 'DESC')
+            ->get();
 
         $rows = [ ];
 
@@ -694,7 +758,7 @@ class ReportsController extends Controller
             $row[] = e($assetMaintenance->completion_date);
             if (is_null($assetMaintenance->asset_maintenance_time)) {
                 $improvementTime = intval(Carbon::now()
-                                                 ->diffInDays(Carbon::parse($assetMaintenance->start_date)));
+                    ->diffInDays(Carbon::parse($assetMaintenance->start_date)));
             } else {
                 $improvementTime = intval($assetMaintenance->asset_maintenance_time);
             }
@@ -738,7 +802,7 @@ class ReportsController extends Controller
 
         // Grab all the improvements
         $assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet())
-                                    ->get();
+            ->get();
 
         $rows = [ ];
 
@@ -785,10 +849,10 @@ class ReportsController extends Controller
     protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
     {
         $assets = Asset::deployed()
-                        ->inModelList($modelsInCategoriesThatRequireAcceptance)
-                        ->select('id')
-                        ->get()
-                        ->toArray();
+            ->inModelList($modelsInCategoriesThatRequireAcceptance)
+            ->select('id')
+            ->get()
+            ->toArray();
 
         return array_pluck($assets, 'id');
     }
@@ -805,9 +869,9 @@ class ReportsController extends Controller
     {
 
         return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
-                                 ->select('id')
-                                 ->get()
-                                 ->toArray(), 'id');
+            ->select('id')
+            ->get()
+            ->toArray(), 'id');
     }
 
     /**
@@ -821,9 +885,9 @@ class ReportsController extends Controller
     {
 
         return array_pluck(Category::requiresAcceptance()
-                                    ->select('id')
-                                    ->get()
-                                    ->toArray(), 'id');
+            ->select('id')
+            ->get()
+            ->toArray(), 'id');
     }
 
     /**

app/Http/Controllers/SettingsController.php

@@ -195,7 +195,7 @@ class SettingsController extends Controller
         } else {
             $user->save();
             $settings->save();
-            
+
             if (Input::get('email_creds')=='1') {
                 Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) {
                     $m->to($data['email'], $data['first_name']);
@@ -323,7 +323,7 @@ class SettingsController extends Controller
                 $setting->logo = $file_name;
             }
         }
-        
+
 
         if (config('app.lock_passwords')==false) {
             $setting->site_name = e(Input::get('site_name'));
@@ -482,7 +482,7 @@ class SettingsController extends Controller
 
             }
             closedir($handle);
-            $files = array_reverse($files);
+            rsort($files);
         }
 
 

app/Http/Controllers/UsersController.php

@@ -495,9 +495,10 @@ class UsersController extends Controller
 
                     // Update the asset log
                     $logaction = new Actionlog();
-                    $logaction->asset_id = $asset->id;
-                    $logaction->checkedout_to = $asset->assigned_to;
-                    $logaction->asset_type = 'hardware';
+                    $logaction->item_id = $asset->id;
+                    $logaction->item_type = Asset::class;
+                    $logaction->target_id = $asset->assigned_to;
+                    $logaction->target_type = User::class;
                     $logaction->user_id = Auth::user()->id;
                     $logaction->note = 'Bulk checkin asset and delete user';
                     $logaction->logaction('checkin from');
@@ -514,9 +515,10 @@ class UsersController extends Controller
                     $accessory_array[] = $accessory->accessory_id;
                     // Update the asset log
                     $logaction = new Actionlog();
-                    $logaction->accessory_id = $accessory->id;
-                    $logaction->checkedout_to = $accessory->assigned_to;
-                    $logaction->asset_type = 'accessory';
+                    $logaction->item_id = $accessory->id;
+                    $logaction->item_type = Accessory::class;
+                    $logaction->target_id = $accessory->assigned_to;
+                    $logaction->target_type = User::class;
                     $logaction->user_id = Auth::user()->id;
                     $logaction->note = 'Bulk checkin accessory and delete user';
                     $logaction->logaction('checkin from');
@@ -528,9 +530,10 @@ class UsersController extends Controller
                     $license_array[] = $license->id;
                     // Update the asset log
                     $logaction = new Actionlog();
-                    $logaction->asset_id = $license->id;
-                    $logaction->checkedout_to = $license->assigned_to;
-                    $logaction->asset_type = 'software';
+                    $logaction->item_id = $license->id;
+                    $logaction->item_type = License::class;
+                    $logaction->target_id = $license->assigned_to;
+                    $logaction->target_type = User::class; 
                     $logaction->user_id = Auth::user()->id;
                     $logaction->note = 'Bulk checkin license and delete user';
                     $logaction->logaction('checkin from');
@@ -598,7 +601,7 @@ class UsersController extends Controller
 
         $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId);
 
-        $userlog = $user->userlog->load('assetlog', 'consumablelog', 'assetlog.model', 'licenselog', 'accessorylog', 'userlog', 'adminlog');
+        $userlog = $user->userlog->load('item');
 
         if (isset($user->id)) {
 
@@ -1017,11 +1020,11 @@ class UsersController extends Controller
 
               //Log the deletion of seats to the log
                 $logaction = new Actionlog();
-                $logaction->asset_id = $user->id;
-                $logaction->asset_type = 'user';
+                $logaction->item_id = $user->id;
+                $logaction->item_type = User::class;
                 $logaction->user_id = Auth::user()->id;
                 $logaction->note = e(Input::get('notes'));
-                $logaction->checkedout_to = null;
+                $logaction->target_id = null;
                 $logaction->created_at = date("Y-m-d h:i:s");
                 $logaction->filename = $filename;
                 $logaction->action_type = 'uploaded';

app/Http/Controllers/ViewAssetsController.php

@@ -4,12 +4,14 @@ namespace App\Http\Controllers;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\CheckoutRequest;
 use App\Models\Company;
-use App\Models\Consumable;
 use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
 use App\Models\Setting;
 use App\Models\User;
-use App\Models\License;
 use Auth;
 use Config;
 use DB;
@@ -39,9 +41,7 @@ class ViewAssetsController extends Controller
 
         $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find(Auth::user()->id);
 
-        $userlog = $user->userlog->load('assetlog', 'consumablelog', 'assetlog.model', 'licenselog', 'accessorylog', 'userlog', 'adminlog');
-
-
+        $userlog = $user->userlog->load('item', 'user', 'target');
 
         if (isset($user->id)) {
             return View::make('account/view-assets', compact('user', 'userlog'));
@@ -60,11 +60,130 @@ class ViewAssetsController extends Controller
     {
 
         $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assigneduser')->Hardware()->RequestableAssets()->get();
+        $models = AssetModel::with('category')->RequestableModels()->get();
 
-        return View::make('account/requestable-assets', compact('user', 'assets'));
+        return View::make('account/requestable-assets', compact('user', 'assets', 'models'));
+    }
+
+    public function getRequestedIndex()
+    {
+        $requestedItems = CheckoutRequest::with('user', 'requestedItem')->get();
+        return View::make('admin/requested-assets', compact('requestedItems'));
     }
 
 
+    public function getRequestItem($itemType, $itemId = null)
+    {
+        $item = null;
+        $fullItemType = 'App\\Models\\' . studly_case($itemType);
+        if($itemType == "asset_model") {
+            $itemType = "model";
+        }
+        $item = call_user_func(array($fullItemType, 'find'), $itemId);
+        $user = Auth::user();
+        $quantity = $data['item_quantity'] = Input::has('request-quantity') ? e(Input::get('request-quantity')) : 1;
+
+        $logaction = new Actionlog();
+        $logaction->item_id = $data['asset_id'] = $item->id;
+        $logaction->item_type = $fullItemType;
+        $logaction->created_at = $data['requested_date'] = date("Y-m-d h:i:s");
+        if ($user->location_id) {
+            $logaction->location_id = $user->location_id;
+        }
+        $logaction->target_id = $data['user_id'] = Auth::user()->id;
+        $logaction->target_type = User::class;
+
+        $data['requested_by'] = $user->fullName();
+        $data['item_name'] = $item->name;
+        $data['item_type'] = $itemType;
+
+        if ($fullItemType == Asset::class) {
+            $data['item_url'] = route('view/hardware', $item->id);
+            $slackMessage = ' Asset <'.config('app.url').'/hardware/'.$item->id.'/view'.'|'.$item->showAssetName().'> requested by <'.config('app.url').'/users/'.$item->user_id.'/view'.'|'.$user->fullName().'>.';
+        } else {
+            $data['item_url'] = route("view/${itemType}", $item->id);
+            $slackMessage = $quantity. ' ' . class_basename(strtoupper($logaction->item_type)).' <'.$data['item_url'].'|'.$item->name.'> requested by <'.config('app.url').'/user/'.$item->id.'/view'.'|'.$user->fullName().'>.';
+        }
+
+        $settings = Setting::getSettings();
+
+        if ($settings->slack_endpoint) {
+
+            $slack_settings = [
+                'username' => $settings->botname,
+                'channel' => $settings->slack_channel,
+                'link_names' => true
+            ];
+
+            $slackClient = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
+        }
+
+        if ($item->isRequestedBy($user)) {
+
+            $item->cancelRequest();
+            $log = $logaction->logaction('request_canceled');
+
+            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
+                Mail::send('emails.asset-canceled', $data, function ($m) use ($user, $settings) {
+                    $m->to(explode(',', $settings->alert_email), $settings->site_name);
+                    $m->subject('Item Request Canceled');
+                });
+            }
+
+            if ($settings->slack_endpoint) {
+                try {
+                        $slackClient->attach([
+                            'color' => 'good',
+                            'fields' => [
+                                [
+                                    'title' => 'CANCELED:',
+                                    'value' => $slackMessage
+                                ]
+
+                            ]
+                        ])->send('Item Request Canceled');
+
+                } catch (Exception $e) {
+
+                }
+            }
+
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
+
+        } else {
+            $item->request();
+
+            $log = $logaction->logaction('requested');
+
+
+            if (($settings->alert_email!='')  && ($settings->alerts_enabled=='1') && (!config('app.lock_passwords'))) {
+                Mail::send('emails.asset-requested', $data, function ($m) use ($user, $settings) {
+                    $m->to(explode(',', $settings->alert_email), $settings->site_name);
+                    $m->subject('Item Requested');
+                });
+            }
+
+            if ($settings->slack_endpoint) {
+                try {
+                        $slackClient->attach([
+                            'color' => 'good',
+                            'fields' => [
+                                [
+                                    'title' => 'REQUESTED:',
+                                    'value' => $slackMessage
+                                ]
+
+                            ]
+                        ])->send('Item Requested');
+
+                } catch (Exception $e) {
+
+                }
+            }
+
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
+        }
+    }
     public function getRequestAsset($assetId = null)
     {
 
@@ -76,17 +195,23 @@ class ViewAssetsController extends Controller
             return redirect()->route('requestable-assets')->with('error', trans('admin/hardware/message.does_not_exist_or_not_requestable'));
         } elseif (!Company::isCurrentUserHasAccess($asset)) {
             return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions'));
+        }
+        // If it's requested, cancel the request.
+        if ($asset->isRequestedBy(Auth::user())) {
+            $asset->cancelRequest();
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
         } else {
 
             $logaction = new Actionlog();
-            $logaction->asset_id = $data['asset_id'] = $asset->id;
-            $logaction->asset_type = $data['asset_type']  = 'hardware';
+            $logaction->item_id = $data['asset_id'] = $asset->id;
+            $logaction->item_type = Asset::class;
             $logaction->created_at = $data['requested_date'] = date("Y-m-d h:i:s");
-
+            $data['asset_type'] = 'hardware';
             if ($user->location_id) {
                 $logaction->location_id = $user->location_id;
             }
-            $logaction->user_id = $data['user_id'] = Auth::user()->id;
+            $logaction->target_id = $data['user_id'] = Auth::user()->id;
+            $logaction->target_type = User::class;
             $log = $logaction->logaction('requested');
 
             $data['requested_by'] = $user->fullName();
@@ -101,6 +226,8 @@ class ViewAssetsController extends Controller
                 });
             }
 
+            $asset->request();
+
 
             if ($settings->slack_endpoint) {
 
@@ -119,7 +246,7 @@ class ViewAssetsController extends Controller
                             'fields' => [
                                 [
                                     'title' => 'REQUESTED:',
-                                    'value' => strtoupper($logaction->asset_type).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->fullName().'>.'
+                                    'value' => class_basename(strtoupper($logaction->item_type)).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.Auth::user()->fullName().'>.'
                                 ]
 
                             ]
@@ -137,13 +264,20 @@ class ViewAssetsController extends Controller
 
     }
 
+    public function getRequestedAssets()
+    {
+        $checkoutrequests = CheckoutRequest::all();
+
+        return View::make('account/requested-items', compact($checkoutrequests));
+    }
+
 
 
     // Get the acceptance screen
     public function getAcceptAsset($logID = null)
     {
 
-        if (!$findlog = DB::table('asset_logs')->where('id', '=', $logID)->first()) {
+        if (!$findlog = Actionlog::where('id', $logID)->first()) {
             echo 'no record';
             //return redirect()->to('account')->with('error', trans('admin/hardware/message.does_not_exist'));
         }
@@ -155,23 +289,7 @@ class ViewAssetsController extends Controller
             return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
         }
 
-        // Asset
-        if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
-            $item = Asset::find($findlog->asset_id);
-
-        // software
-        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {
-            $item = License::find($findlog->asset_id);
-        // accessories
-        } elseif ($findlog->accessory_id!='') {
-            $item = Accessory::find($findlog->accessory_id);
-        // consumable
-        } elseif ($findlog->consumable_id!='') {
-            $item = Consumable::find($findlog->consumable_id);
-        // components
-        } elseif ($findlog->component_id!='') {
-            $item = Component::find($findlog->component_id);
-        }
+        $item = $findlog->item;
 
         // Check if the asset exists
         if (is_null($item)) {
@@ -189,7 +307,7 @@ class ViewAssetsController extends Controller
     {
 
         // Check if the asset exists
-        if (is_null($findlog = DB::table('asset_logs')->where('id', '=', $logID)->first())) {
+        if (is_null($findlog = Actionlog::where('id', $logID)->first())) {
             // Redirect to the asset management page
             return redirect()->to('account/view-assets')->with('error', trans('admin/hardware/message.does_not_exist'));
         }
@@ -221,56 +339,24 @@ class ViewAssetsController extends Controller
             $accepted="rejected";
             $return_msg = trans('admin/users/message.declined');
         }
-
+            $logaction->item_id      = $findlog->item_id;
+            $logaction->item_type    = $findlog->item_type;
         // Asset
-        if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
-            $logaction->asset_id = $findlog->asset_id;
-            $logaction->accessory_id = null;
-            $logaction->asset_type = 'hardware';
-
+        if (($findlog->item_id!='') && ($findlog->item_type==Asset::class)) {
             if (Input::get('asset_acceptance')!='accepted') {
                 DB::table('assets')
-                ->where('id', $findlog->asset_id)
+                ->where('id', $findlog->item_id)
                 ->update(array('assigned_to' => null));
             }
-
-
-        // software
-        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {
-            $logaction->asset_id = $findlog->asset_id;
-            $logaction->accessory_id = null;
-            $logaction->component_id = null;
-            $logaction->asset_type = 'software';
-
-        // accessories
-        } elseif ($findlog->accessory_id!='') {
-            $logaction->asset_id = null;
-            $logaction->component_id = null;
-            $logaction->accessory_id = $findlog->accessory_id;
-            $logaction->asset_type = 'accessory';
-            // accessories
-        } elseif ($findlog->consumable_id!='') {
-            $logaction->asset_id = null;
-            $logaction->accessory_id = null;
-            $logaction->component_id = null;
-            $logaction->consumable_id = $findlog->consumable_id;
-            $logaction->asset_type = 'consumable';
-        } elseif ($findlog->component_id!='') {
-            $logaction->asset_id = null;
-            $logaction->accessory_id = null;
-            $logaction->consumable_id = null;
-            $logaction->component_id = $findlog->component_id;
-            $logaction->asset_type = 'component';
         }
-
-        $logaction->checkedout_to = $findlog->checkedout_to;
+        $logaction->target_id = $findlog->target_id;
 
         $logaction->note = e(Input::get('note'));
         $logaction->user_id = $user->id;
         $logaction->accepted_at = date("Y-m-d h:i:s");
         $log = $logaction->logaction($logaction_msg);
 
-        $update_checkout = DB::table('asset_logs')
+        $update_checkout = DB::table('action_logs')
         ->where('id', $findlog->id)
         ->update(array('accepted_id' => $logaction->id));
 

app/Http/routes.php

@@ -1,6 +1,7 @@
 <?php
-use App\Models\Statuslabel;
+use App\Models\CheckoutRequest;
 use App\Models\Location;
+use App\Models\Statuslabel;
 
 /*
 |--------------------------------------------------------------------------
@@ -388,6 +389,14 @@ Route::group(
 
 Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function () {
 
+    Route::get('requests',
+        // foreach( CheckoutRequest::with('user')->get() as $requestedItem) {
+        //     echo $requestedItem->user->username . ' requested ' . $requestedItem->requestedItem->name;
+            [
+            'as' => 'requests',
+            'middleware' => 'authorize:admin',
+            'uses' => 'ViewAssetsController@getRequestedIndex'
+            ]);
     # Licenses
     Route::group([ 'prefix' => 'licenses', 'middleware'=>'authorize:licenses.view' ], function () {
 
@@ -858,6 +867,11 @@ Route::group([ 'prefix' => 'account', 'middleware' => ['web', 'auth']], function
         [ 'as' => 'account/request-asset', 'uses' => 'ViewAssetsController@getRequestAsset' ]
     );
 
+    Route::post(
+        'request/{itemType}/{itemId}',
+        [ 'as' => 'account/request-item', 'uses' => 'ViewAssetsController@getRequestItem']
+    );
+
     # Account Dashboard
     Route::get('/', [ 'as' => 'account', 'uses' => 'ViewAssetsController@getIndex' ]);
 
@@ -910,6 +924,12 @@ Route::group(['middleware' => ['web','auth','authorize:reports.view']], function
         'reports/activity',
         [ 'as' => 'reports/activity', 'uses' => 'ReportsController@getActivityReport' ]
     );
+
+    Route::get(
+        'reports/activity/json',
+        [ 'as' => 'api.activity.list', 'uses' => 'ReportsController@getActivityReportDataTable' ]
+    );
+    
     Route::get(
         'reports/unaccepted_assets',
         [ 'as' => 'reports/unaccepted_assets', 'uses' => 'ReportsController@getAssetAcceptanceReport' ]

app/Models/Accessory.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Models;
 
+use App\Models\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
@@ -12,8 +13,9 @@ use Watson\Validating\ValidatingTrait;
  */
 class Accessory extends Model
 {
-    use SoftDeletes;
     use CompanyableTrait;
+    use Loggable;
+    use SoftDeletes;
 
     protected $dates = ['deleted_at'];
     protected $table = 'accessories';
@@ -68,7 +70,7 @@ class Accessory extends Model
     */
     public function assetlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'accessory_id')->where('asset_type', '=', 'accessory')->orderBy('created_at', 'desc')->withTrashed();
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Accessory::class)->orderBy('created_at', 'desc')->withTrashed();
     }
 
 

app/Models/Actionlog.php

@@ -19,88 +19,60 @@ class Actionlog extends Model implements ICompanyableChild
 
     protected $dates = [ 'deleted_at' ];
 
-    protected $table      = 'asset_logs';
+    protected $table      = 'action_logs';
     public $timestamps = true;
-    protected $fillable   = [ 'created_at', 'asset_type','user_id','asset_id','action_type','note','checkedout_to' ];
+    protected $fillable   = [ 'created_at', 'item_type','user_id','item_id','action_type','note','target_id', 'target_type' ];
 
     public function getCompanyableParents()
     {
         return [ 'accessorylog', 'assetlog', 'licenselog', 'consumablelog' ];
     }
 
-    public function assetlog()
+    // Eloquent Relationships below
+    public function item()
+    {
+        return $this->morphTo('item')->withTrashed();
+    }
+
+    public function itemType()
     {
 
-        return $this->belongsTo('\App\Models\Asset', 'asset_id')
-                    ->withTrashed();
+        if($this->item_type == AssetModel::class) {
+            return "model";
+        }
+        return camel_case(class_basename($this->item_type));
     }
 
     public function uploads()
     {
-
-        return $this->belongsTo('\App\Models\Asset', 'asset_id')
+        return $this->morphTo('item')
                     ->where('action_type', '=', 'uploaded')
                     ->withTrashed();
     }
 
-    public function licenselog()
-    {
-
-        return $this->belongsTo('\App\Models\License', 'asset_id')
-                    ->withTrashed();
-    }
-
-    public function componentlog()
-    {
-
-        return $this->belongsTo('\App\Models\Component', 'component_id')
-            ->withTrashed();
-    }
-
-    public function accessorylog()
-    {
-
-        return $this->belongsTo('\App\Models\Accessory', 'accessory_id')
-                    ->withTrashed();
-    }
-
-    public function consumablelog()
-    {
-
-        return $this->belongsTo('\App\Models\Consumable', 'consumable_id')
-                    ->withTrashed();
-    }
-
-    public function adminlog()
-    {
-
-        return $this->belongsTo('\App\Models\User', 'user_id')
-                    ->withTrashed();
-    }
-
     public function userlog()
     {
+        return $this->target();
+    }
 
-        return $this->belongsTo('\App\Models\User', 'checkedout_to')
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id')
                     ->withTrashed();
     }
 
-    public function userasassetlog()
+    public function target()
     {
-
-        return $this->belongsTo('\App\Models\User', 'asset_id')
-            ->withTrashed();
+        return $this->morphTo('target');
     }
 
     public function childlogs()
     {
-
         return $this->hasMany('\App\Models\ActionLog', 'thread_id');
     }
 
     public function parentlog()
     {
-
         return $this->belongsTo('\App\Models\ActionLog', 'thread_id');
     }
 
@@ -141,44 +113,10 @@ class Actionlog extends Model implements ICompanyableChild
     public function getListingOfActionLogsChronologicalOrder()
     {
 
-        return DB::table('asset_logs')
-                 ->select('*')
+        return $this->all()
                  ->where('action_type', '!=', 'uploaded')
-                 ->orderBy('asset_id', 'asc')
+                 ->orderBy('item_id', 'asc')
                  ->orderBy('created_at', 'asc')
                  ->get();
     }
-
-    /**
-       * getLatestCheckoutActionForAssets
-       *
-       * @return mixed
-       * @author  Vincent Sposato <vincent.sposato@gmail.com>
-       * @version v1.0
-       */
-    public function getLatestCheckoutActionForAssets()
-    {
-
-        return DB::table('asset_logs')
-                 ->select(DB::raw('asset_id, MAX(created_at) as last_created'))
-                 ->where('action_type', '=', 'checkout')
-                 ->groupBy('asset_id')
-                 ->get();
-    }
-
-    /**
-       * scopeCheckoutWithoutAcceptance
-       *
-       * @param $query
-       *
-       * @return mixed
-       * @author  Vincent Sposato <vincent.sposato@gmail.com>
-       * @version v1.0
-       */
-    public function scopeCheckoutWithoutAcceptance($query)
-    {
-
-        return $query->where('action_type', '=', 'checkout')
-                     ->where('accepted_id', '=', null);
-    }
 }

app/Models/Asset.php

@@ -1,20 +1,22 @@
 <?php
 namespace App\Models;
 
+use App\Helpers\Helper;
+use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Actionlog;
 use App\Models\Company;
 use App\Models\Location;
+use App\Models\Loggable;
+use App\Models\Requestable;
+use App\Models\Setting;
+use Auth;
 use Config;
+use DateTime;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Log;
 use Parsedown;
 use Watson\Validating\ValidatingTrait;
-use App\Http\Traits\UniqueUndeletedTrait;
-use DateTime;
-use App\Models\Setting;
-use App\Helpers\Helper;
-use Auth;
 
 /**
  * Model for Assets.
@@ -23,7 +25,9 @@ use Auth;
  */
 class Asset extends Depreciable
 {
+    use Loggable;
     use SoftDeletes;
+    use Requestable;
 
   /**
   * The database table used by the model.
@@ -209,10 +213,12 @@ class Asset extends Depreciable
     {
 
         $logaction = new Actionlog();
-        $logaction->asset_id = $this->id;
-        $logaction->checkedout_to = $this->assigned_to;
-        $logaction->asset_type = 'hardware';
+        $logaction->item_type = Asset::class;
+        $logaction->item_id = $this->id;
+        $logaction->target_type = User::class;
+        $logaction->target_id = $this->assigned_to;
         $logaction->note = $note;
+        $logaction->user_id = $admin->id;
         if ($checkout_at!='') {
             $logaction->created_at = \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', date('Y-m-d H:i:s', strtotime($checkout_at)));
         } else {
@@ -225,15 +231,10 @@ class Asset extends Depreciable
             }
         } else {
             // Update the asset data to null, since it's being checked in
-            $logaction->checkedout_to = $asset->assigned_to;
-            $logaction->checkedout_to = '';
-            $logaction->asset_id = $asset->id;
+            $logaction->target_id = '';
             $logaction->location_id = null;
-            $logaction->asset_type = 'hardware';
-            $logaction->note = $note;
-            $logaction->user_id = $admin->id;
         }
-        $logaction->adminlog()->associate($admin);
+        $logaction->user()->associate($admin);
         $log = $logaction->logaction($action);
 
         return $logaction;
@@ -270,8 +271,8 @@ class Asset extends Depreciable
     public function uploads()
     {
 
-        return $this->hasMany('\App\Models\Actionlog', 'asset_id')
-                  ->where('asset_type', '=', 'hardware')
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+                  ->where('item_type', '=', Asset::class)
                   ->where('action_type', '=', 'uploaded')
                   ->whereNotNull('filename')
                   ->orderBy('created_at', 'desc');
@@ -308,8 +309,8 @@ class Asset extends Depreciable
    */
     public function assetlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'asset_id')
-                  ->where('asset_type', '=', 'hardware')
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+                  ->where('item_type', '=', Asset::class)
                   ->orderBy('created_at', 'desc')
                   ->withTrashed();
     }

app/Models/AssetModel.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Models;
 
+use App\Models\Requestable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
@@ -14,6 +15,7 @@ use Watson\Validating\ValidatingTrait;
 class AssetModel extends Model
 {
     use SoftDeletes;
+    use Requestable;
     protected $dates = ['deleted_at'];
     protected $table = 'models';
 
@@ -131,6 +133,22 @@ class AssetModel extends Model
         return $query->whereIn('category_id', $categoryIdListing);
     }
 
+    /**
+     * scopeRequestable
+     * Get all models that are requestable by a user.
+     *
+     * @param       $query
+     *
+     * @return $query
+     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
+     * @version v3.5
+     */
+    public function scopeRequestableModels($query)
+    {
+
+        return $query->where('requestable', '1');
+    }
+
     /**
     * Query builder scope to search on text
     *

app/Models/CheckoutRequest.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CheckoutRequest extends Model
+{
+    //
+    protected $fillable = ['user_id'];
+    protected $table = 'checkout_requests';
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function requestingUser()
+    {
+        return $this->user()->first();
+    }
+
+    public function requestedItem()
+    {
+        return $this->morphTo('requestable');
+    }
+
+    public function itemRequested() // Workaround for laravel polymorphic issue that's not being solved :(
+    {
+        return $this->requestedItem()->first();
+    }
+
+    public function itemType()
+    {
+        return snake_case(class_basename($this->requestable_type));
+    }
+
+    public function location()
+    {
+        if ($this->itemType() == "asset") {
+            $asset = $this->itemRequested();
+            if ($asset->assigneduser && $asset->assetloc) {
+                return $asset->assetloc;
+            } elseif ($asset->defaultLoc) {
+                return $asset->defaultLoc;
+            }
+        }
+        return $this->itemRequested()->location;
+    }
+
+    public function name()
+    {
+        if ($this->itemType() == "asset") {
+            return $this->itemRequested()->showAssetName();
+        }
+        return $this->itemRequested()->name;
+
+    }
+}

app/Models/Component.php

@@ -1,12 +1,13 @@
 <?php
 namespace App\Models;
 
-use App\Models\User;
-use App\Models\ConsumableAssignment;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\Category;
 use App\Models\ActionLog;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\ConsumableAssignment;
+use App\Models\Location;
+use App\Models\Loggable;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
@@ -18,8 +19,9 @@ use Watson\Validating\ValidatingTrait;
  */
 class Component extends Model
 {
-    use SoftDeletes;
     use CompanyableTrait;
+    use Loggable;
+    use SoftDeletes;
 
     protected $dates = ['deleted_at'];
     protected $table = 'components';
@@ -85,7 +87,7 @@ class Component extends Model
     */
     public function assetlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'component_id')->where('asset_type', '=', 'component')->orderBy('created_at', 'desc')->withTrashed();
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Component::class)->orderBy('created_at', 'desc')->withTrashed();
     }
 
 

app/Models/Consumable.php

@@ -1,20 +1,22 @@
 <?php
 namespace App\Models;
 
-use App\Models\User;
-use App\Models\ConsumableAssignment;
-use App\Models\Company;
-use App\Models\Location;
-use App\Models\Category;
 use App\Models\ActionLog;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\ConsumableAssignment;
+use App\Models\Location;
+use App\Models\Loggable;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 
 class Consumable extends Model
 {
-    use SoftDeletes;
     use CompanyableTrait;
+    use Loggable;
+    use SoftDeletes;
 
     protected $dates = ['deleted_at'];
     protected $table = 'consumables';
@@ -85,7 +87,7 @@ class Consumable extends Model
     */
     public function assetlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'consumable_id')->where('asset_type', '=', 'consumable')->orderBy('created_at', 'desc')->withTrashed();
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', Consumable::class)->orderBy('created_at', 'desc')->withTrashed();
     }
 
 

app/Models/License.php

@@ -2,15 +2,16 @@
 namespace App\Models;
 
 use App\Models\Company;
+use App\Models\Loggable;
 use DB;
-use Watson\Validating\ValidatingTrait;
-
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Watson\Validating\ValidatingTrait;
 
 class License extends Depreciable
 {
     use SoftDeletes;
     use CompanyableTrait;
+    use Loggable;
     protected $injectUniqueIdentifier = true;
     use ValidatingTrait;
 
@@ -54,8 +55,8 @@ class License extends Depreciable
     */
     public function assetlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'asset_id')
-            ->where('asset_type', '=', 'software')
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', '=', License::class)
             ->orderBy('created_at', 'desc');
     }
 
@@ -64,8 +65,8 @@ class License extends Depreciable
     */
     public function uploads()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'asset_id')
-            ->where('asset_type', '=', 'software')
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', '=', License::class)
             ->where('action_type', '=', 'uploaded')
             ->whereNotNull('filename')
             ->orderBy('created_at', 'desc');

app/Models/LicenseSeat.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Models;
 
+use App\Models\Loggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -8,6 +9,7 @@ class LicenseSeat extends Model implements ICompanyableChild
 {
     use CompanyableChildTrait;
     use SoftDeletes;
+    use Loggable;
 
     protected $dates = ['deleted_at'];
     protected $guarded = 'id';

app/Models/Loggable.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\CheckoutRequest;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+
+trait Loggable
+{
+
+    /**
+     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
+     * @since [v3.4]
+     * @return \App\Models\Actionlog
+     */
+
+    public function log()
+    {
+        return $this->morphMany(Actionlog::class, 'item');
+    }
+
+    /**
+     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
+     * @since [v3.4]
+     * @return \App\Models\Actionlog
+     */
+    public function logCheckout($note, $target = null /*target is overridable for components*/)
+    {
+        $log = new Actionlog;
+
+        // We need to special case licenses because of license_seat vs license.  So much for clean polymorphism :)
+        if (static::class == LicenseSeat::class) {
+            $log->item_type = License::class;
+            $log->item_id = $this->license_id;
+        } else {
+            $log->item_type = static::class;
+            $log->item_id = $this->id;
+        }
+
+        $log->user_id = Auth::user()->id;
+
+        if (!is_null($this->asset_id) || isset($target)) {
+            $log->target_type = Asset::class;
+            $log->target_id = $this->asset_id;
+        } else if (!is_null($this->assigned_to)) {
+            $log->target_type = User::class;
+            $log->target_id = $this->assigned_to;
+        }
+
+        $item = call_user_func(array($log->target_type, 'find'), $log->target_id);
+        $log->location_id = $item->location_id;
+        $log->note = $note;
+        $log->logaction('checkout');
+
+        return $log;
+    }
+
+    /**
+     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
+     * @since [v3.4]
+     * @return \App\Models\Actionlog
+     */
+    public function logCheckin($note)
+    {
+        $log = new Actionlog;
+        if (static::class == LicenseSeat::class) {
+            $log->item_type = License::class;
+            $log->item_id = $this->license_id;
+        } else {
+            $log->item_type = static::class;
+            $log->item_id = $this->id;
+        }
+        $log->location_id = null;
+        $log->note = $note;
+        $log->user_id = Auth::user()->id;
+        $log->logaction('checkin from');
+
+        return $log;
+    }
+
+    /**
+     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
+     * @since [v3.4]
+     * @return \App\Models\Actionlog
+     */
+    public function logUpload($filename, $note)
+    {
+        $log = new Actionlog;
+        if (static::class == LicenseSeat::class) {
+            $log->item_type = License::class;
+            $log->item_id = $this->license_id;
+        } else {
+            $log->item_type = static::class;
+            $log->item_id = $this->id;
+        }
+        $log->user_id = Auth::user()->id;
+        $log->note = $note;
+        $log->target_id =  null;
+        $log->created_at =  date("Y-m-d h:i:s");
+        $log->filename =  $filename;
+        $log->logaction('uploaded');
+
+        return $log;
+    }
+}

app/Models/Requestable.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\CheckoutRequest;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+
+// $asset->requests
+// $asset->isRequestedBy($user)
+// $asset->whereRequestedBy($user)
+trait Requestable
+{
+
+    public function requests()
+    {
+        return $this->morphMany(CheckoutRequest::class, 'requestable');
+    }
+
+    public function isRequestedBy(User $user)
+    {
+        return $this->requests()
+            ->where('user_id', $user->id)
+            ->exists();
+    }
+
+    public function scopeRequestedBy($query, User $user)
+    {
+        return $query->whereHas('requests', function ($query) use ($user) {
+            $query->where('user_id', $user->id);
+        });
+    }
+
+    public function request()
+    {
+        $this->requests()->save(
+            new CheckoutRequest(['user_id' => Auth::id()])
+        );
+    }
+
+    public function cancelRequest()
+    {
+        $this->requests()->where('user_id', Auth::id())->delete();
+    }
+}

app/Models/User.php

@@ -9,6 +9,7 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Watson\Validating\ValidatingTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Http\Traits\UniqueUndeletedTrait;
+use App\Models\Setting;
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
@@ -146,10 +147,8 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             return config('app.url').'/uploads/avatars/'.$this->avatar;
         }
 
-        if ($this->email) {
-            // Generate the Gravatar hash
+        if ((Setting::getSettings()->load_remote=='1') && ($this->email!='')) {
             $gravatar = md5(strtolower(trim($this->email)));
-            // Return the Gravatar url
             return "//gravatar.com/avatar/".$gravatar;
         }
 
@@ -202,7 +201,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function userlog()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'checkedout_to')->orderBy('created_at', 'DESC')->withTrashed();
+        return $this->hasMany('\App\Models\Actionlog', 'target_id')->orderBy('created_at', 'DESC')->withTrashed();
     }
 
     /**
@@ -255,13 +254,21 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function uploads()
     {
-        return $this->hasMany('\App\Models\Actionlog', 'asset_id')
-            ->where('asset_type', '=', 'user')
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', User::class)
             ->where('action_type', '=', 'uploaded')
             ->whereNotNull('filename')
             ->orderBy('created_at', 'desc');
     }
 
+    /**
+     * Fetch Items User has requested
+     */
+    public function checkoutRequests()
+    {
+        return $this->belongsToMany(Asset::class, 'checkout_requests');
+    }
+
     public function throttle()
     {
         return $this->hasOne('\App\Models\Throttle');

app/Providers/AuthServiceProvider.php

@@ -255,6 +255,12 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        $gate->define('components.checkout', function ($user) {
+            if (($user->hasAccess('components.checkout')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
         // 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'))) {

config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.4.0',
-  'hash_version' => 'v3.4.0-9-g67315d8',
+  'app_version' => 'v3.5-beta',
+  'hash_version' => 'v3.5-29-g6dc143d',
 );

database/factories/ModelFactory.php

@@ -268,10 +268,11 @@ $factory->defineAs(App\Models\Actionlog::class, 'asset-checkout', function (Fake
   return [
     'user_id'      	=> 1,
     'action_type' 		=> 'checkout',
-    'asset_id' 		=> $faker->numberBetween(1, 10),
-    'checkedout_to' => 1,
+    'item_id' 		=> $faker->numberBetween(1, 10),
+    'target_id' => 1,
+    'target_type' => 'App\\Models\\User',
     'created_at'  => $faker->dateTime(),
-    'asset_type'  => 'hardware',
+    'item_type'  => 'App\\Models\\Asset',
     'note' 			=> $faker->sentence,
     'user_id' 			=> '1',
   ];

database/migrations/2015_07_29_230054_add_thread_id_to_asset_logs_table.php

@@ -64,39 +64,39 @@
         public function up()
         {
 
-            if (!Schema::hasColumn('asset_logs', 'thread_id')) {
+            // if (!Schema::hasColumn('asset_logs', 'thread_id')) {
 
-                Schema::table( 'asset_logs', function ( Blueprint $table ) {
+            //     Schema::table( 'asset_logs', function ( Blueprint $table ) {
 
-                    $table->integer( 'thread_id' )
-                          ->nullable()
-                          ->default( null );
-                    $table->index( 'thread_id' );
-                } );
-            }
+            //         $table->integer( 'thread_id' )
+            //               ->nullable()
+            //               ->default( null );
+            //         $table->index( 'thread_id' );
+            //     } );
+            // }
 
-            $this->actionlog = new App\Models\Actionlog();
-            $this->assetLogs = $this->actionlog->getListingOfActionLogsChronologicalOrder();
+            // $this->actionlog = new App\Models\Actionlog();
+            // $this->assetLogs = $this->actionlog->getListingOfActionLogsChronologicalOrder();
 
-            foreach ($this->assetLogs as $assetLog) {
+            // foreach ($this->assetLogs as $assetLog) {
 
-                if ($this->hasAssetChanged( $assetLog )) {
-                    $this->resetCurrentAssetInformation( $assetLog );
-                }
+            //     if ($this->hasAssetChanged( $assetLog )) {
+            //         $this->resetCurrentAssetInformation( $assetLog );
+            //     }
 
-                if ($this->hasBegunNewChain( $assetLog )) {
-                    $this->startOfCurrentThread = false;
-                    continue;
-                }
+            //     if ($this->hasBegunNewChain( $assetLog )) {
+            //         $this->startOfCurrentThread = false;
+            //         continue;
+            //     }
 
-                $this->updateAssetLogWithThreadInformation( $assetLog );
+            //     $this->updateAssetLogWithThreadInformation( $assetLog );
 
-                if ($this->hasReachedEndOfChain( $assetLog )
-                ) {
-                    $this->clearCurrentAssetInformation();
-                }
+            //     if ($this->hasReachedEndOfChain( $assetLog )
+            //     ) {
+            //         $this->clearCurrentAssetInformation();
+            //     }
 
-            }
+            // }
         }
 
 

database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php

@@ -12,6 +12,10 @@ class MakePurchaseCostNullable extends Migration
      */
     public function up()
     {
+
+        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost',8,2)->nullable()->default(null)->change();
         });

database/migrations/2016_09_01_141051_add_requestable_to_asset_model.php

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

database/migrations/2016_09_02_001448_create_checkout_requests_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCheckoutRequestsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('checkout_requests', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('user_id');
+            $table->integer('requestable_id');
+            $table->string('requestable_type');
+            $table->integer('quantity')->default(1);
+            $table->timestamps();
+
+            $table->unique(['user_id', 'requestable_id', 'requestable_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('checkout_requests');
+    }
+}

database/migrations/2016_09_04_180400_create_actionlog_table.php

@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateActionlogTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('action_logs')) {
+            Schema::create('action_logs', function (Blueprint $table) {
+                $table->increments('id');
+                $table->integer('user_id')->nullable();
+                $table->string('action_type');
+                $table->integer('target_id')->nullable();  // Was checkedout_to
+                $table->string('target_type')->nullable(); // For polymorphic thingies
+                $table->integer('location_id')->nullable();
+                $table->text('note')->nullable();
+                $table->text('filename')->nullable();
+                $table->string('item_type');
+                $table->integer('item_id');  // Replaces asset_id, accessory_id, etc.
+                $table->date('expected_checkin')->nullable()->default(null);
+                $table->integer('accepted_id')->nullable();
+                $table->timestamps();
+                $table->softDeletes();
+
+                $table->integer('thread_id')
+                    ->nullable()
+                    ->default(null);
+                $table->index('thread_id');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('action_logs');
+    }
+}

database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php

@@ -0,0 +1,78 @@
+<?php
+
+use App\Models\Actionlog;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class MigrateAssetLogToActionLog extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        $logs = DB::table('asset_logs')->get();
+
+        foreach ($logs as $log) {
+            // protected $fillable   = [ 'created_at', 'asset_type','user_id','asset_id','action_type','note','checkedout_to' ];
+            $a = new Actionlog(compact($log));
+            // var_dump($log);
+            $a->user_id = $log->user_id;
+
+            if (!is_null($log->asset_id)) {
+                $a->item_id = $log->asset_id;
+                if ($log->asset_type == "hardware") {
+                    $a->item_type = 'App\\Models\\Asset';
+                } else {
+                    $a->item_type = 'App\\Models\\License';
+                }
+            }
+            if (!is_null($log->accessory_id)) {
+                $a->item_id = $log->accessory_id;
+                $a->item_type = 'App\\Models\\Accessory';
+            } else if (!is_null($log->consumable_id)) {
+                $a->item_id = $log->consumable_id;
+                $a->item_type = 'App\\Models\\Consumable';
+            } else if (!is_null($log->component_id)) {
+                $a->item_id = $log->component_id;
+                $a->item_type = 'App\\Models\\Component';
+            }
+            $a->action_type = $log->action_type;
+            // $a->checkout_to = $log->checkout_to;
+            if(!is_null($log->checkedout_to)) {
+                $a->target_id = $log->checkedout_to;
+                $a->target_type = User::class;
+            }
+            if(!is_null($log->accepted_id)) {
+                $a->target_id = $log->accepted_id;
+                $a->target_type = User::class;
+            }
+            $a->location_id         = $log->location_id;
+            $a->created_at          = $log->created_at;
+            $a->updated_at          = $log->updated_at;
+            $a->deleted_at          = $log->deleted_at;
+            $a->note                = $log->note;
+            $a->expected_checkin    = $log->expected_checkin;
+            $a->thread_id           = $log->thread_id;
+            $a->accepted_id         = $log->accepted_id;
+
+            $a->save();
+
+        }
+        // dd($logs);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2016_09_19_235935_fix_fieldtype_for_target_type.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixFieldtypeForTargetType extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('action_logs', function ($table) {
+            $table->string('target_type')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('action_logs', function ($table) {
+            $table->integer('target_type')->nullable()->default(null)->change();
+        });
+    }
+}

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

@@ -12,7 +12,8 @@ return array(
     'edit'  					=> 'Edit Asset',
 	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
-    'requestable'				=> 'Requestable',
+    'requestable'               => 'Requestable',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Restore Asset',
     'pending'  					=> 'Pending',
     'undeployable'  			=> 'Undeployable',

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

@@ -69,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Asset was not requested, please try again',
         'success' 		=> 'Asset requested successfully.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'File(s) not uploaded. Please try again.',
         'success' => 'File(s) successfully uploaded.',
         'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
     ),
 
     'update' => array(

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
     'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',

resources/lang/en/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reports',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/views/account/requestable-assets.blade.php

@@ -13,86 +13,160 @@
 {{-- Page content --}}
 @section('content')
 
-
 <div class="row">
     <div class="col-md-12">
 
-        <div class="box box-default">
-            <div class="box-body">
+        <div class="nav-tabs-custom">
+            <ul class="nav nav-tabs">
+                <li class="active">
+                    <a href="#assets" data-toggle="tab" title="{{ trans('general.assets') }}">{{ trans('general.assets') }}</a>
+                </li>
+                <li>
+                    <a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}</a>
+                </li>
+            </ul>
+            <div class="tab-content">
+                <div class="tab-pane fade in active" id="assets">
 
-                @if ($assets->count() > 0)
+                    @if ($assets->count() > 0)
 
-                <div class="table-responsive">
-                <table class="table table-striped">
+                    <div class="table-responsive">
+                        <table class="table table-striped">
+                            <thead>
+                                <tr role="row">
+                                    <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
+                                    <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.serial') }}</th>
+                                    <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.location') }}</th>
+                                    <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.status') }}</th>
+                                    <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+                                    <th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach ($assets as $asset)
 
-                    <thead>
-                        <tr role="row">                            
-                            <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
-                            <th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.serial') }}</th>
-                            <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.location') }}</th>
-                            <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.status') }}</th>
-                            <th class="col-md-2" bSortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
-                            <th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
+                                <tr>
+                                    <form action="{{route('account/request-item', ['itemType' => 'asset', 'itemId' => $asset->id])}}" method="POST" accept-charset="utf-8">
+                                        {{ csrf_field() }}
+                                        <td>{{ $asset->model->name }}</td>
 
-                        @foreach ($assets as $asset)
-                        <tr>
-                            <td>{{ $asset->model->name }}</td>
+                                        @if (\App\Models\Setting::getSettings()->display_asset_name)
+                                            <td>{{ $asset->name }}</td>
+                                        @endif
 
-                            @if (\App\Models\Setting::getSettings()->display_asset_name)
-                                <td>{{ $asset->name }}</td>
-                            @endif
+                                        <td>{{ $asset->serial }}</td>
 
-                            <td>{{ $asset->serial }}</td>
+                                        <td>
+                                            @if ($asset->assigneduser && $asset->assetloc)
+                                                    {{ $asset->assetloc->name }}
+                                            @elseif ($asset->defaultLoc)
+                                                    {{ $asset->defaultLoc->name }}
+
+                                            @endif
+
+                                        </td>
+                                         @if ($asset->assigned_to != '' && $asset->assigned_to > 0)
+                                            <td>Checked out</td>
+                                        @else
+                                        <td>{{ trans('admin/hardware/general.requestable') }}</td>
+                                        @endif
+
+                                        <td>{{ $asset->expected_checkin }}</td>
 
 
-
-                            <td>
-                                @if ($asset->assigneduser && $asset->assetloc)
-                                        {{ $asset->assetloc->name }}
-                                @elseif ($asset->defaultLoc)
-                                        {{ $asset->defaultLoc->name }}
-
-                                @endif
-
-                            </td>
-                             @if ($asset->assigned_to != '' && $asset->assigned_to > 0)
-                                <td>Checked out</td>
-                            @else
-                            <td>{{ trans('admin/hardware/general.requestable') }}</td>
-                            @endif
-                            
-
-                            <td>{{ $asset->expected_checkin }}</td>
-                            
-                            
-                            <td>
-                                <a href="{{ route('account/request-asset', $asset->id) }}" class="btn btn-info btn-sm" title="{{ trans('button.request') }}">{{ trans('button.request') }}</a>
-                            </td>
-
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-
-                @else
-                <div class="col-md-12">
-                    <div class="alert alert-info alert-block">
-                        <i class="fa fa-info-circle"></i>
-                        {{ trans('general.no_results') }}
+                                        <td>
+                                            @if ($asset->isRequestedBy(Auth::user()))
+                                                {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
+                                            @else
+                                                {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
+                                            @endif
+                                        </td>
+                                    </form>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
                     </div>
+
+
+                    @else
+                    <div class="col-md-12">
+                        <div class="alert alert-info alert-block">
+                            <i class="fa fa-info-circle"></i>
+                            {{ trans('general.no_results') }}
+                        </div>
+                    </div>
+
+
+                    @endif
                 </div>
 
+                <div class="tab-pane fade" id="models">
 
-                @endif
+                    @if ($models->count() > 0)
+                    <h4>Requestable Models</h4>
+                    <table class="table table-striped">
+                        <thead>
+                            <tr role="row">
+                                <th class="col-md-6" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
+                                <th class="col-md-3" bSortable="true">{{ trans('admin/accessories/general.remaining') }}</th>
+                                <th class="col-md-2" bSortable="true">{{ trans('general.quantity') }}</th>
+                                <th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
+                            </tr>
+                    </thead>
 
-            </div>
-        </div>
-    </div>
-</div>
+                        <tbody>
+                            @foreach($models as $requestableModel)
+
+                                <tr>
+                                     <form  action="{{route('account/request-item', ['itemType' => 'asset_model', 'itemId' => $requestableModel->id])}}"
+                                            method="POST"
+                                            accept-charset="utf-8"
+                                    >
+                                        {{ csrf_field() }}
+                                        <td>{{$requestableModel->name}}</td>
+                                        <td>{{$requestableModel->assets()->where('requestable', '1')->count()}}</td>
+                                        <td><input type="text" name="request-quantity" value=""></td>
+                                        <td>
+                                            @if ($requestableModel->isRequestedBy(Auth::user()))
+                                                {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
+                                            @else
+                                                {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
+                                            @endif
+                                        </td>
+                                    </form>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+
+                    @else
+                    <div class="col-md-12">
+                        <div class="alert alert-info alert-block">
+                            <i class="fa fa-info-circle"></i>
+                            {{ trans('general.no_results') }}
+                        </div>
+                    </div>
+                    @endif
+                </div>
+
+            </div> <!-- .tab-content-->
+        </div> <!-- .nav-tabs-custom -->
+    </div> <!-- .col-md-12> -->
+</div> <!-- .row -->
 
 
 
+@stop
+@section('moar_scripts')
+<script>
+
+    $( "a[name='Request']").click(function(event) {
+        // event.preventDefault();
+        quantity = $(this).closest('td').siblings().find('input').val();
+        currentUrl = $(this).attr('href');
+        // $(this).attr('href', currentUrl + '?quantity=' + quantity);
+        // alert($(this).attr('href'));
+    });
+</script>
 @stop

resources/views/account/view-assets.blade.php

@@ -231,7 +231,7 @@ View Assets for  {{ $user->fullName() }}
         @endif
 
       <div class="box-body">
-        @if (count($user->userlog) > 0)
+        @if (count($userlog) > 0)
         <div class="table-responsive">
         <table class="table table-striped" id="example">
             <thead>
@@ -244,68 +244,47 @@ View Assets for  {{ $user->fullName() }}
                 </tr>
             </thead>
             <tbody>
-                @foreach ($user->userlog as $log)
+                @foreach ($userlog as $log)
                 <tr>
                     <td class="text-center">
-                        @if (($log->assetlog) && ($log->asset_type=="hardware"))
+                        @if ($log->itemType()=="asset")
                             <i class="fa fa-barcode"></i>
-                        @elseif (($log->accessorylog) && ($log->asset_type=="accessory"))
+                        @elseif ($log->itemType()=="accessory")
                             <i class="fa fa-keyboard-o"></i>
-                        @elseif (($log->consumablelog) && ($log->asset_type=="consumable"))
+                        @elseif ($log->itemType()=="consumable")
                             <i class="fa fa-tint"></i>
-                        @elseif (($log->licenselog) && ($log->asset_type=="software"))
+                        @elseif ($log->itemType()=="license")
                             <i class="fa fa-floppy-o"></i>
                         @else
-                        <i class="fa fa-times"></i>
+                            <i class="fa fa-times"></i>
                         @endif
 
                     </td>
-                    <td>{{ $log->action_type }}</td>
                     <td>
-
-                        @if (($log->assetlog) && ($log->asset_type=="hardware"))
-
-                            @if ($log->assetlog->deleted_at=='')
-
-                                    {{ $log->assetlog->showAssetName() }}
-
+                        {{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
+                    </td>
+                    <td>
+                        @if ($log->itemType()=="asset")
+                            @if ($log->item->deleted_at=='')
+                                {{ $log->item->showAssetName() }}
                             @else
-                                <del>{{ $log->assetlog->showAssetName() }}</del> (deleted)
+                                <del>{{ $log->item->showAssetName() }}</del> (deleted)
                             @endif
 
-                        @elseif (($log->licenselog) && ($log->asset_type=="software"))
-
-                            @if ($log->licenselog->deleted_at=='')
-
-                                    {{ $log->licenselog->name }}
-
-                            @else
-                                <del>{{ $log->licenselog->name }}</del> (deleted)
-                            @endif
-
-                         @elseif (($log->consumablelog) && ($log->asset_type=="consumable"))
-
-                             @if ($log->consumablelog->deleted_at=='')
-                                {{ $log->consumablelog->name }}
+                        @elseif (!is_null($log->itemType()))
+                             @if ($log->item->deleted_at=='')
+                                {{ $log->item->name }}
                              @else
-                                 <del>{{ $log->consumablelog->name }}</del> (deleted)
+                                 <del>{{ $log->item->name }}</del> (deleted)
                              @endif
-
-                        @elseif (($log->accessorylog) && ($log->asset_type=="accessory"))
-                            @if ($log->accessorylog->deleted_at=='')
-                                {{ $log->accessorylog->name }}
-                            @else
-                                <del>{{ $log->accessorylog->name }}</del> (deleted)
-                            @endif
-
                          @else
                              {{ trans('general.bad_data') }}
                         @endif
 
                     </td>
                     <td>
-                        @if ($log->adminlog)
-                        {{ $log->adminlog->fullName() }}
+                        @if ($log->user)
+                        {{ $log->user->fullName() }}
                         @endif
                     </td>
                     <td>{{ $log->created_at }}</td>

resources/views/admin/requested-assets.blade.php

@@ -0,0 +1,84 @@
+@extends('layouts/default')
+
+@section('title0')
+  {{ trans('admin/hardware/general.requested') }}
+  {{ trans('general.assets') }}
+@stop
+
+{{-- Page title --}}
+@section('title')
+    @yield('title0')  @parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+<div class="row">
+    <div class="col-md-12">
+
+        @if ($requestedItems->count() > 0)
+
+        <div class="table-responsive">
+            <table class="table table-striped">
+                <thead>
+                    <tr role="row">
+                        <th class="col-md-1">Item Type</th>
+                        <th class="col-md-1">Item Name</th>
+                        <th class="col-md-1" bSortable="true">{{ trans('admin/hardware/table.location') }}</th>
+                        <th class="col-md-1" bSortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
+                        <th class="col-md-1" bSortable="true">Requesting User</th>
+                        <th class="col-md-1">Requested Date</th>
+                        <th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($requestedItems as $request)
+
+                    <tr>
+                       
+                        <form action="#" method="POST" accept-charset="utf-8">
+                            {{ csrf_field() }}
+                            <td>{{ $request->itemType() }}</td>
+                            <td>{{ $request->name() }}</td>
+                            @if ($request->location())
+                            <td>{{ $request->location()->name }}</td>
+                            @else
+                            <td></td>
+                            @endif
+
+                            <td>
+                            @if ($request->itemType() == "asset") 
+                                {{ $request->itemRequested()->expected_checkin }}
+                            @else
+                                "N/A"
+                            @endif
+                            </td>
+                            <td>{{ $request->requestingUser()->fullName() }}</td>
+                            <td>{{$request->created_at}}</td>
+                            <td>
+                            </td>
+                        </form>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+
+
+        @else
+        <div class="col-md-12">
+            <div class="alert alert-info alert-block">
+                <i class="fa fa-info-circle"></i>
+                {{ trans('general.no_results') }}
+            </div>
+        </div>
+
+
+        @endif
+    </div>
+    </div> <!-- .col-md-12> -->
+</div> <!-- .row -->
+
+
+
+@stop

resources/views/dashboard.blade.php

@@ -88,96 +88,29 @@
           <div class="box-header with-border">
             <h3 class="box-title">{{ trans('general.recent_activity') }}</h3>
             <div class="box-tools pull-right">
-              <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                <a href="{{ route('reports/activity') }}"><i class="fa fa-ellipsis-h"></i></a>
             </div>
           </div><!-- /.box-header -->
           <div class="box-body">
             <div class="row">
               <div class="col-md-12">
                <div class="table-responsive">
-                <table class="table table-hover table-fixed break-word">
+                <table
+                    class="table table-striped"
+                    name="activityReport"
+                    id="table"
+                    data-url="{{route('api.activity.list', ['limit' => 20]) }}">
                 <thead>
                     <tr>
-                        <th></th>
-                        <th class="col-md-2"><span class="line"></span>{{ trans('general.date') }}</th>
-                        <th class="col-md-2"><span class="line"></span>{{ trans('general.admin') }}</th>
-                        <th class="col-md-2"><span class="line"></span>{{ trans('table.actions') }}</th>
-                        <th class="col-md-3"><span class="line"></span>{{ trans('table.item') }}</th>
-                        <th class="col-md-3"><span class="line"></span>To</th>
+                        <th data-field="icon" style="width: 40px;" class="hidden-xs"></th>
+                        <th class="col-sm-2" data-field="created_at">{{ trans('general.date') }}</th>
+                        <th class="col-sm-2" data-field="admin">{{ trans('general.admin') }}</th>
+                        <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
+                        <th class="col-sm-4" data-field="item">{{ trans('general.item') }}</th>
+                        <th class="col-sm-2" data-field="target">To</th>
                     </tr>
                 </thead>
-                <tbody>
-                @if (count($recent_activity) > 0)
-                  @foreach ($recent_activity as $activity)
-                    <tr>
-                        <td>
-                            @if ($activity->asset_type=="hardware")
-                                <i class="fa fa-barcode"></i>
-                            @elseif ($activity->asset_type=="accessory")
-                                <i class="fa fa-keyboard-o"></i>
-                            @elseif ($activity->asset_type=="consumable")
-                                <i class="fa fa-tint"></i>
-                            @elseif ($activity->asset_type=="license")
-                                <i class="fa fa-floppy-o"></i>
-                            @elseif ($activity->asset_type=="component")
-                                <i class="fa fa-hdd-o"></i>
-                            @else
-                                <i class="fa fa-paperclip"></i>
-                            @endif
-                        </td>
-                       <td>{{ date("M d, Y g:iA", strtotime($activity->created_at)) }}</td>
-                       <td>
-                                 @if ($activity->action_type!='requested')
-                                     @if ($activity->adminlog)
-                                        <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
-                                     @else
-                                        Deleted Admin
-                                     @endif
-                                 @endif
 
-                                 </td>
-                        <td>
-                            {{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
-                        </td>
-                       <td>
-                           @if (($activity->assetlog) && ($activity->asset_type=="hardware"))
-                              <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->asset_tag }} - {{ $activity->assetlog->showAssetName() }}</a>
-                            @elseif (($activity->licenselog) && ($activity->asset_type=="software"))
-                              <a href="{{ route('view/license', $activity->asset_id) }}">{{ $activity->licenselog->name }}</a>
-                                  @elseif (($activity->consumablelog) && ($activity->asset_type=="consumable"))
-                                <a href="{{ route('view/consumable', $activity->consumable_id) }}">{{ $activity->consumablelog->name }}</a>
-                            @elseif (($activity->accessorylog) && ($activity->asset_type=="accessory"))
-                              <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") && ($activity->asset_type=="hardware"))
-                                   <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
-
-                            @endif
-
-                            </td>
-
-                       <td>
-                        @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)
-                                <a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
-                            @endif
-                       @elseif ($activity->userlog)
-                          <a href="{{ route('view/user', $activity->checkedout_to) }}">{{ $activity->userlog->fullName() }}</a>
-
-                       @endif
-
-                      </td>
-
-
-                    </tr>
-                   @endforeach
-                @endif
-                </tbody>
                 </table>
                </div><!-- /.responsive -->
               </div><!-- /.col -->
@@ -241,8 +174,24 @@
 
 </script>
 
+    <script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
+    <script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+    <script type="text/javascript">
+        $('#table').bootstrapTable({
+            classes: 'table table-responsive table-no-bordered',
+            undefinedText: '',
+            iconsPrefix: 'fa',
+            showRefresh: false,
+            search: false,
+            pagination: false,
+            sidePagination: 'server',
+            sortable: false,
+            showMultiSort: false,
+            cookie: false,
+            mobileResponsive: true,
+        });
 
-
+    </script>
 @stop
 
 

resources/views/emails/asset-canceled.blade.php

@@ -0,0 +1,12 @@
+@extends('emails/layouts/default')
+
+@section('content')
+
+<p>A user has canceled an item request on the <a href="{{ config('app.url') }}">{{ \App\Models\Setting::getSettings()->site_name }} website</a>. </p>
+
+<p>User: <a href="{{ config('app.url') }}/admin/users/{{ $user_id }}/view">{{ $requested_by }}</a><br>
+Item: <a href="{{ $item_url }}">{{ $item_name }}</a> ({{ $item_type }}) <br>
+Canceled: {{ $requested_date }}
+</p>
+
+@stop

resources/views/emails/asset-requested.blade.php

@@ -2,11 +2,14 @@
 
 @section('content')
 
-<p>A user has requested an asset on the <a href="{{ config('app.url') }}">{{ \App\Models\Setting::getSettings()->site_name }} website</a>. </p>
+<p>A user has requested an item on the <a href="{{ config('app.url') }}">{{ \App\Models\Setting::getSettings()->site_name }} website</a>. </p>
 
 <p>User: <a href="{{ config('app.url') }}/admin/users/{{ $user_id }}/view">{{ $requested_by }}</a><br>
-Asset: <a href="{{ config('app.url') }}/hardware/{{ $asset_id }}/view">{{ $asset_name }}</a> ({{ $asset_type }}) <br>
+Item: <a href="{{ $item_url }}">{{ $item_name }}</a> ({{ $item_type }}) <br>
 Requested: {{ $requested_date }}
+@if ($item_quantity > 1)
+Quantity: {{ $item_quantity}}
+@endif
 </p>
 
 @stop

resources/views/hardware/qr-view.blade.php

@@ -273,19 +273,19 @@
                     <td>{{ $log->created_at }}</td>
                     <td>
                         @if (isset($log->user_id))
-                        {{ $log->adminlog->fullName() }}
+                        {{ $log->user->fullName() }}
                         @endif
                     </td>
                     <td>{{ $log->action_type }}</td>
                     <td>
-                        @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
+                        @if ((isset($log->target_id)) && ($log->target_id!=0) && ($log->target_id!=''))
 
-	                        @if ($log->userlog->deleted_at=='')
-		                        <a href="{{ route('view/user', $log->checkedout_to) }}">
-		                        {{ $log->userlog->fullName() }}
+	                        @if ($log->target->deleted_at=='')
+		                        <a href="{{ route('view/user', $log->target_id) }}">
+		                        {{ $log->user->fullName() }}
 		                         </a>
 		                    @else
-		 						<del>{{ $log->userlog->fullName() }}</del>
+		 						<del>{{ $log->user->fullName() }}</del>
 	                        @endif
 
                         @endif

resources/views/hardware/view.blade.php

@@ -513,26 +513,41 @@
                       <tr>
                         <td>{{ $log->created_at }}</td>
                         <td>
-                            @if (isset($log->adminlog))
-                            {{ $log->adminlog->fullName() }}
-                            @else
-                            Deleted Admin
+                            @if ($log->action_type != 'requested')
+                                @if (isset($log->user))
+                                    {{ $log->user->fullName() }}
+                                @else
+                                    Deleted Admin
+                                @endif
                             @endif
                         </td>
                         <td>{{ $log->action_type }}</td>
                         <td>
-                          @if ((isset($log->checkedout_to)) && ($log->checkedout_to!=0) && ($log->checkedout_to!=''))
+                          @if ($log->action_type=='uploaded')
 
-                            @if ($log->userlog)
+                            {{ $log->filename }}
+                          @elseif ((isset($log->target_id)) && ($log->target_id!=0) && ($log->target_id!=''))
 
-                              @if ($log->userlog->deleted_at=='')
-                                <a href="{{ route('view/user', $log->checkedout_to) }}">
-                                {{ $log->userlog->fullName() }}
+
+                            @if ($log->target instanceof \App\Models\User)
+
+                              @if ($log->target->deleted_at=='')
+                                <a href="{{ route('view/user', $log->target_id) }}">
+                                {{ $log->target->fullName() }}
                                 </a>
 
                               @else
-                                <del>{{ $log->userlog->fullName() }}</del>
+                                <del>{{ $log->target->fullName() }}</del>
                               @endif
+                            @elseif($log->target instanceof \App\Models\Asset) 
+                              @if ($log->target->deleted_at=='')
+                                <a href="{{ route('view/hardware', $log->target_id) }}">
+                                {{ $log->target->showAssetName() }}
+                                </a>
+
+                              @else
+                                <del>{{ $log->target->showAssetName() }}</del>
+                              @endif                         
                             @else
                               Deleted User
                             @endif

resources/views/layouts/debug.blade.php

@@ -0,0 +1,15 @@
+@extends('layouts/basic')
+
+
+
+
+
+
+{{-- Page content --}}
+@section('content')
+
+<pre>
+    <?php print_r($data); ?>
+</pre>
+
+@stop

resources/views/licenses/view.blade.php

@@ -370,14 +370,14 @@
                           <td>{{ $log->created_at }}</td>
                           <td>
                               @if (isset($log->user_id))
-                              {{ $log->adminlog->fullName() }}
+                              <a href="{{ route('view/user', $log->user_id)}}">{{ $log->user->fullName() }}</a>
                               @endif
                           </td>
                           <td>{{ $log->action_type }}</td>
 
                           <td>
-                              @if (($log->userlog) && ($log->userlog->id!='0'))
-                              <a href="{{ route('view/user', $log->checkedout_to) }}">
+                              @if (($log->target) && ($log->target->id!='0'))
+                              <a href="{{ route('view/user', $log->target_id) }}">
                               {{ $log->userlog->fullName() }}
                               </a>
 

resources/views/models/edit.blade.php

@@ -118,6 +118,15 @@
                     </div>
                 </div>
 
+                       <!-- Requestable -->
+                <div class="form-group">
+                    <div class="col-sm-offset-3 col-sm-10">
+                        <label>
+                            <input type="checkbox" value="1" name="requestable" id="requestable" class="minimal" {{ Input::old('requestable', $model->requestable) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/models/general.requestable') }}
+                        </label>
+                    </div>
+                </div>
+
                 <!-- Image -->
                 @if ($model->image)
                     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">

resources/views/reports/activity.blade.php

@@ -17,67 +17,28 @@
   <div class="box box-default">
     <div class="box-body">
 
-      <div class="table-responsive">
-          <table
-          name="activityReport"
-          id="table"
-          class="table table-striped"
-          data-cookie="true"
-          data-click-to-select="true"
-          data-cookie-id-table="activityReportTable">
-
+        <table
+                name="activityReport"
+                data-toolbar="#toolbar"
+                class="table table-striped"
+                id="table"
+                data-url="{{ route('api.activity.list') }}"
+                data-cookie="true"
+                data-cookie-id-table="activityReportTable">
             <thead>
-                <tr role="row">
-                <th class="col-sm-1">{{ trans('general.admin') }}</th>
-                <th class="col-sm-1"><span class="line"></span>{{ trans('general.action') }}</th>
-                <th class="col-sm-1"><span class="line"></span>{{ trans('general.type') }}</th>
-                <th class="col-sm-1"><span class="line"></span>{{ trans('general.item') }}</th>
-                <th class="col-sm-1"><span class="line"></span>{{ trans('general.user') }}</th>
-                <th class="col-sm-1"><span class="line"></span>{{ trans('general.date') }}</th
-            </tr>
-        </thead>
-        <tbody>
-
-            @foreach ($log_actions as $log_action)
             <tr>
-                <td><a href="../admin/users/{{ $log_action->adminlog->id }}/view">{{ $log_action->adminlog->fullName() }}</a></td>
-                <td>{{ $log_action->action_type }}</td>
-                <td>
-    	            @if ($log_action->asset_type=="hardware")
-    	            	Asset
-    	            @elseif ($log_action->asset_type=="software")
-    	            	License
-    	            @elseif ($log_action->asset_type=="accessory")
-    	            	Accessory
-                    @elseif ($log_action->asset_type=="consumable")
-        	            Consumable
-    	            @endif
-                </td>
-
-                <td>
-                @if (($log_action->assetlog) && ($log_action->asset_type=="hardware"))
-                     {{ $log_action->assetlog->showAssetName() }}
-                 @elseif (($log_action->licenselog) && ($log_action->asset_type=="software"))
-                     {{ $log_action->licenselog->name }}
-                 @elseif (($log_action->consumablelog) && ($log_action->asset_type=="consumable"))
-                     {{ $log_action->consumablelog->name }}
-                 @elseif (($log_action->accessorylog) && ($log_action->asset_type=="accessory"))
-                     {{ $log_action->accessorylog->name }}
-                 @else
-                     {{ trans('general.bad_data') }}
-                 @endif
-                </td>
-                <td>
-    	            @if ($log_action->userlog)
-    	            	<a href="../admin/users/{{ $log_action->userlog->id }}/view">{{ $log_action->userlog->fullName() }}</a>
-    	            @endif
-                </td>
-
-                <td>{{ $log_action->created_at }}</td>
+                <th class="col-sm-1" data-field="admin">{{ trans('general.admin') }}</th>
+                <th class="col-sm-1" data-field="action_type">{{ trans('general.action') }}</th>
+                <th class="col-sm-1" data-field="item_type">{{ trans('general.type') }}</th>
+                <th class="col-sm-1" data-field="item">{{ trans('general.item') }}</th>
+                <th class="col-sm-1" data-field="target">To</th>
+                <th class="col-sm-1" data-field="created_at">{{ trans('general.date') }}</th>
+                <th class="col-sm-1" data-field="note">{{ trans('general.notes') }}</th>
             </tr>
-            @endforeach
-        </tbody>
-    </table>
+            </thead>
+
+        </table>
+
 
     </div>
     </div>
@@ -99,30 +60,39 @@
         iconsPrefix: 'fa',
         showRefresh: true,
         search: true,
-        pageSize: {{ \App\Models\Setting::getSettings()->per_page }},
+        pageSize: 100,
         pagination: true,
-        sidePagination: 'client',
+        sidePagination: 'server',
         sortable: true,
+        showMultiSort: true,
         cookie: true,
+        cookieExpire: '2y',
         mobileResponsive: true,
         showExport: true,
         showColumns: true,
         exportDataType: 'all',
-        exportTypes: ['csv', 'txt','json', 'xml'],
+        exportTypes: ['csv', 'excel', 'txt','json', 'xml'],
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",
         paginationPreText: "{{ trans('general.previous') }}",
         paginationNextText: "{{ trans('general.next') }}",
-        pageList: ['10','25','50','100','150','200'],
+        pageList: ['10','25','50','100','150','200','500','1000'],
+        exportOptions: {
+            fileName: 'assets-export-' + (new Date()).toISOString().slice(0,10),
+        },
         icons: {
             paginationSwitchDown: 'fa-caret-square-o-down',
             paginationSwitchUp: 'fa-caret-square-o-up',
+            sort: 'fa fa-sort-amount-desc',
+            plus: 'fa fa-plus',
+            minus: 'fa fa-minus',
             columns: 'fa-columns',
             refresh: 'fa-refresh'
         },
 
     });
+
 </script>
 @stop
 

resources/views/reports/custom.blade.php

@@ -34,6 +34,13 @@
       <div class="box-body">
         <div class="col-md-3">
 
+        <div class="checkbox col-md-12">
+          <label>
+            {{ Form::checkbox('company_name', '1') }}
+            {{ trans('general.company') }}
+          </label>
+        </div>
+
         <div class="checkbox col-md-12">
         	<label>
         	{{ Form::checkbox('asset_tag', '1') }}

resources/views/users/view.blade.php

@@ -385,13 +385,13 @@
                     @foreach ($userlog as $log)
                     <tr>
                       <td class="text-center">
-                        @if (($log->assetlog) && ($log->asset_type=="hardware"))
+                        @if ($log->itemType()=="asset")
                           <i class="fa fa-barcode"></i>
-                        @elseif (($log->accessorylog) && ($log->asset_type=="accessory"))
+                        @elseif ($log->itemType()=="accessory")
                           <i class="fa fa-keyboard-o"></i>
-                        @elseif (($log->consumablelog) && ($log->asset_type=="consumable"))
+                        @elseif ($log->itemType()=="consumable")
                           <i class="fa fa-tint"></i>
-                        @elseif (($log->licenselog) && ($log->asset_type=="software"))
+                        @elseif ($log->itemType()=="license")
                           <i class="fa fa-floppy-o"></i>
                         @else
                           <i class="fa fa-times"></i>
@@ -402,58 +402,23 @@
                       <td>{{ $log->action_type }}</td>
                       <td>
 
-                          @if (($log->assetlog) && ($log->asset_type=="hardware"))
-
-                            @if ($log->assetlog->deleted_at=='')
-                                <a href="{{ route('view/hardware', $log->asset_id) }}">
-                                    {{ $log->assetlog->showAssetName() }}
-                                </a>
-                            @else
-                                <del>{{ $log->assetlog->showAssetName() }}</del> (deleted)
-                            @endif
-
-                          @elseif (($log->licenselog) && ($log->asset_type=="software"))
-
-                            @if ($log->licenselog->deleted_at=='')
-                                <a href="{{ route('view/license', $log->license_id) }}">
-                                    {{ $log->licenselog->name }}
-                                </a>
-                            @else
-                                <del>{{ $log->licenselog->name }}</del> (deleted)
-                            @endif
-
-                           @elseif (($log->consumablelog) && ($log->asset_type=="consumable"))
-
-                             @if ($log->consumablelog->deleted_at=='')
-                                 <a href="{{ route('view/consumable', $log->consumable_id) }}">{{ $log->consumablelog->name }}</a>
-                             @else
-                                 <del>{{ $log->consumablelog->name }}</del> (deleted)
-                             @endif
-
-                          @elseif (($log->accessorylog) && ($log->asset_type=="accessory"))
-                            @if ($log->accessorylog->deleted_at=='')
-                                <a href="{{ route('view/accessory', $log->accessory_id) }}">{{ $log->accessorylog->name }}</a>
-                            @else
-                                <del>{{ $log->accessorylog->name }}</del> (deleted)
-                            @endif
-
-                           @else
-                               {{ trans('general.bad_data') }}
-                          @endif
+                        @if (($log->item) && ($log->itemType()=="asset"))
+                            <a href="{{ route('view/hardware', $log->item_id) }}">{{ $log->item->asset_tag }} - {{ $log->item->showAssetName() }}</a>
+                        @elseif ($log->item)
+                            <a href="{{ route('view/'. $log->itemType(), $log->item_id) }}">{{ $log->item->name }}</a
+                        @else
+                            {{ trans('general.bad_data') }}
+                        @endif
 
                         </td>
-                        <td>@if ($log->adminlog)
-
-                                @if ($log->adminlog->deleted_at=='')
-                                    <a href="{{ route('view/user', $log->checkedout_to) }}">
-                                        {{ $log->adminlog->fullName() }}
-                                    </a>
+                        <td>
+                           @if ($log->action_type != 'requested')
+                                @if (isset($log->user))
+                                    <a href="{{route('view/user', $log->user_id)}}">{{ $log->user->fullName() }}</a>
                                 @else
-                                    <del>{{ $log->adminlog->fullName() }}</del>
+                                    Deleted Admin
                                 @endif
-                            @else
-                                Deleted User
-                            @endif</td>
+                            @endif
                     </tr>
                     @endforeach
                 </tbody>

snipeit.sh

@@ -200,6 +200,7 @@ case $distro in
 		DB_PASSWORD=$mysqluserpw
 		APP_URL=http://$fqdn
 		APP_KEY=$random32
+		DB_DUMP_PATH='/usr/bin'
 		EOF
 
 		echo "##  Setting up hosts file."
@@ -259,7 +260,7 @@ case $distro in
 		sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log 2>&1 
 
 		if [ "$version" == "16.04" ]; then
-			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
+			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-xml php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
 			#Enable mcrypt and rewrite
 			echo "##  Enabling mcrypt and rewrite"
 			sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1
@@ -315,6 +316,7 @@ case $distro in
 		DB_PASSWORD=$mysqluserpw
 		APP_URL=http://$fqdn
 		APP_KEY=$random32
+		DB_DUMP_PATH='/usr/bin'
 		EOF
 
 		##  TODO make sure mysql is set to start on boot and go ahead and start it
@@ -447,6 +449,7 @@ case $distro in
 		DB_PASSWORD=$mysqluserpw
 		APP_URL=http://$fqdn
 		APP_KEY=$random32
+		DB_DUMP_PATH='/usr/bin'
 		EOF
 
 
@@ -561,7 +564,7 @@ case $distro in
 		DB_PASSWORD=$mysqluserpw
 		APP_URL=http://$fqdn
 		APP_KEY=$random32
-
+		DB_DUMP_PATH='/usr/bin'
 		EOF
 
 		# Change permissions on directories