Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/ReportsController.php

@@ -538,6 +538,9 @@ class ReportsController extends Controller
         if (( e(Input::get('purchase_cost')) == '1' ) && ( e(Input::get('depreciation')) != '1' )) {
             $header[] = 'Purchase Cost';
         }
+        if (e(Input::get('eol')) == '1') {
+            $header[] = 'EOL';
+        }
         if (e(Input::get('order')) == '1') {
             $header[] = 'Order Number';
         }
@@ -613,6 +616,9 @@ class ReportsController extends Controller
             if (e(Input::get('purchase_cost')) == '1' && ( e(Input::get('depreciation')) != '1' )) {
                 $row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
             }
+            if (e(Input::get('eol')) == '1') {
+                $row[] = '"' .($asset->eol_date()) ? $asset->eol_date() : ''. '"';
+            }
             if (e(Input::get('order')) == '1') {
                 if ($asset->order_number) {
                     $row[] = e($asset->order_number);
@@ -621,7 +627,7 @@ class ReportsController extends Controller
                 }
             }
             if (e(Input::get('supplier')) == '1') {
-                if ($asset->supplier_id) {
+                if ($asset->supplier) {
                     $row[] = '"' .e($asset->supplier->name) . '"';
                 } else {
                     $row[] = '';

app/Http/Controllers/UsersController.php

@@ -892,7 +892,7 @@ class UsersController extends Controller
             $sort = e(Input::get('sort'));
         }
 
-        $users = User::select(array('users.id','users.employee_num','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at','users.activated'))
+        $users = User::select(array('users.id','users.employee_num','users.jobtitle','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at','users.activated'))
         ->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'groups', 'userloc', 'company','throttle');
         $users = Company::scopeCompanyables($users);
 
@@ -918,7 +918,7 @@ class UsersController extends Controller
             default:
                 $allowed_columns =
                 [
-                 'last_name','first_name','email','username','employee_num',
+                 'last_name','first_name','email','jobtitle','username','employee_num',
                  'assets','accessories', 'consumables','licenses','groups','activated','created_at'
                 ];
 
@@ -979,6 +979,7 @@ class UsersController extends Controller
                 'id'         => $user->id,
                 'checkbox'      => ($status!='deleted') ? '<div class="text-center hidden-xs hidden-sm"><input type="checkbox" name="edit_user['.e($user->id).']" class="one_required"></div>' : '',
                 'name'          => '<a title="'.e($user->fullName()).'" href="../admin/users/'.e($user->id).'/view">'.e($user->fullName()).'</a>',
+                'jobtitle'          => e($user->jobtitle),
                 'email'         => ($user->email!='') ?
                             '<a href="mailto:'.e($user->email).'" class="hidden-md hidden-lg">'.e($user->email).'</a>'
                             .'<a href="mailto:'.e($user->email).'" class="hidden-xs hidden-sm"><i class="fa fa-envelope"></i></a>'

app/Models/User.php

@@ -382,6 +382,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
                 ->orWhere('users.email', 'LIKE', "%$search%")
                 ->orWhere('users.username', 'LIKE', "%$search%")
                 ->orWhere('users.notes', 'LIKE', "%$search%")
+                ->orWhere('users.jobtitle', 'LIKE', "%$search%")
                 ->orWhere('users.employee_num', 'LIKE', "%$search%")
                 ->orWhere(function ($query) use ($search) {
                     $query->whereHas('userloc', function ($query) use ($search) {

resources/views/reports/custom.blade.php

@@ -41,20 +41,6 @@
             </label>
           </div>
 
-        <div class="checkbox col-md-12">
-          <label>
-            {{ Form::checkbox('company_name', '1') }}
-            {{ trans('general.company') }}
-          </label>
-        </div>
-
-        <div class="checkbox col-md-12">
-          <label>
-            {{ Form::checkbox('company_name', '1') }}
-            {{ trans('general.company') }}
-          </label>
-        </div>
-
         <div class="checkbox col-md-12">
         	<label>
         	{{ Form::checkbox('asset_tag', '1') }}
@@ -104,6 +90,12 @@
              {{ trans('admin/hardware/form.cost') }}
             </label>
         </div>
+          <div class="checkbox col-md-12">
+            <label>
+              {{ Form::checkbox('eol', '1') }}
+              {{ trans('admin/hardware/table.eol') }}
+            </label>
+          </div>
         <div class="checkbox col-md-12">
         	<label>
             {{ Form::checkbox('order', '1') }}

resources/views/users/index.blade.php

@@ -82,6 +82,7 @@
                          <th data-switchable="true" data-sortable="false" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
                          <th data-switchable="true" data-sortable="true" data-field="employee_num" data-visible="false">{{ trans('admin/users/table.employee_num') }}</th>
                          <th data-sortable="true" data-field="name">{{ trans('admin/users/table.name') }}</th>
+                         <th data-switchable="true" data-sortable="true" data-field="jobtitle" data-visible="false">{{ trans('admin/users/table.title') }}</th>
                          <th data-sortable="true" data-field="email">
                              <span class="hidden-md hidden-lg">{{ trans('admin/users/table.email') }}</span>
                              <span class="hidden-xs"><i class="fa fa-envelope fa-lg"></i></span>