Updated translations

This should properly include #2674
Cleaned up the script itself, added progress bars so end users don't think the script is stuck

.env.example

@@ -31,6 +31,8 @@ MAIL_PASSWORD=YOURPASSWORD
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDR=you@example.com
 MAIL_FROM_NAME='Snipe-IT'
+MAIL_REPLYTO_ADDR=you@example.com
+MAIL_REPLYTO_NAME='Snipe-IT'
 
 
 # --------------------------------------------

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/Console/Commands/SendExpirationAlerts.php

@@ -66,7 +66,7 @@ class SendExpirationAlerts extends Command
             $asset_data['email_content'] .= '<td><a href="'.config('app.url').'/hardware/'.e($asset->id).'/view">';
             $asset_data['email_content'] .= $asset->showAssetName().'</a></td><td>'.e($asset->asset_tag).'</td>';
             $asset_data['email_content'] .= '<td>'.e($asset->warrantee_expires()).'</td>';
-            $asset_data['email_content'] .= '<td>'.$difference.' days</td>';
+            $asset_data['email_content'] .= '<td>'.$difference.' '.trans('mail.days').'</td>';
             $asset_data['email_content'] .= '<td>'.($asset->supplier ? e($asset->supplier->name) : '').'</td>';
             $asset_data['email_content'] .= '<td>'.($asset->assigneduser ? e($asset->assigneduser->fullName()) : '').'</td>';
             $asset_data['email_content'] .= '</tr>';
@@ -100,17 +100,21 @@ class SendExpirationAlerts extends Command
 
 
             if (count($expiring_assets) > 0) {
+                $this->info('Report sent to '.Setting::getSettings()->alert_email);
                 \Mail::send('emails.expiring-assets-report', $asset_data, function ($m) {
                     $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
-                    $m->subject('Expiring Assets Report');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Expiring_Assets_Report'));
                 });
 
             }
 
             if (count($expiring_licenses) > 0) {
+                $this->info('Report sent to '.Setting::getSettings()->alert_email);
                 \Mail::send('emails.expiring-licenses-report', $license_data, function ($m) {
                     $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
-                    $m->subject('Expiring Licenses Report');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Expiring_Licenses_Report'));
                 });
 
             }

app/Console/Commands/SendInventoryAlerts.php

@@ -50,7 +50,8 @@ class SendInventoryAlerts extends Command
             if (count($data['data']) > 0) {
                 \Mail::send('emails.low-inventory', $data, function ($m) {
                     $m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
-                    $m->subject('Low Inventory Report');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Low_Inventory_Report'));
                 });
 
             }

app/Helpers/Helper.php

@@ -204,7 +204,7 @@ class Helper
     public static function usersList()
     {
         $users_list =   array( '' => trans('general.select_user')) +
-                        User::where('deleted_at', '=', null)
+                        Company::scopeCompanyables(User::where('deleted_at', '=', null))
                         ->where('show_in_list','=',1)
                         ->orderBy('last_name', 'asc')
                         ->orderBy('first_name', 'asc')->get()
@@ -495,4 +495,16 @@ class Helper
 
     }
 
+
+    public static function stripTagsFromJSON(Array $array) {
+
+        foreach ($array as $key => $value) {
+            $clean_value = strip_tags($value);
+            $clean_array[$key] = $clean_value;
+        }
+        return $clean_array;
+
+    }
+
+
 }

app/Http/Controllers/AccessoriesController.php

@@ -92,7 +92,7 @@ class AccessoriesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $accessory->purchase_cost       =  null;
         } else {
-            $accessory->purchase_cost       = e(Input::get('purchase_cost'));
+            $accessory->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $accessory->qty                     = e(Input::get('qty'));
@@ -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;
@@ -375,7 +365,8 @@ class AccessoriesController extends Controller
 
             Mail::send('emails.accept-accessory', $data, function ($m) use ($user) {
                 $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Confirm accessory delivery');
+                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                $m->subject(trans('mail.Confirm_accessory_delivery'));
             });
         }
 
@@ -435,8 +426,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 +434,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 +453,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 +469,6 @@ class AccessoriesController extends Controller
 
             }
 
-
-            $log = $logaction->logaction('checkin from');
-
             if (!is_null($accessory_user->assigned_to)) {
                 $user = User::find($accessory_user->assigned_to);
             }
@@ -503,7 +484,8 @@ class AccessoriesController extends Controller
 
                 Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
                     $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                    $m->subject('Confirm Accessory Checkin');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Confirm_Accessory_Checkin'));
                 });
             }
 

app/Http/Controllers/AssetMaintenancesController.php

@@ -141,7 +141,7 @@ class AssetMaintenancesController extends Controller
                 'completion_date'     => $maintenance->completion_date,
                 'user_id'       => ($maintenance->admin) ? (string)link_to('/admin/users/'.$maintenance->admin->id.'/view', $maintenance->admin->fullName()) : '',
                 'actions'       => $actions,
-                'companyName'   => ($maintenance->asset) ? $maintenance->asset->company->name : ''
+                'companyName'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
             );
         }
 
@@ -215,7 +215,7 @@ class AssetMaintenancesController extends Controller
         if (e(Input::get('cost')) == '') {
             $assetMaintenance->cost = '';
         } else {
-            $assetMaintenance->cost =  e(Input::get('cost'));
+            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
         }
 
         if (e(Input::get('notes')) == '') {
@@ -363,7 +363,7 @@ class AssetMaintenancesController extends Controller
         if (e(Input::get('cost')) == '') {
             $assetMaintenance->cost = '';
         } else {
-            $assetMaintenance->cost =  e(Input::get('cost'));
+            $assetMaintenance->cost =  Helper::ParseFloat(e(Input::get('cost')));
         }
 
         if (e(Input::get('notes')) == '') {

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');
@@ -141,7 +141,7 @@ class AssetModelsController extends Controller
         $model = new AssetModel;
 
         $settings=Input::all();
-        $settings['eol']=0;
+        $settings['eol']= null;
 
         $model->name=e(Input::get('name'));
         $model->manufacturer_id = e(Input::get('manufacturer_id'));
@@ -149,7 +149,7 @@ class AssetModelsController extends Controller
         $model->modelno = e(Input::get('modelno'));
         $model->user_id = Auth::user()->id;
         $model->note            = e(Input::get('note'));
-        $model->eol=0;
+        $model->eol= null;
 
         if (Input::get('fieldset_id')=='') {
             $model->fieldset_id = null;
@@ -217,7 +217,7 @@ class AssetModelsController extends Controller
         }
 
         if (e(Input::get('eol')) == '') {
-            $model->eol =  0;
+            $model->eol =  null;
         } else {
             $model->eol = e(Input::get('eol'));
         }
@@ -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

@@ -178,7 +178,7 @@ class AssetsController extends Controller
         if (e(Input::get('purchase_cost')) == '') {
             $asset->purchase_cost =  null;
         } else {
-            $asset->purchase_cost = (e(Input::get('purchase_cost')));
+            $asset->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('purchase_date')) == '') {
@@ -231,7 +231,7 @@ class AssetsController extends Controller
             $directory= public_path('uploads/assets/');
             // Check if the uploads directory exists.  If not, try to create it.
             if (!file_exists($directory)) {
-                mkdir($directory, 0755);
+                mkdir($directory, 0755, true);
             }
             $path = public_path('uploads/assets/'.$file_name);
             try {
@@ -267,7 +267,7 @@ class AssetsController extends Controller
 
             if (Input::get('assigned_to')!='') {
                 $user = User::find(e(Input::get('assigned_to')));
-                $asset->checkOutToUser($user, Auth::user(), date('Y-m-d h:i:s'), '', 'Checked out on asset creation', e(Input::get('name')));
+                $asset->checkOutToUser($user, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e(Input::get('name')));
             }
             // Redirect to the asset listing page
             \Session::flash('success', trans('admin/hardware/message.create.success'));
@@ -288,7 +288,7 @@ class AssetsController extends Controller
     */
     public function getEdit($assetId = null)
     {
-        
+
         // Check if the asset exists
         if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page
@@ -354,7 +354,7 @@ class AssetsController extends Controller
         }
 
         if ($request->has('purchase_cost')) {
-            $asset->purchase_cost = e(Helper::formatCurrencyOutput($request->input('purchase_cost')));
+            $asset->purchase_cost = Helper::ParseFloat(e($request->input('purchase_cost')));
         } else {
             $asset->purchase_cost =  null;
         }
@@ -407,7 +407,7 @@ class AssetsController extends Controller
             $directory= public_path('uploads/assets/');
             // Check if the uploads directory exists.  If not, try to create it.
             if (!file_exists($directory)) {
-                mkdir($directory, 0755);
+                mkdir($directory, 0755, true);
             }
 
             $file_name = str_random(25).".".$extension;
@@ -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:',
@@ -686,7 +686,8 @@ class AssetsController extends Controller
             if ((($asset->checkin_email()=='1')) && ($user) && (!config('app.lock_passwords'))) {
                 Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
                     $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                    $m->subject('Confirm Asset Checkin');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.Confirm_Asset_Checkin'));
                 });
             }
 
@@ -839,7 +840,7 @@ class AssetsController extends Controller
 
         // Check if the uploads directory exists.  If not, try to create it.
         if (!file_exists($path)) {
-            mkdir($path, 0755);
+            mkdir($path, 0755, true);
         }
         if ($handle = opendir($path)) {
 
@@ -1086,6 +1087,8 @@ class AssetsController extends Controller
         $results = $csv->fetchAssoc();
         $item = array();
         $status = array();
+        $status['error'] = array();
+        $status['success'] = array();
 
 
         foreach($results as $row) {
@@ -1105,74 +1108,79 @@ class AssetsController extends Controller
                 $item[$asset_tag][$batch_counter]['name'] = Helper::array_smart_fetch($row, "name");
                 $item[$asset_tag][$batch_counter]['email'] = Helper::array_smart_fetch($row, "email");
 
-                $asset = Asset::where('asset_tag','=',$asset_tag)->first();
-                $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id;
+                if ($asset = Asset::where('asset_tag','=',$asset_tag)->first()) {
 
-                $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format,$item[$asset_tag][$batch_counter]['name']);
-                $user = User::where('username','=',$base_username['username']);
-                $user_query = ' on username '.$base_username['username'];
+                    $item[$asset_tag][$batch_counter]['asset_id'] = $asset->id;
 
-                if ($request->input('match_firstnamelastname')=='1') {
-                    $firstnamedotlastname = User::generateFormattedNameFromFullName('firstname.lastname',$item[$asset_tag][$batch_counter]['name']);
-                    $item[$asset_tag][$batch_counter]['username'][] = $firstnamedotlastname['username'];
-                    $user->orWhere('username','=',$firstnamedotlastname['username']);
-                    $user_query .= ', or on username '.$firstnamedotlastname['username'];
-                }
+                    $base_username = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format,$item[$asset_tag][$batch_counter]['name']);
+                    $user = User::where('username','=',$base_username['username']);
+                    $user_query = ' on username '.$base_username['username'];
 
-                if ($request->input('match_flastname')=='1') {
-                    $flastname = User::generateFormattedNameFromFullName('filastname',$item[$asset_tag][$batch_counter]['name']);
-                    $item[$asset_tag][$batch_counter]['username'][] = $flastname['username'];
-                    $user->orWhere('username','=',$flastname['username']);
-                    $user_query .= ', or on username '.$flastname['username'];
-                }
-                if ($request->input('match_firstname')=='1') {
-                    $firstname = User::generateFormattedNameFromFullName('firstname',$item[$asset_tag][$batch_counter]['name']);
-                    $item[$asset_tag][$batch_counter]['username'][] = $firstname['username'];
-                    $user->orWhere('username','=',$firstname['username']);
-                    $user_query .= ', or on username '.$firstname['username'];
-                }
-                if ($request->input('match_email')=='1') {
-                    if ($item[$asset_tag][$batch_counter]['email']=='') {
-                        $item[$asset_tag][$batch_counter]['username'][] = $user_email = User::generateEmailFromFullName($item[$asset_tag][$batch_counter]['name']);
-                        $user->orWhere('username','=',$user_email);
-                        $user_query .= ', or on username '.$user_email;
+                    if ($request->input('match_firstnamelastname')=='1') {
+                        $firstnamedotlastname = User::generateFormattedNameFromFullName('firstname.lastname',$item[$asset_tag][$batch_counter]['name']);
+                        $item[$asset_tag][$batch_counter]['username'][] = $firstnamedotlastname['username'];
+                        $user->orWhere('username','=',$firstnamedotlastname['username']);
+                        $user_query .= ', or on username '.$firstnamedotlastname['username'];
                     }
-                }
 
-                // A matching user was found
-                if ($user = $user->first()) {
-                    $item[$asset_tag][$batch_counter]['checkedout_to'] = $user->id;
-
-                    $status['success'][] = 'Found user '.Helper::array_smart_fetch($row, "name").$user_query;
-
-                    if ($asset) {
+                    if ($request->input('match_flastname')=='1') {
+                        $flastname = User::generateFormattedNameFromFullName('filastname',$item[$asset_tag][$batch_counter]['name']);
+                        $item[$asset_tag][$batch_counter]['username'][] = $flastname['username'];
+                        $user->orWhere('username','=',$flastname['username']);
+                        $user_query .= ', or on username '.$flastname['username'];
+                    }
+                    if ($request->input('match_firstname')=='1') {
+                        $firstname = User::generateFormattedNameFromFullName('firstname',$item[$asset_tag][$batch_counter]['name']);
+                        $item[$asset_tag][$batch_counter]['username'][] = $firstname['username'];
+                        $user->orWhere('username','=',$firstname['username']);
+                        $user_query .= ', or on username '.$firstname['username'];
+                    }
+                    if ($request->input('match_email')=='1') {
+                        if ($item[$asset_tag][$batch_counter]['email']=='') {
+                            $item[$asset_tag][$batch_counter]['username'][] = $user_email = User::generateEmailFromFullName($item[$asset_tag][$batch_counter]['name']);
+                            $user->orWhere('username','=',$user_email);
+                            $user_query .= ', or on username '.$user_email;
+                        }
+                    }
 
+                    // A matching user was found
+                    if ($user = $user->first()) {
+                        $item[$asset_tag][$batch_counter]['checkedout_to'] = $user->id;
                         $item[$asset_tag][$batch_counter]['user_id'] = $user->id;
 
                         Actionlog::firstOrCreate(array(
-                            'asset_id' => $asset->id,
-                            'asset_type' => 'hardware',
-                            'user_id' =>  Auth::user()->id,
-                            'note' => 'Checkout imported by '.Auth::user()->fullName().' from history importer',
-                            'checkedout_to' => $item[$asset_tag][$batch_counter]['user_id'],
-                            'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
-                            'action_type'   => 'checkout'
+                                'item_id' => $asset->id,
+                                'item_type' => Asset::class,
+                                'user_id' =>  Auth::user()->id,
+                                'note' => 'Checkout imported by '.Auth::user()->fullName().' from history importer',
+                                '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',
                             )
                         );
 
                         $asset->assigned_to = $user->id;
-                        $asset->save();
+
+                        if ($asset->save()) {
+                            $status['success'][]['asset'][$asset_tag]['msg'] = 'Asset successfully matched for '.Helper::array_smart_fetch($row, "name").$user_query.' on '.$item[$asset_tag][$batch_counter]['checkout_date'];
+                        } else {
+                            $status['error'][]['asset'][$asset_tag]['msg'] = 'Asset and user was matched but could not be saved.';
+                        }
 
                     } else {
-                        $status['error'][] = 'Asset does not exist so no checkin log was created.';
+                        $item[$asset_tag][$batch_counter]['checkedout_to'] = null;
+                        $status['error'][]['user'][Helper::array_smart_fetch($row, "name")]['msg'] = 'User does not exist so no checkin log was created.';
                     }
 
-
                 } else {
-                    $item[$asset_tag][$batch_counter]['checkedout_to'] = null;
-                    $status['error'][] = 'No matching user for '.Helper::array_smart_fetch($row, "name");
+                    $item[$asset_tag][$batch_counter]['asset_id'] = null;
+                    $status['error'][]['asset'][$asset_tag]['msg'] = 'Asset does not exist so no match was attempted.';
                 }
 
+
+
+
             }
         }
 
@@ -1183,18 +1191,18 @@ class AssetsController extends Controller
                 $next = $x + 1;
 
                 // Only do this if a matching user was found
-                if ($asset_batch[$x]['checkedout_to']!='') {
+                if ((array_key_exists('checkedout_to',$asset_batch[$x])) && ($asset_batch[$x]['checkedout_to']!='')) {
 
                     if (($total_in_batch > 1) && ($x < $total_in_batch) && (array_key_exists($next,$asset_batch))) {
                         $checkin_date = Carbon::parse($asset_batch[$next]['checkout_date'])->subDay(1)->format('Y-m-d H:i:s');
                         $asset_batch[$x]['real_checkin'] = $checkin_date;
 
                         Actionlog::firstOrCreate(array(
-                                'asset_id' => $asset_batch[$x]['asset_id'],
-                                'asset_type' => 'hardware',
+                                '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 +1280,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'));
@@ -1423,7 +1424,7 @@ class AssetsController extends Controller
 
                     return View::make('hardware/labels')->with('assets', $assets)->with('settings', $settings)->with('count', $count)->with('settings', $settings);
 
-                
+
 
             } elseif (Input::get('bulk_actions')=='delete') {
 
@@ -1491,7 +1492,7 @@ class AssetsController extends Controller
                     }
 
                     if (Input::has('purchase_cost')) {
-                        $update_array['purchase_cost'] =  e(Input::get('purchase_cost'));
+                        $update_array['purchase_cost'] =  Helper::ParseFloat(e(Input::get('purchase_cost')));
                     }
 
                     if (Input::has('supplier_id')) {
@@ -1537,8 +1538,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')) {
@@ -1587,7 +1588,7 @@ class AssetsController extends Controller
 
             foreach ($assets as $asset) {
           //echo '<li>'.$asset;
-                $update_array['deleted_at'] = date('Y-m-d h:i:s');
+                $update_array['deleted_at'] = date('Y-m-d H:i:s');
                 $update_array['assigned_to'] = null;
 
                 if (DB::table('assets')
@@ -1595,8 +1596,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 +1677,6 @@ class AssetsController extends Controller
             case 'Deployed':
                 $assets->Deployed();
                 break;
-            default:
-                $assets->NotArchived();
-                break;
-
         }
 
         if ($request->has('status_id')) {
@@ -1804,7 +1801,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() : '',
@@ -1843,7 +1840,13 @@ class AssetsController extends Controller
                 }
 
             }
-            $rows[]=$row;
+
+            if (($request->has('report')) && ($request->get('report')=='true')) {
+                $rows[]= Helper::stripTagsFromJSON($row);
+            } else {
+                $rows[]= $row;
+            }
+
         }
 
         $data = array('total'=>$assetCount, 'rows'=>$rows);
@@ -1857,12 +1860,12 @@ class AssetsController extends Controller
           $users_list = Helper::usersList();
           // Filter out assets that are not deployable.
           $assets = Asset::RTD()->get();
-  
+
           $assets_list = Company::scopeCompanyables($assets, 'assets.company_id')->lists('detailed_name', 'id')->toArray();
-  
+
           return View::make('hardware/bulk-checkout')->with('users_list', $users_list)->with('assets_list', $assets_list);
       }
-  
+
       public function postBulkCheckout(Request $request)
       {
 
@@ -1872,31 +1875,31 @@ class AssetsController extends Controller
 
           $user = User::find(e(Input::get('assigned_to')));
           $admin = Auth::user();
-  
+
           $asset_ids = array_filter(Input::get('selected_assets'));
-  
+
           if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
               $checkout_at = e(Input::get('checkout_at'));
           } else {
               $checkout_at = date("Y-m-d H:i:s");
           }
-  
+
           if (Input::has('expected_checkin')) {
               $expected_checkin = e(Input::get('expected_checkin'));
           } else {
               $expected_checkin = '';
           }
-  
+
           $has_errors = false;
           $errors = [];
           DB::transaction(function() use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids)
-          {          
+          {
               foreach($asset_ids as $asset_id)
               {
                   $asset = Asset::find($asset_id);
-  
+
                   $error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
-  
+
                   if($error)
                   {
                       $has_errors = true;
@@ -1904,12 +1907,12 @@ class AssetsController extends Controller
                   }
               }
             });
-  
+
           if (!$errors) {
             // Redirect to the new asset page
               return redirect()->to("hardware")->with('success', trans('admin/hardware/message.checkout.success'));
           }
-  
+
         // Redirect to the asset management page with error
           return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
       }

app/Http/Controllers/Auth/PasswordController.php

@@ -37,4 +37,13 @@ class PasswordController extends Controller
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Get the e-mail subject line to be used for the reset link email.
+     * Overriding method "getEmailSubject()" from trait "use ResetsPasswords"
+     * @return string
+     */
+    public function getEmailSubject(){
+        return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
+    }
 }

app/Http/Controllers/ComponentsController.php

@@ -99,7 +99,7 @@ class ComponentsController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $component->purchase_cost       =  null;
         } else {
-            $component->purchase_cost       = e(Input::get('purchase_cost'));
+            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $component->total_qty                    = e(Input::get('total_qty'));
@@ -183,7 +183,7 @@ class ComponentsController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $component->purchase_cost       =  null;
         } else {
-            $component->purchase_cost       = e(Input::get('purchase_cost'));
+            $component->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $component->total_qty                    = e(Input::get('total_qty'));
@@ -345,17 +345,11 @@ class ComponentsController extends Controller
         $component->assets()->attach($component->id, array(
         'component_id' => $component->id,
         'user_id' => $admin_user->id,
-        'created_at' => date('Y-m-d h:i:s'),
+        'created_at' => date('Y-m-d H:i:s'),
         '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

@@ -97,7 +97,7 @@ class ConsumablesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $consumable->purchase_cost       =  null;
         } else {
-            $consumable->purchase_cost       = e(Input::get('purchase_cost'));
+            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         $consumable->qty                    = e(Input::get('qty'));
@@ -182,10 +182,10 @@ class ConsumablesController extends Controller
         if (e(Input::get('purchase_cost')) == '0.00') {
             $consumable->purchase_cost       =  null;
         } else {
-            $consumable->purchase_cost       = e(Input::get('purchase_cost'));
+            $consumable->purchase_cost       = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
-        $consumable->qty                    = e(Input::get('qty'));
+        $consumable->qty                    = Helper::ParseFloat(e(Input::get('qty')));
 
         if ($consumable->save()) {
             return redirect()->to("admin/consumables")->with('success', trans('admin/consumables/message.update.success'));
@@ -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;
@@ -375,7 +365,8 @@ class ConsumablesController extends Controller
 
             Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
                 $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Confirm consumable delivery');
+                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                $m->subject(trans('mail.Confirm_consumable_delivery'));
             });
         }
 

app/Http/Controllers/DashboardController.php

@@ -30,12 +30,6 @@ 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')
-                ->take(20)
-                ->get();
-
-
             $asset_stats['total'] = Asset::Hardware()->count();
 
             $asset_stats['rtd']['total'] = Asset::Hardware()->RTD()->count();
@@ -82,7 +76,7 @@ class DashboardController extends Controller
             }
 
 
-            return View::make('dashboard')->with('asset_stats', $asset_stats)->with('recent_activity', $recent_activity);
+            return View::make('dashboard')->with('asset_stats', $asset_stats);
         } else {
         // Redirect to the profile page
             return redirect()->route('view-assets');

app/Http/Controllers/LicensesController.php

@@ -87,17 +87,13 @@ class LicensesController extends Controller
     public function postCreate()
     {
 
-
-        // get the POST data
-        $new = Input::all();
-
         // create a new model instance
         $license = new License();
 
         if (e(Input::get('purchase_cost')) == '') {
             $license->purchase_cost =  null;
         } else {
-            $license->purchase_cost = e(Input::get('purchase_cost'));
+            $license->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('supplier_id')) == '') {
@@ -289,10 +285,9 @@ class LicensesController extends Controller
         }
 
         if (e(Input::get('purchase_cost')) == '') {
-              $license->purchase_cost =  null;
+            $license->purchase_cost =  null;
         } else {
-              $license->purchase_cost = e(Input::get('purchase_cost'));
-              //$license->purchase_cost = e(Input::get('purchase_cost'));
+            $license->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
         }
 
         if (e(Input::get('maintained')) == '') {
@@ -334,11 +329,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 +354,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 +539,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 +550,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 +578,7 @@ class LicensesController extends Controller
                                 ],
                                 [
                                     'title' => 'Note:',
-                                    'value' => e($logaction->note)
+                                    'value' => e(Input::get('note'))
                                 ],
 
 
@@ -602,9 +592,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 +670,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 +679,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 +700,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 +717,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 +787,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 +821,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 +832,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'));
                     }
@@ -1003,7 +974,7 @@ class LicensesController extends Controller
 
             if (Gate::allows('licenses.create')) {
                 $actions .= '<a href="' . route('clone/license', $license->id)
-                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone asset"><i class="fa fa-files-o"></i></a>';
+                . '" class="btn btn-info btn-sm" style="margin-right:5px;" title="Clone license"><i class="fa fa-files-o"></i></a>';
             }
             if (Gate::allows('licenses.edit')) {
                 $actions .= '<a href="' . route('update/license', $license->id)

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,7 +33,7 @@ class ReportsController extends Controller
 {
 
     /**
-    * Returns a view that displaysthe accessories report.
+    * Returns a view that displays the accessories report.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
@@ -88,7 +89,7 @@ class ReportsController extends Controller
     }
 
     /**
-    * Display asset report.
+    * Display asset report view.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
@@ -97,23 +98,11 @@ class ReportsController extends Controller
     public function getAssetsReport()
     {
         $settings = \App\Models\Setting::first();
-        // Grab all the assets
-        $assets = Asset::with(
-            'model',
-            'assigneduser.userLoc',
-            'assetstatus',
-            'defaultLoc',
-            'assetlog',
-            'supplier',
-            'model.manufacturer',
-            'company'
-        )
-                       ->orderBy('created_at', 'DESC')
-                       ->get();
-
         return View::make('reports/asset', compact('assets'))->with('settings', $settings);
     }
 
+
+
     /**
     * Exports the assets to CSV
     *
@@ -123,103 +112,76 @@ class ReportsController extends Controller
     */
     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, ',');
+        $customfields = CustomField::get();
 
-        // 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[] = '';
-            }
+        $response = new StreamedResponse(function() use ($customfields) {
+            // Open output stream
+            $handle = fopen('php://output', 'w');
 
-            if ($asset->assigned_to > 0) {
-                $user  = User::find($asset->assigned_to);
-                $row[] = e($user->fullName());
-            } else {
-                $row[] = ''; // Empty string if unassigned
-            }
-
-            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[] = '';
+            Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) {
+                $headers=[
+                    trans('general.company'),
+                    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.checkout_date'),
+                    trans('admin/hardware/table.location'),
+                    trans('general.notes'),
+                ];
+                foreach($customfields as $field) {
+                    $headers[]=$field->name;
                 }
-            } elseif ($asset->rtd_location_id) {
-                $location = Location::find($asset->rtd_location_id);
-                if ($location->name) {
-                    $row[] = e($location->name);
-                } else {
-                    $row[] = '';
+                fputcsv($handle, $headers);
+
+                foreach ($assets as $asset) {
+                    // Add a new row with data
+                    $values=[
+                        ($asset->company) ? $asset->company->name : '',
+                        $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->last_checkout!='') ? e($asset->last_checkout) : '',
+                        ($asset->assigneduser && $asset->assigneduser->userloc!='') ?
+                            e($asset->assigneduser->userloc->name) : ( ($asset->defaultLoc!='') ? e($asset->defaultLoc->name) : ''),
+                        ($asset->notes) ? e($asset->notes) : '',
+                    ];
+                    foreach($customfields as $field) {
+                        $values[]=$asset->{$field->db_column_name()};
+                    }
+                    fputcsv($handle, $values);
                 }
-            } 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;
+
     }
 
     /**
@@ -330,11 +292,7 @@ class ReportsController extends Controller
     public function getActivityReport()
     {
         $log_actions = Actionlog::orderBy('created_at', 'DESC')
-                                ->with('adminlog')
-                                ->with('accessorylog')
-                                ->with('assetlog')
-                                ->with('licenselog')
-                                ->with('userlog')
+                                ->with('item')
                                 ->orderBy('created_at', 'DESC')
                                 ->get();
 
@@ -342,16 +300,114 @@ class ReportsController extends Controller
     }
 
     /**
-    * 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 = Company::scopeCompanyables(Actionlog::with('item', 'user', 'target'))->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 = ['created_at'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
+
+
+        $activityCount = $activitylogs->count();
+        // dd("Offset:" . $offset . " Limit " . $limit);
+        $activitylogs = $activitylogs->offset($offset)->limit($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")) {
+              $activity_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()) {
+                $activity_item = '<a href="'.route('view/'. $activity->itemType(), $activity->item_id).'">'.e($activity->item->name).'</a>';
+                $item_type = $activity->itemType();
+            } else {
+                $activity_item = "unkonwn";
+                $item_type = "null";
+            }
+            
+
+            if (($activity->user) && ($activity->action_type=="uploaded") && ($activity->itemType()=="user")) {
+                $activity_target = '<a href="'.route('view/user', $activity->target_id).'">'.$activity->user->fullName().'</a>';
+            } elseif (($activity->item) && ($activity->target_type === "App\Models\Asset")) {
+                $activity_target = '<a href="'.route('view/hardware', $activity->target_id).'">'.$activity->target->showAssetName().'</a>';
+            } elseif ( $activity->target_type === "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->id;
+            }
+
+            
+            $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()) : '',
+                'target'          => $activity_target,
+                'item'          => $activity_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')
+        $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
                            ->with('company')
                            ->get();
 
@@ -378,6 +434,7 @@ class ReportsController extends Controller
             trans('admin/licenses/form.remaining_seats'),
             trans('admin/licenses/form.expiration'),
             trans('admin/licenses/form.date'),
+            trans('admin/licenses/form.depreciation'),
             trans('admin/licenses/form.cost')
         ];
 
@@ -393,6 +450,7 @@ class ReportsController extends Controller
             $row[] = $license->remaincount();
             $row[] = $license->expiration_date;
             $row[] = $license->purchase_date;
+            $row[] = ($license->depreciation!='') ? '' : e($license->depreciation->name);
             $row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"';
 
             $rows[] = implode($row, ',');
@@ -421,21 +479,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')) == '1') {
+            $header[] = 'Company Name';
+        }
+
         if (e(Input::get('asset_name')) == '1') {
             $header[] = 'Asset Name';
         }
@@ -501,6 +563,11 @@ class ReportsController extends Controller
 
         foreach ($assets as $asset) {
             $row = [ ];
+
+            if (e(Input::get('company')) == '1') {
+                $row[] = is_null($asset->company) ? '' : '"'.$asset->company->name.'"';
+            }
+
             if (e(Input::get('asset_name')) == '1') {
                 $row[] = '"' .e($asset->name) . '"';
             }
@@ -627,14 +694,15 @@ class ReportsController extends Controller
             $csv      = implode($rows, "\n");
             $response = Response::make($csv, 200);
             $response->header('Content-Type', 'text/csv');
-            $response->header('Content-disposition', 'attachment;filename=report.csv');
+            $response->header('Content-disposition', 'attachment;filename='.date('Y-m-d-His').'-custom-asset-report.csv');
 
             return $response;
         } else {
             return redirect()->to("reports/custom")
-                           ->with('error', trans('admin/reports/message.error'));
+                ->with('error', trans('admin/reports/message.error'));
         }
     }
+    
 
     /**
      * getImprovementsReport

app/Http/Controllers/SettingsController.php

@@ -52,29 +52,18 @@ class SettingsController extends Controller
 
         $protocol = array_key_exists('HTTPS', $_SERVER) && ( $_SERVER['HTTPS'] == "on") ? 'https://' : 'http://';
 
-
-        $pageURL = $protocol;
-        if ($_SERVER["SERVER_PORT"] != "80") {
-            $main_page = $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"];
-            $pageURL .= $main_page.$_SERVER["REQUEST_URI"];
-        } else {
-            $main_page = $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
-            $pageURL .= $main_page;
+        $host = $_SERVER['SERVER_NAME'];
+        if (($protocol === 'http://' && $_SERVER['SERVER_PORT'] != '80') || ($protocol === 'https://' && $_SERVER['SERVER_PORT'] != '443')) {
+          $host .= ':' . $_SERVER['SERVER_PORT'];
         }
+        $pageURL = $protocol . $host . $_SERVER['REQUEST_URI'];
 
-        $start_settings['env_location'] = $pageURL.'../.env';
+        $start_settings['url_valid'] = (config('app.url').'/setup' === $pageURL);
 
+        $start_settings['url_config'] = config('app.url');
+        $start_settings['real_url'] = $pageURL;
 
-        if (config('app.url').'/setup'!=$pageURL) {
-            $start_settings['url_valid']= false;
-        } else {
-            $start_settings['url_valid']= true;
-        }
-
-        $start_settings['url_config']= config('app.url');
-        $start_settings['real_url']= $pageURL;
-
-        $exposed_env = @file_get_contents($main_page.'/.env');
+        $exposed_env = @file_get_contents($protocol . $host.'/.env');
 
         if ($exposed_env) {
             $start_settings['env_exposed'] = true;
@@ -147,7 +136,8 @@ class SettingsController extends Controller
         try {
             Mail::send('emails.test', [], function ($m) {
                 $m->to(config('mail.from.address'), config('mail.from.name'));
-                $m->subject('Test Email from Snipe-IT');
+                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                $m->subject(trans('mail.test_email'));
             });
             return 'success';
         } catch (Exception $e) {
@@ -195,11 +185,12 @@ 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']);
-                    $m->subject('Your Snipe-IT credentials');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.your_credentials'));
                 });
             }
 
@@ -323,7 +314,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 +473,7 @@ class SettingsController extends Controller
 
             }
             closedir($handle);
-            $files = array_reverse($files);
+            rsort($files);
         }
 
 

app/Http/Controllers/UsersController.php

@@ -157,7 +157,8 @@ class UsersController extends Controller
 
                 Mail::send('emails.send-login', $data, function ($m) use ($user) {
                     $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                    $m->subject('Welcome ' . $user->first_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.welcome', ['name' => $user->first_name]));
                 });
             }
             return redirect::route('users')->with('success', trans('admin/users/message.success.create'));
@@ -209,7 +210,8 @@ class UsersController extends Controller
 
                 Mail::send('emails.send-login', $data, function ($m) use ($user) {
                     $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                    $m->subject('Welcome ' . $user->first_name);
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.welcome', ['name' => $user->first_name]));
                 });
             }
 
@@ -495,9 +497,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 +517,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 +532,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 +603,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)) {
 
@@ -829,7 +834,8 @@ class UsersController extends Controller
                                 if ($newuser['email']) {
                                     Mail::send('emails.send-login', $data, function ($m) use ($newuser) {
                                         $m->to($newuser['email'], $newuser['first_name'] . ' ' . $newuser['last_name']);
-                                        $m->subject('Welcome ' . $newuser['first_name']);
+                                        $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                                        $m->subject(trans('mail.welcome', ['name' => $newuser['first_name']]));
                                     });
                                 }
                             }
@@ -1017,12 +1023,12 @@ 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->created_at = date("Y-m-d h:i:s");
+                $logaction->target_id = null;
+                $logaction->created_at = date("Y-m-d H:i:s");
                 $logaction->filename = $filename;
                 $logaction->action_type = 'uploaded';
                 $logaction->save();

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;
@@ -37,11 +39,18 @@ class ViewAssetsController extends Controller
     public function getIndex()
     {
 
-        $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');
+        $user = User::with(
+            'assets',
+            'assets.model',
+            'consumables',
+            'accessories',
+            'licenses',
+            'userloc',
+            'userlog'
+        )->withTrashed()->find(Auth::user()->id);
 
 
+        $userlog = $user->userlog->load('item', 'user', 'target');
 
         if (isset($user->id)) {
             return View::make('account/view-assets', compact('user', 'userlog'));
@@ -60,11 +69,132 @@ 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->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.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->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.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 +206,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->created_at = $data['requested_date'] = date("Y-m-d h:i:s");
-
+            $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();
@@ -97,10 +233,13 @@ class ViewAssetsController extends Controller
             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('Asset Requested');
+                    $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                    $m->subject(trans('mail.asset_requested'));
                 });
             }
 
+            $asset->request();
+
 
             if ($settings->slack_endpoint) {
 
@@ -119,7 +258,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 +276,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 +301,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,11 +319,11 @@ 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'));
         }
-        
+
 
         if ($findlog->accepted_id!='') {
             // Redirect to the asset management page
@@ -221,56 +351,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");
+        $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

@@ -2,9 +2,10 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Model for the Actionlog (the table that keeps a historical log of
@@ -12,95 +13,74 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  *
  * @version    v1.0
  */
-class Actionlog extends Model implements ICompanyableChild
+class Actionlog extends Model
 {
     use SoftDeletes;
-    use CompanyableChildTrait;
 
     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()
+    // Overridden from Builder to automatically add the company
+    public static function boot()
     {
-        return [ 'accessorylog', 'assetlog', 'licenselog', 'consumablelog' ];
+        parent::boot();
+        static::creating( function (Actionlog $actionlog) {
+            // If the admin is a superadmin, let's see if the target instead has a company.
+            if (Auth::user() && Auth::user()->isSuperUser()) {
+                $actionlog->company_id = $actionlog->target->company_id;
+            } else if (Auth::user() && Auth::user()->company) {
+                $actionlog->company_id = Auth::user()->company_id;
+            }
+        });
+    }
+    // Eloquent Relationships below
+    public function item()
+    {
+        return $this->morphTo('item')->withTrashed();
     }
 
-    public function assetlog()
+    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 +121,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.
@@ -148,7 +152,8 @@ class Asset extends Depreciable
 
             \Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
                 $m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Confirm asset delivery');
+                $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
+                $m->subject(trans('mail.Confirm_asset_delivery'));
             });
         }
 
@@ -209,10 +214,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 +232,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 +272,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 +310,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();
     }
@@ -576,12 +578,12 @@ public function checkin_email()
     public function scopeAssetsByLocation($query, $location)
     {
         return $query->where(function ($query) use ($location) {
-        
+
             $query->whereHas('assigneduser', function ($query) use ($location) {
-            
+
                 $query->where('users.location_id', '=', $location->id);
             })->orWhere(function ($query) use ($location) {
-            
+
                 $query->where('assets.rtd_location_id', '=', $location->id);
                 $query->whereNull('assets.assigned_to');
             });

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/Company.php

@@ -136,7 +136,8 @@ final class Company extends Model
 
     public static function scopeCompanyables($query, $column = 'company_id')
     {
-        if (!static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser())) {
+        // If not logged in and hitting this, assume we are on the command line and don't scope?'
+        if (!static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser()) || (!Auth::check())) {
             return $query;
         } else {
             return static::scopeCompanyablesDirectly($query, $column);
@@ -176,4 +177,27 @@ final class Company extends Model
             return e($company->name);
         }
     }
+
+    public function users() {
+        return $this->hasMany(User::class);
+    }
+
+    public function assets() {
+        return $this->hasMany(Asset::class);
+    }
+
+    public function licenses() {
+        return $this->hasMany(License::class);
+    }
+    public function accessories() {
+        return $this->hasMany(Accessory::class);
+    }
+
+    public function consumables() {
+        return $this->hasMany(Consumable::class);
+    }
+
+    public function components() {
+        return $this->hasMany(Component::class);
+    }
 }

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');
@@ -213,6 +214,7 @@ class License extends Depreciable
                 ->orWhere('serial', 'LIKE', '%'.$search.'%')
                 ->orWhere('notes', 'LIKE', '%'.$search.'%')
                 ->orWhere('order_number', 'LIKE', '%'.$search.'%')
+                ->orWhere('purchase_order', 'LIKE', '%'.$search.'%')
                 ->orWhere('purchase_date', 'LIKE', '%'.$search.'%')
                 ->orWhere('purchase_cost', 'LIKE', '%'.$search.'%');
         });

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

@@ -3,6 +3,12 @@
 return [
 
     /*
+    | ***************************************************************************
+    | DO NOT MAKE CHANGES DIRECTLY TO THIS FILE.
+    |
+    | Instead use your .env file to set your application configuration settings.
+    | See https://snipe-it.readme.io/docs/configuration for more info.
+    |
     |--------------------------------------------------------------------------
     | Mail Driver
     |--------------------------------------------------------------------------
@@ -11,6 +17,7 @@ return [
     | sending of e-mail. You may specify which one you're using throughout
     | your application here. By default, Laravel is setup for SMTP mail.
     |
+    |
     | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log"
     |
     */
@@ -56,6 +63,23 @@ return [
 
     'from' => ['address' => env('MAIL_FROM_ADDR', null), 'name' => env('MAIL_FROM_NAME', null)],
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Global "Reply-To" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to have a different "Reply-to"
+    | address than the "From" address. If this is left blank, the application will use
+    | your MAIL_FROM information. 
+    |
+    */
+
+    'reply_to' => [
+        'address' => env('MAIL_REPLYTO_ADDR', env('MAIL_FROM_ADDR', null)),
+        'name' => env('MAIL_REPLYTO_NAME', env('MAIL_FROM_NAME', null))
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | E-Mail Encryption Protocol

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.0-beta2',
+  'hash_version' => 'v3.5.0-beta2-53-g87f50df',
 );

database/factories/ModelFactory.php

@@ -25,6 +25,7 @@ $factory->defineAs(App\Models\Asset::class, 'asset', function (Faker\Generator $
     'order_number' => $faker->numberBetween(1000000,50000000),
     'supplier_id' => $faker->numberBetween(1,5),
     'requestable' => $faker->numberBetween(0,1),
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
   ];
 });
 
@@ -96,6 +97,7 @@ $factory->defineAs(App\Models\Component::class, 'component', function (Faker\Gen
     'category_id' => $faker->numberBetween(21,25),
     'total_qty' => $faker->numberBetween(3, 10),
     'min_amt' => $faker->numberBetween($min = 1, $max = 2),
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
   ];
 });
 
@@ -113,6 +115,7 @@ $factory->defineAs(App\Models\Accessory::class, 'accessory', function (Faker\Gen
     'qty' => $faker->numberBetween(5, 10),
     'location_id' => $faker->numberBetween(1,5),
     'min_amt' => $faker->numberBetween($min = 1, $max = 2),
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
   ];
 });
 
@@ -138,6 +141,7 @@ $factory->defineAs(App\Models\Consumable::class, 'consumable', function (Faker\G
     'company_id' => $faker->numberBetween(1, 10),
     'qty' => $faker->numberBetween(5, 10),
     'min_amt' => $faker->numberBetween($min = 1, $max = 2),
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
 
   ];
 });
@@ -251,6 +255,7 @@ $factory->defineAs(App\Models\License::class, 'license', function (Faker\Generat
     'purchase_date' 		=> $faker->dateTime(),
     'purchase_cost' 		=> $faker->randomFloat(2),
     'notes'   => $faker->sentence,
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
   ];
 });
 
@@ -265,18 +270,82 @@ $factory->defineAs(App\Models\LicenseSeat::class, 'license-seat', function (Fake
 });
 
 $factory->defineAs(App\Models\Actionlog::class, 'asset-checkout', function (Faker\Generator $faker) {
+  $company = \App\Models\Company::has('users')->has('assets')->inRandomOrder()->first();
   return [
-    'user_id'      	=> 1,
+    'user_id'      	=> $company->users()->inRandomOrder()->first()->id,
     'action_type' 		=> 'checkout',
-    'asset_id' 		=> $faker->numberBetween(1, 10),
-    'checkedout_to' => 1,
+    'item_id' 		=> $company->assets()->inRandomOrder()->first()->id,
+    'target_id' => $company->users()->inRandomOrder()->first()->id,
+    'target_type' => 'App\\Models\\User',
     'created_at'  => $faker->dateTime(),
-    'asset_type'  => 'hardware',
+    'item_type'  => 'App\\Models\\Asset',
     'note' 			=> $faker->sentence,
-    'user_id' 			=> '1',
+    'company_id' => $company->id
   ];
 });
 
+$factory->defineAs(App\Models\Actionlog::class, 'license-checkout-asset', function (Faker\Generator $faker) {
+  $company = \App\Models\Company::has('users')->has('licenses')->inRandomOrder()->first();
+
+  return [
+    'user_id'      	=> $company->users()->inRandomOrder()->first()->id,
+    'action_type' 		=> 'checkout',
+    'item_id' 		=> $company->licenses()->whereNotNull('company_id')->inRandomOrder()->first()->id,
+    'target_id' => $company->assets()->inRandomOrder()->first()->id,
+    'target_type' => 'App\\Models\\Asset',
+    'created_at'  => $faker->dateTime(),
+    'item_type'  => 'App\\Models\\License',
+    'note' 			=> $faker->sentence,
+    'company_id' => $company->id
+  ];
+});
+
+$factory->defineAs(App\Models\Actionlog::class, 'accessory-checkout', function (Faker\Generator $faker) {
+    $company = \App\Models\Company::has('users')->has('accessories')->inRandomOrder()->first();    
+  return [
+    'user_id'      	=> $company->users()->inRandomOrder()->first()->id,
+    'action_type' 		=> 'checkout',
+    'item_id' 		=> $company->accessories()->whereNotNull('company_id')->inRandomOrder()->first()->id,
+    'target_id' => $company->users()->inRandomOrder()->first()->id,
+    'target_type' => 'App\\Models\\User',
+    'created_at'  => $faker->dateTime(),
+    'item_type'  => 'App\\Models\\Accessory',
+    'note' 			=> $faker->sentence,
+    'company_id' => $company->id
+  ];
+});
+
+$factory->defineAs(App\Models\Actionlog::class, 'consumable-checkout', function (Faker\Generator $faker) {
+    $company = \App\Models\Company::has('users')->has('consumables')->inRandomOrder()->first();    
+
+  return [
+    'user_id'      	=> $company->users()->inRandomOrder()->first()->id,
+    'action_type' 		=> 'checkout',
+    'item_id' 		=> $company->consumables()->whereNotNull('company_id')->inRandomOrder()->first()->id,
+    'target_id' => $company->users()->inRandomOrder()->first()->id,
+    'target_type' => 'App\\Models\\User',
+    'created_at'  => $faker->dateTime(),
+    'item_type'  => 'App\\Models\\Consumable',
+    'note' 			=> $faker->sentence,
+    'company_id' => $company->id
+  ];
+});
+
+$factory->defineAs(App\Models\Actionlog::class, 'component-checkout', function (Faker\Generator $faker) {
+   $company = \App\Models\Company::has('users')->has('components')->inRandomOrder()->first();    
+
+  return [
+    'user_id'      	=> $company->users()->inRandomOrder()->first()->id,
+    'action_type' 		=> 'checkout',
+    'item_id' 		=> $company->components()->whereNotNull('company_id')->inRandomOrder()->first()->id,
+    'target_id' => $company->users()->inRandomOrder()->first()->id,
+    'target_type' => 'App\\Models\\User',
+    'created_at'  => $faker->dateTime(),
+    'item_type'  => 'App\\Models\\Component',
+    'note' 			=> $faker->sentence,
+    'company_id' => $company->id
+  ];
+});
 
 $factory->defineAs(App\Models\CustomField::class, 'customfield-ip', function (Faker\Generator $faker) {
   return [
@@ -294,5 +363,6 @@ $factory->defineAs(App\Models\User::class, 'valid-user', function (Faker\Generat
     'email' => $faker->safeEmail,
     'password' => $faker->password,
     'username' => $faker->username,
+    'company_id' => \App\Models\Company::inRandomOrder()->first()->id
   ];
 });

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();
+        });
+    }
+}

database/migrations/2016_09_23_140722_fix_modelno_in_consumables_to_string.php

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

database/migrations/2016_09_28_231359_add_company_to_logs.php

@@ -0,0 +1,44 @@
+<?php
+
+use App\Models\Actionlog;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AddCompanyToLogs extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            //
+            $table->integer('company_id')->nullable()->default(null);
+        });
+
+        $logs = Actionlog::with('item')->get();
+        foreach ($logs as $log) {
+            if($log->item) {
+                $log->company_id = $log->item->company_id;
+                $log->save();
+            } else {
+                var_dump($log);
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            //
+            $table->dropColumn('company_id');
+        });
+    }
+}

database/seeds/ActionlogSeeder.php

@@ -7,6 +7,10 @@ class ActionlogSeeder extends Seeder
   public function run()
   {
     Actionlog::truncate();
-    factory(Actionlog::class, 'asset-checkout',5)->create();
+    factory(Actionlog::class, 'asset-checkout',25)->create();
+    factory(Actionlog::class, 'accessory-checkout',15)->create();
+    factory(Actionlog::class, 'consumable-checkout', 15)->create();
+    factory(Actionlog::class, 'component-checkout', 15)->create();
+    factory(Actionlog::class, 'license-checkout-asset', 15)->create();
   }
 }

database/seeds/CompanySeeder.php

@@ -0,0 +1,19 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Database\Seeder;
+
+class CompanySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+        Company::truncate();
+        factory(Company::class, 'company', 4)->create();
+    }
+}

database/seeds/DatabaseSeeder.php

@@ -14,9 +14,12 @@ class DatabaseSeeder extends Seeder
     {
         Model::unguard();
 
+        $this->call(CompanySeeder::class);
+        $this->call(UserSeeder::class);
         $this->call(AssetModelSeeder::class);
         $this->call(AccessorySeeder::class);
         $this->call(AssetSeeder::class);
+        $this->call(ComponentSeeder::class);
         $this->call(ConsumableSeeder::class);
         $this->call(StatuslabelSeeder::class);
         $this->call(SupplierSeeder::class);
@@ -27,7 +30,6 @@ class DatabaseSeeder extends Seeder
         $this->call(ManufacturerSeeder::class);
         $this->call(LocationSeeder::class);
         $this->call(CustomFieldSeeder::class);
-        $this->call(ComponentSeeder::class);
 
         Model::reguard();
     }

database/seeds/UserSeeder.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+class UserSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        // Don't truncate the user column, that might suck.
+        factory(User::class, 'valid-user', 10)->create();
+    }
+}

docker.env

@@ -14,6 +14,8 @@ MAIL_ENV_FROM_NAME=Brady Wetherington
 MAIL_ENV_ENCRYPTION=tcp
 MAIL_ENV_USERNAME=uberbrady@gmail.com
 MAIL_ENV_PASSWORD=N7AqLufTZMULWHWYwJ0ZCw
+MAIL_ENV_REPLYTO_ADDR=you@example.com
+MAIL_ENV_REPLYTO_NAME='Snipe-IT'
 
 #SNIPE-IT Variables
 APP_ENV=develop

resources/lang/ar/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'حول المواد الاستهلاكية',
     'about_consumables_text'  			=> 'المواد الاستهلاكية هي الأشياء المشتراة والتي ستستخدم مع مرور الوقت. على سبيل المثال، حبر الطابعة أو ورق الناسخة.',
-    'consumable_name'                  => 'اسم المادة الإستهلاكية',
-    'cost'				=> 'تكلفة الشراء',
-    'create'                             => 'إنشاء مادة إستهلاكية',
-    'date'					=> 'تاريخ الشراء',
-    'item_no'               => 'رقم القطعة.',
-    'order'					=> 'رقم طلب الشراء',
-    'remaining' 			             => 'المتبقية',
-    'total' 			                 => 'المجموع',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'اسم المادة الإستهلاكية',
+    'cost'              				=> 'تكلفة الشراء',
+    'create'                            => 'إنشاء مادة إستهلاكية',
+    'date'					            => 'تاريخ الشراء',
+    'item_no'                           => 'رقم القطعة.',
+    'order'					            => 'رقم طلب الشراء',
+    'remaining' 			            => 'المتبقية',
+    'total' 			                => 'المجموع',
     'update'                            => 'تحديث المادة الإستهلاكية',
 );

resources/lang/ar/admin/custom_fields/general.php

@@ -6,15 +6,16 @@ return array(
     'about_fieldsets_title'		=> 'حول مجموعة الحقول',
     'about_fieldsets_text'		=> 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'مجموعة-حقول',
     'qty_fields'      	      => 'الحقول الكمية',
     'fieldsets'      	        => 'مجموعات-الحقول',
     'fieldset_name'           => 'إسم مجموعة-الحقل',
     'field_name'              => 'إسم الحقل',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'عنصر النموذج',
     'field_element_short'     => 'عنصر',
     'field_format'            => 'صيغة',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'مجموعة-حقول جديدة',
     'create_field'            => 'حقل جديد مخصص',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

resources/lang/ar/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/ar/admin/hardware/message.php

@@ -37,9 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
-        'success'       => "Your file has been imported",
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,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/ar/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/ar/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/ar/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'التقارير',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'حفظ',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/ar/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

resources/lang/bg/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'Относно консумативите',
     'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
-    'consumable_name'                  => 'Консуматив',
-    'cost'				=> 'Стойност на закупуване',
-    'create'                             => 'Създаване на консуматив',
-    'date'					=> 'Дата на закупуване',
-    'item_no'               => 'Item No.',
-    'order'					=> 'Номер на поръчка',
-    'remaining' 			             => 'Остава',
-    'total' 			                 => 'Oбщо',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Консуматив',
+    'cost'              				=> 'Стойност на закупуване',
+    'create'                            => 'Създаване на консуматив',
+    'date'					            => 'Дата на закупуване',
+    'item_no'                           => 'Item No.',
+    'order'					            => 'Номер на поръчка',
+    'remaining' 			            => 'Остава',
+    'total' 			                => 'Oбщо',
     'update'                            => 'Обновяване на консуматив',
 );

resources/lang/bg/admin/custom_fields/general.php

@@ -4,17 +4,18 @@ return array(
     'custom_fields'		        => 'Потребителски полета',
     'field'		                => 'Поле',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -12,7 +12,8 @@ return array(
     'edit'  					=> 'Редакция на актив',
 	'filetype_info'				=> 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
     'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
-    'requestable'				=> 'Може да бъде изискван',
+    'requestable'               => 'Може да бъде изискван',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Възстановяване на актив',
     'pending'  					=> 'Предстоящ',
     'undeployable'  			=> 'Не може да бъде предоставян',

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

@@ -36,9 +36,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
-        'success'       => "Your file has been imported",
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -66,6 +68,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Активът не беше изискан. Моля опитайте отново.',
         'success' 		=> 'Активът изискан успешно.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Файлът (файловете) не е качен. Моля, опитайте отново.',
         'success' => 'Файлът (файловете) е качен.',
         'nofiles' => 'Не сте избрали файл за качване или файлът, който се опитвате да качите е твърде голям',
-        'invalidfiles' => 'Един или повече файлове са твърде големи или с неразрешен тип. Разрешените типове файлове са png, gif, jpg, doc, docx, pdf, и 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/bg/admin/models/general.php

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
     'restore'                   => 'Възстановяване на модел',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Визуализиране на поле за MAC адрес в активите за този модел',
     'view_deleted'              => 'Преглед на изтритите',
     'view_models'               => 'Преглед на моделите',

resources/lang/bg/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Премахване на асоциация към компания',
     'reports'				=> 'Справки',
     'requested'				=> 'Изискан',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Запис',
     'select'				=> 'Избор',
     'search'				=> 'Търсене',

resources/lang/bg/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

resources/lang/cs/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'O spotřebním materiálu',
     'about_consumables_text'  			=> 'Spotřební materiál jsou takové položky, které jsou v čase spotřebovávány, jako např. toner, inkoust či papír do tiskáren.',
-    'consumable_name'                  => 'Název sp. materiálu',
-    'cost'				=> 'Náklady',
-    'create'                             => 'Vytvořit sp. materiál',
-    'date'					=> 'Datum pořízení',
-    'item_no'               => 'Položka č.',
-    'order'					=> 'Číslo objednávky',
-    'remaining' 			             => 'Zbývá',
-    'total' 			                 => 'Celkem',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Název sp. materiálu',
+    'cost'              				=> 'Náklady',
+    'create'                            => 'Vytvořit sp. materiál',
+    'date'					            => 'Datum pořízení',
+    'item_no'                           => 'Položka č.',
+    'order'					            => 'Číslo objednávky',
+    'remaining' 			            => 'Zbývá',
+    'total' 			                => 'Celkem',
     'update'                            => 'Upravit sp. materiál',
 );

resources/lang/cs/admin/custom_fields/general.php

@@ -6,15 +6,16 @@ return array(
     'about_fieldsets_title'		=> 'O sadách polí',
     'about_fieldsets_text'		=> 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Sada',
     'qty_fields'      	      => 'Počet',
     'fieldsets'      	        => 'Sady',
     'fieldset_name'           => 'Název sady',
     'field_name'              => 'Název pole',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Typ pole',
     'field_element_short'     => 'Typ',
     'field_format'            => 'Formát',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Pořadí',
     'create_fieldset'         => 'Nová sada',
     'create_field'            => 'Nové vlastní pole',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

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

@@ -12,7 +12,8 @@ return array(
     'edit'  					=> 'Upravit majetek',
 	'filetype_info'				=> 'Povolené soubory jsou png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, a rar.',
     'model_deleted'  			=> 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, <a href="/hardware/models/:model_id/restore">klepněte zde</a><br/> a obnovte nejdříve jeho model.',
-    'requestable'				=> 'Lze vyžádat',
+    'requestable'               => 'Lze vyžádat',
+    'requested'				    => 'Requested',
     'restore'  					=> 'Obnovit zařízení',
     'pending'  					=> 'Čekající',
     'undeployable'  			=> 'Nepřiřaditelné',

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

@@ -37,9 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
-        'success'       => "Your file has been imported",
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Majetek nebyl vyžádán, zkuste to prosím znovu',
         'success' 		=> 'Vyžádání majetku proběhlo v pořádku.',
+        'canceled'      => 'Checkout request successfully canceled'
     )
 
 );

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Soubor(y) se nepodařilo nahrát. Prosím zkuste to znovu.',
         '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/cs/admin/models/general.php

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
     'restore'                   => 'Obnovení Modelu',
+    'requestable'               => 'Users may request this model',
 	'show_mac_address'			      => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu',
     'view_deleted'              => 'Zobrazit smazané',
     'view_models'               => 'Zobrazit Modely',

resources/lang/cs/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Remove Company Association',
     'reports'				=> 'Reporty',
     'requested'				=> 'Požadováno',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Uložit',
     'select'				=> 'Zvolit',
     'search'				=> 'Hledat',

resources/lang/cs/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

resources/lang/da/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'About Consumables',
     'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    'consumable_name'                  => 'Consumable Name',
-    'cost'				=> 'Purchase Cost',
-    'create'                             => 'Create Consumable',
-    'date'					=> 'Purchase Date',
-    'item_no'               => 'Item No.',
-    'order'					=> 'Order Number',
-    'remaining' 			             => 'Remaining',
-    'total' 			                 => 'Total',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Consumable Name',
+    'cost'              				=> 'Purchase Cost',
+    'create'                            => 'Create Consumable',
+    'date'					            => 'Purchase Date',
+    'item_no'                           => 'Item No.',
+    'order'					            => 'Order Number',
+    'remaining' 			            => 'Remaining',
+    'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
 );

resources/lang/da/admin/custom_fields/general.php

@@ -4,17 +4,18 @@ return array(
     'custom_fields'		        => 'Custom Fields',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

resources/lang/da/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/da/admin/hardware/message.php

@@ -37,9 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
-        'success'       => "Your file has been imported",
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => "Your file has been imported",
+        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 
@@ -67,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/da/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/da/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/da/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Models',
     'update'				=> 'Update Asset Model',
     'view'					=> 'View Asset Model',
-    'update'				=> 'Update Model',
+    'update'				=> 'Update Asset Model',
     'clone'				=> 'Clone Model',
     'edit'				=> 'Edit Model',
 );

resources/lang/da/general.php

@@ -127,6 +127,7 @@
     'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
     'requested'				=> 'Requested',
+    'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Gem',
     'select'				=> 'Select',
     'search'				=> 'Search',

resources/lang/da/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

resources/lang/de/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'Details Verbrauchsmaterialien',
     'about_consumables_text'  			=> 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.',
-    'consumable_name'                  => 'Name des Verbrauchsmaterials',
-    'cost'				=> 'Einkaufspreis',
-    'create'                             => 'Verbrauchsmaterial erstellen',
-    'date'					=> 'Kaufdatum',
-    'item_no'               => 'Artikel Nr.',
-    'order'					=> 'Bestellnummer',
-    'remaining' 			             => 'übrig',
-    'total' 			                 => 'Gesamt',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Name des Verbrauchsmaterials',
+    'cost'              				=> 'Einkaufspreis',
+    'create'                            => 'Verbrauchsmaterial erstellen',
+    'date'					            => 'Kaufdatum',
+    'item_no'                           => 'Artikel Nr.',
+    'order'					            => 'Bestellnummer',
+    'remaining' 			            => 'übrig',
+    'total' 			                => 'Gesamt',
     'update'                            => 'Verbrauchsmaterial überarbeiten',
 );

resources/lang/de/admin/custom_fields/general.php

@@ -5,16 +5,17 @@ return array(
     'field'		                => 'Feld',
     'about_fieldsets_title'		=> 'Über Feldsätze',
     'about_fieldsets_text'		=> 'Feldsätze erlauben es Gruppen aus benutzerdefinierten Feldern zu erstellen, welche regelmäßig für spezifische Modelltypen benutzt werden.',
-    'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
-    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'custom_format'             => 'Benutzerdefiniertes Format...',
+    'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
+    'encrypt_field_help'      => 'Warnung: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
+    'encrypted'      	        => 'Verschlüsselt',
     'fieldset'      	        => 'Feldsatz',
     'qty_fields'      	      => 'Anzahl Felder',
     'fieldsets'      	        => 'Feldsätze',
     'fieldset_name'           => 'Feldsatzname',
     'field_name'              => 'Feldname',
-    'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values'            => 'Feldwerte',
+    'field_values_help'       => 'Füge wählbare Optionen hinzu, eine pro Zeile. Leere Zeilen außer der ersten Zeile werden ignoriert.',
     'field_element'           => 'Formularelement',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Reihenfolge',
     'create_fieldset'         => 'Neuer Feldsatz',
     'create_field'            => 'Neues benutzerdefiniertes Feld',
+    'value_encrypted'      	        => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen',
 );

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

@@ -12,7 +12,8 @@ return array(
     'edit'  					=> 'Asset editieren',
 	'filetype_info'				=> 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, oder rar.',
     'model_deleted'  			=> 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können <br/><a href="/hardware/models/:model_id/restore">klicken Sie hier um das Modell wiederherzustellen</a>.',
-    'requestable'				=> 'Anforderbar',
+    'requestable'               => 'Anforderbar',
+    'requested'				    => 'Angefordert',
     'restore'  					=> 'Asset wiederherstellen',
     'pending'  					=> 'Ausstehend',
     'undeployable'  			=> 'nicht einsetzbar',

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

@@ -37,9 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'         => 'Some items did not import correctly.',
-        'errorDetail'   => 'The following Items were not imported because of errors.',
-        'success'       => "Your file has been imported",
+        'error'                 => 'Einige Elemente wurden nicht korrekt importiert.',
+        'errorDetail'           => 'Die folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
+        'success'               => "Ihre Datei wurde importiert",
+        'file_delete_success'   => "Die Datei wurde erfolgreich gelöscht",
+        'file_delete_error'      => "Die Datei konnte nicht gelöscht werden",
     ),
 
 
@@ -53,7 +55,7 @@ return array(
         'error'   		=> 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Asset wurde erfolgreich herausgegeben.',
         'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
-        'not_available' => 'That asset is not available for checkout!'
+        'not_available' => 'Dieses Asset kann nicht herausgegeben werden!'
     ),
 
     'checkin' => array(
@@ -67,6 +69,7 @@ return array(
     'requests' => array(
         'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuchen Sie es erneut',
         'success' 		=> 'Asset erfolgreich angefordert.',
+        'canceled'      => 'Herausgeben erfolgreich abgebrochen'
     )
 
 );

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

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Datei(en) wurden nicht hochgeladen. Bitte versuchen Sie es noch einmal.',
         'success' => 'Datei(en) erfolgreich hochgeladen.',
         'nofiles' => 'Es wurde keine Datei für den Upload ausgewählt, oder die Datei ist zu groß',
-        'invalidfiles' => 'Eine oder mehrere Ihrer Datei(en) sind zu groß oder ein Dateityp ist nicht erlaubt. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, and txt.',
+        'invalidfiles' => 'Eine oder mehrere Dateien sind zu groß oder haben einen falschen Dateityp. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, txt, zip, rar, und rtf.',
     ),
 
     'update' => array(

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

@@ -4,6 +4,7 @@ return array(
 
     'deleted'  					        => 'Dieses Modell wurde gelöscht.<a href="/hardware/models/:model_id/restore">klicken Sie hier um es Wiederzuherstellen</a>.',
     'restore'                   => 'Modell wiederherstellen',
+    'requestable'               => 'Benutzer können dieses Modell anfordern',
 	'show_mac_address'			      => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell',
     'view_deleted'              => 'Gelöschte anzeigen',
     'view_models'               => 'Modelle anzeigen',

resources/lang/de/admin/models/table.php

@@ -11,7 +11,7 @@ return array(
     'title'					=> 'Asset Modelle',
     'update'				=> 'Asset Modell aktualisieren',
     'view'					=> 'Asset Modell ansehen',
-    'update'				=> 'Modell aktualisieren',
+    'update'				=> 'Asset Modell aktualisieren',
     'clone'				=> 'Modell duplizieren',
     'edit'				=> 'Modell bearbeiten',
 );

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

@@ -16,7 +16,7 @@ return array(
 	'backups'					=> 'Sicherungen',
 	'barcode_settings'			=> 'Barcode Einstellungen',
     'confirm_purge'			    => 'Bereinigung bestätigen',
-    'confirm_purge_help'		=> 'Geben Sie das Wort "Löschen" in das untere Feld ein um die gelöschten Einträge zu bereinigen. Dies kann nicht rückgängig gemacht werden.',
+    'confirm_purge_help'		=> 'Geben Sie das Wort "DELETE" in das untere Feld ein um die gelöschten Einträge zu bereinigen. Dies kann nicht rückgängig gemacht werden.',
 	'custom_css'				=> 'Eigenes CSS',
 	'custom_css_help'			=> 'Füge eigenes CSS hinzu. Benutze keine <style></style> tags.',
 	'default_currency'  		=> 'Standard Währung',
@@ -51,8 +51,8 @@ return array(
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'LDAP Passwörter synchronisieren',
+    'ldap_pw_sync_help'         => 'Deaktivieren Sie diese Option, wenn Sie nicht möchten, dass LDAP-Passwörter mit lokalen Passwörtern synchronisiert werden. Wenn Sie dies deaktivieren, kann es sein, dass Benutzer sich möglicherweise nicht anmelden können falls der LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
     'ldap_username_field'       => 'Benutzername',
     'ldap_lname_field'          => 'Familienname',
     'ldap_fname_field'          => 'LDAP Vorname',

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

@@ -4,13 +4,13 @@ return array(
     'about'      	=> 'Info Statusbezeichnung',
     'archived'      	=> 'Archiviert',
     'create'      	=> 'Statusbezeichnung erstellen',
-    'color'      	=> 'Chart Color',
+    'color'      	=> 'Diagrammfarbe',
     'deployable'      	=> 'Einsetzbar',
     'info'      	=> 'Status Label werden eingesetzt um diverse Stati Ihrer Assets zu beschreiben. Diese können zB. in Reparatur sein, Gestohlen oder Verlohren worden sein. Sie können neue Status Labels für Einsetzbare, Unerledigte und Archivierte Assets erstellen.',
     'name'      	=> 'Statusname',
     'pending'      	=> 'Unerledigt',
     'status_type'   => 'Statustyp',
-    'show_in_nav'   => 'Show in side nav',
+    'show_in_nav'   => 'Im seitlichen Navigationsbereich zeigen',
     'title'      	=> 'Statusbezeichnungen',
     'undeployable'  => 'nicht Einsetzbar',
     'update'      	=> 'Statusbezeichnung bearbeiten',

resources/lang/de/general.php

@@ -76,7 +76,7 @@
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
     'import'         	    => 'Import',
-    'import-history'        => 'Import History',
+    'import-history'        => 'Import Verlauf',
     'asset_maintenance'        => 'Asset Wartung',
     'asset_maintenance_report' => 'Asset Wartungsbericht',
     'asset_maintenances'       => 'Asset Wartungen',
@@ -127,6 +127,7 @@
     'remove_company'        => 'Firmenzuordnung entfernen',
     'reports'				=> 'Berichte',
     'requested'				=> 'Angefragt',
+    'request_canceled'      => 'Anfrage abgebrochen',
     'save'  				=> 'Speichern',
     'select'				=> 'auswählen',
     'search'				=> 'Suche',

resources/lang/de/mail.php

@@ -0,0 +1,74 @@
+<?php
+
+return array(
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'accessory_name' => 'Accessory Name:',
+    'additional_notes' => 'Additional Notes:',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset:',
+    'asset_name' => 'Asset Name:',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag:',
+    'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+                                    expiring in the next 60 days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled:',
+    'checkin_date' => 'Checkin Date:',
+    'checkout_date' => 'Checkout Date:',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+    'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+    'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+    'Confirm_asset_delivery' => 'Confirm asset delivery.',
+    'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+    'current_QTY' => 'Current QTY',
+    'Days' => 'Days',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expires' => 'Expires',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'item' => 'Item:',
+    'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+                              inventory or will soon be low.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'login' => 'Login:',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'password' => 'Password:',
+    'password_reset' => 'Password Reset',
+
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+                         and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested:',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'serial' => 'Serial:',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'There_are' => '{1} There is|[2,Inf] There are',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'user' => 'User:',
+    'username' => 'Username:',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_credentials' => 'Your Snipe-IT credentials',
+);

resources/lang/el/admin/accessories/message.php

@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory does not exist.',
+    'does_not_exist' => 'Το εξάρτημα δεν υπάρχει.',
     'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
 
     'create' => array(

resources/lang/el/admin/consumables/general.php

@@ -3,13 +3,14 @@
 return array(
     'about_consumables_title' 			=> 'About Consumables',
     'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    'consumable_name'                  => 'Consumable Name',
-    'cost'				=> 'Purchase Cost',
-    'create'                             => 'Create Consumable',
-    'date'					=> 'Purchase Date',
-    'item_no'               => 'Item No.',
-    'order'					=> 'Order Number',
-    'remaining' 			             => 'Remaining',
-    'total' 			                 => 'Total',
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Consumable Name',
+    'cost'              				=> 'Purchase Cost',
+    'create'                            => 'Create Consumable',
+    'date'					            => 'Purchase Date',
+    'item_no'                           => 'Item No.',
+    'order'					            => 'Order Number',
+    'remaining' 			            => 'Remaining',
+    'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
 );

resources/lang/el/admin/custom_fields/general.php

@@ -4,17 +4,18 @@ return array(
     'custom_fields'		        => 'Custom Fields',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
     'custom_format'             => 'Custom format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
     'fieldset'      	        => 'Fieldset',
     'qty_fields'      	      => 'Qty Fields',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
     'field_name'              => 'Field Name',
     'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
     'field_element'           => 'Form Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -25,4 +26,5 @@ return array(
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
 );

resources/lang/el/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',