Merge branch 'develop'

# Conflicts:
#	config/version.php

.env.example

@@ -104,3 +104,4 @@ FILESYSTEM_DISK=local
 APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
 ALLOW_IFRAMING=false
 APP_CIPHER=AES-256-CBC
+GOOGLE_MAPS_API=

app/Console/Commands/SyncAssetLocations.php

@@ -109,7 +109,7 @@ class SyncAssetLocations extends Command
                     $assigned_asset_asset->unsetEventDispatcher();
                     $assigned_asset_asset->save();
                 } else {
-                    $output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->assetLoc()->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location';
+                    $output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location';
                 }
 
                 $bar->advance();

app/Console/Commands/Version.php

@@ -47,7 +47,7 @@ class Version extends Command
 
         $version = explode('-', $full_hash_version);
         $app_version = $current_app_version = $version[0];
-        $hash_version = $version[2];
+        $hash_version = (array_key_exists('2', $version)) ? $version[2] : '';
         $prerelease_version = '';
 
         $this->line('Branch is: '.$use_branch);
@@ -57,7 +57,6 @@ class Version extends Command
         if (count($version)==3) {
             $this->line('This does not look like an alpha/beta release.');
         } else {
-            print_r($version);
             if (array_key_exists('3',$version)) {
                 $this->line('The current version looks like a beta release.');
                 $prerelease_version = $version[1];

app/Http/Controllers/Api/AssetModelsController.php

@@ -188,17 +188,19 @@ class AssetModelsController extends Controller
             'models.name',
             'models.image',
             'models.model_number',
-        ])->with('manufacturer');
+            'models.manufacturer_id',
+            'models.category_id',
+        ])->with('manufacturer','category');
 
 
         if ($request->has('search')) {
-            $assetmodels = $assetmodels->where('models.name', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('models.model_number', 'LIKE', '%'.$request->get('search').'%');
+            $assetmodels = $assetmodels->SearchByManufacturerOrCat($request->input('search'));
         }
-        $assetmodels = $assetmodels->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50);
+
+        $assetmodels = $assetmodels->OrderCategory('ASC')->OrderManufacturer('ASC')->orderby('models.name', 'asc')->orderby('models.model_number', 'asc')->paginate(50);
 
         foreach ($assetmodels as $assetmodel) {
-            $assetmodel->use_text = $assetmodel->present()->modelName;
+            $assetmodel->use_text = (($assetmodel->category) ? e($assetmodel->category->name) : '').': '.(($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name) : '').' '.$assetmodel->present()->modelName;
             $assetmodel->use_image = ($assetmodel->image) ? url('/').'/uploads/models/'.$assetmodel->image : null;
         }
 

app/Http/Controllers/LocationsController.php

@@ -98,7 +98,7 @@ class LocationsController extends Controller
             $image = $request->file('image');
             $file_name = str_random(25).".".$image->getClientOriginalExtension();
             $path = public_path('uploads/locations/'.$file_name);
-            Image::make($image->getRealPath())->resize(200, null, function ($constraint) {
+            Image::make($image->getRealPath())->resize(600, null, function ($constraint) {
                 $constraint->aspectRatio();
                 $constraint->upsize();
             })->save($path);
@@ -216,7 +216,7 @@ class LocationsController extends Controller
             $file_name = $location->id.'-'.str_slug($image->getClientOriginalName()) . "." . $image->getClientOriginalExtension();
 
             if ($image->getClientOriginalExtension()!='svg') {
-                Image::make($image->getRealPath())->resize(500, null, function ($constraint) {
+                Image::make($image->getRealPath())->resize(600, null, function ($constraint) {
                     $constraint->aspectRatio();
                     $constraint->upsize();
                 })->save(app('locations_upload_path').$file_name);

app/Http/Controllers/ReportsController.php

@@ -141,39 +141,42 @@ class ReportsController extends Controller
                     break;
             }
 
+            $headers=[
+                trans('general.company'),
+                trans('admin/hardware/table.asset_tag'),
+                trans('admin/hardware/form.manufacturer'),
+                trans('general.category'),
+                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('general.supplier'),
+                trans('admin/hardware/table.checkoutto'),
+                trans('general.type'),
+                trans('admin/hardware/table.checkout_date'),
+                trans('admin/hardware/table.location'),
+                trans('general.notes'),
+            ];
+            foreach ($customfields as $field) {
+                $headers[]=$field->name;
+            }
+            fputcsv($handle, $headers);
+
             $assets->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('general.supplier'),
-                    trans('admin/hardware/table.checkoutto'),
-                    trans('general.type'),
-                    trans('admin/hardware/table.checkout_date'),
-                    trans('admin/hardware/table.location'),
-                    trans('general.notes'),
-                ];
-                foreach ($customfields as $field) {
-                    $headers[]=$field->name;
-                }
-                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->category) ? $asset->model->category->name : '',
                         ($asset->model) ? $asset->model->name : '',
                         ($asset->model->model_number) ? $asset->model->model_number : '',
                         ($asset->name) ? $asset->name : '',
@@ -421,261 +424,320 @@ class ReportsController extends Controller
      * @since [v1.0]
      * @return \Illuminate\Http\Response
      */
-    public function postCustom()
+    public function postCustom(Request $request)
     {
-        $assets = Asset::orderBy('created_at', 'DESC')->with('company', 'assignedTo', 'location', 'defaultLoc', 'model', 'supplier', 'assetstatus', 'model.manufacturer')->get();
+
+        \Debugbar::disable();
         $customfields = CustomField::get();
+        $response = new StreamedResponse(function () use ($customfields, $request) {
 
-        $rows   = [ ];
-        $header = [ ];
-
-        if (e(Input::get('company')) == '1') {
-            $header[] = 'Company Name';
-        }
-
-        if (e(Input::get('asset_name')) == '1') {
-            $header[] = 'Asset Name';
-        }
-        if (e(Input::get('asset_tag')) == '1') {
-            $header[] = 'Asset Tag';
-        }
-        if (e(Input::get('manufacturer')) == '1') {
-            $header[] = 'Manufacturer';
-        }
-        if (e(Input::get('model')) == '1') {
-            $header[] = 'Model';
-            $header[] = 'Model Number';
-        }
-        if (e(Input::get('category')) == '1') {
-            $header[] = 'Category';
-        }
-        if (e(Input::get('serial')) == '1') {
-            $header[] = 'Serial';
-        }
-        if (e(Input::get('purchase_date')) == '1') {
-            $header[] = 'Purchase Date';
-        }
-        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';
-        }
-        if (e(Input::get('supplier')) == '1') {
-            $header[] = 'Supplier';
-        }
-        if (e(Input::get('location')) == '1') {
-            $header[] = 'Location';
-        }
-        if (e(Input::get('assigned_to')) == '1') {
-            $header[] = 'Assigned To';
-        }
-        if (e(Input::get('username')) == '1') {
-            $header[] = 'Username';
-        }
-        if (e(Input::get('employee_num')) == '1') {
-            $header[] = 'Employee No.';
-        }
-        if (e(Input::get('status')) == '1') {
-            $header[] = 'Status';
-        }
-        if (e(Input::get('warranty')) == '1') {
-            $header[] = 'Warranty';
-            $header[] = 'Warranty Expires';
-        }
-        if (e(Input::get('depreciation')) == '1') {
-            $header[] = 'Purchase Cost';
-            $header[] = 'Value';
-            $header[] = 'Diff';
-        }
-        if (e(Input::get('expected_checkin')) == '1') {
-            $header[] = trans('admin/hardware/form.expected_checkin');
-        }
-
-        if (e(Input::get('notes')) == '1') {
-            $header[] = trans('general.notes');
-        }
-
-
-        foreach ($customfields as $customfield) {
-            if (e(Input::get($customfield->db_column_name())) == '1') {
-                $header[] = $customfield->name;
-            }
-        }
-
-
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ',');
-
-        foreach ($assets as $asset) {
-            $row = [ ];
-
-            if (e(Input::get('company')) == '1') {
-                $row[] = is_null($asset->company) ? '' : '"'.$asset->company->name.'"';
+            // Open output stream
+            $handle = fopen('php://output', 'w');
+            
+            if ($request->has('use_bom')) {
+                fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF));
             }
 
-            if (e(Input::get('asset_name')) == '1') {
-                $row[] = '"' .e($asset->name) . '"';
-            }
-            if (e(Input::get('asset_tag')) == '1') {
-                $row[] = e($asset->asset_tag);
-            }
-            if (e(Input::get('manufacturer')) == '1') {
-                if ($asset->model->manufacturer) {
-                    $row[] = '"' .e($asset->model->manufacturer->name) . '"';
-                } else {
-                    $row[] = '';
-                }
-            }
-            if (e(Input::get('model')) == '1') {
-                $row[] = '"' . e($asset->model->name) . '"';
-                $row[] = '"' . e($asset->model->model_number) . '"';
-            }
-            if (e(Input::get('category')) == '1') {
-                $row[] = '"' .e($asset->model->category->name) . '"';
-            }
-
-            if (e(Input::get('serial')) == '1') {
-                $row[] = e($asset->serial);
-            }
-            if (e(Input::get('purchase_date')) == '1') {
-                $row[] = e($asset->purchase_date);
-            }
-            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->present()->eol_date()) ? $asset->present()->eol_date() : ''. '"';
-            }
-            if (e(Input::get('order')) == '1') {
-                if ($asset->order_number) {
-                    $row[] = e($asset->order_number);
-                } else {
-                    $row[] = '';
-                }
-            }
-            if (e(Input::get('supplier')) == '1') {
-                if ($asset->supplier) {
-                    $row[] = '"' .e($asset->supplier->name) . '"';
-                } else {
-                    $row[] = '';
-                }
-            }
-
-            if (e(Input::get('location')) == '1') {
-                if($asset->location) {
-                    $show_loc = $asset->location->present()->name();
-                } else {
-                    $show_loc = 'Default location '.$asset->rtd_location_id.' is invalid';
-                }
-                $row[] = $show_loc;
-            }
+            $header = [];
 
 
-            if (e(Input::get('assigned_to')) == '1') {
-                if ($asset->assignedto) {
-                    $row[] = '"' .e($asset->assignedto->present()->name()). '"';
-                } else {
-                    $row[] = ''; // Empty string if unassigned
-                }
+            if ($request->has('company')) {
+                $header[] = trans('general.company');
             }
 
-            if (e(Input::get('username')) == '1') {
-                // Only works if we're checked out to a user, not anything else.
-                if ($asset->checkedOutToUser()) {
-                    if ($asset->assignedto) {
-                        $row[] = '"' .e($asset->assignedto->username). '"';
-                    } else {
-                        $row[] = ''; // Empty string if unassigned
-                    }
-
-                } else {
-                    $row[] = ''; // Empty string if unassigned
-                }
+            if ($request->has('asset_name')) {
+                $header[] = trans('admin/hardware/form.name');
             }
 
-            if (e(Input::get('employee_num')) == '1') {
-                // Only works if we're checked out to a user, not anything else.
-                if ($asset->checkedOutToUser()) {
-                    if ($asset->assignedto) {
-                        $row[] = '"' .e($asset->assignedto->employee_num). '"';
-                    } else {
-                        $row[] = ''; // Empty string if unassigned
-                    }
-
-                } else {
-                    $row[] = ''; // Empty string if unassigned
-                }
+            if ($request->has('asset_tag')) {
+                $header[] = trans('admin/hardware/table.asset_tag');
             }
 
-            if (e(Input::get('status')) == '1') {
-                if (( $asset->status_id == '0' ) && ( $asset->assigned_to == '0' )) {
-                    $row[] = trans('general.ready_to_deploy');
-                } elseif (( $asset->status_id == '' ) && ( $asset->assigned_to == '0' )) {
-                    $row[] = trans('general.pending');
-                } elseif ($asset->assetstatus) {
-                    $row[] = '"' .e($asset->assetstatus->name). '"';
-                } else {
-                    $row[] = '';
-                }
-            }
-            if (e(Input::get('warranty')) == '1') {
-                if ($asset->warranty_months) {
-                    $row[] = $asset->warranty_months;
-                    $row[] = $asset->present()->warrantee_expires();
-                } else {
-                    $row[] = '';
-                    $row[] = '';
-                }
-            }
-            if (e(Input::get('depreciation')) == '1') {
-                $depreciation = $asset->getDepreciatedValue();
-                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
-                $row[]        = '"' . Helper::formatCurrencyOutput($depreciation) . '"';
-                $row[]        = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
-            }
-            if (e(Input::get('expected_checkin')) == '1') {
-                if ($asset->expected_checkin) {
-                    $row[] = '"' .e($asset->expected_checkin). '"';
-                } else {
-                    $row[] = ''; // Empty string if blankd
-                }
+            if ($request->has('model')) {
+                $header[] = trans('admin/hardware/form.model');
+                $header[] = trans('general.model_no');
             }
 
-            if (e(Input::get('notes')) == '1') {
-                if ($asset->notes) {
-                    $row[] = '"' .$asset->notes . '"';
-                } else {
-                    $row[] = '';
-                }
+            if ($request->has('category')) {
+                $header[] = trans('general.category');
             }
 
+            if ($request->has('manufacturer')) {
+                $header[] = trans('admin/hardware/form.manufacturer');
+            }
+
+            if ($request->has('serial')) {
+                $header[] = trans('admin/hardware/table.serial');
+            }
+            if ($request->has('purchase_date')) {
+                $header[] = trans('admin/hardware/table.purchase_date');
+            }
+
+            if ($request->has('purchase_cost')) {
+                $header[] = trans('admin/hardware/table.purchase_cost');
+            }
+
+            if ($request->has('eol')) {
+                $header[] = trans('admin/hardware/table.eol');
+            }
+
+            if ($request->has('order')) {
+                $header[] = trans('admin/hardware/form.order');
+            }
+
+            if ($request->has('supplier')) {
+                $header[] = trans('general.supplier');
+            }
+
+            if ($request->has('location')) {
+                $header[] = trans('admin/hardware/table.location');
+            }
+
+            if ($request->has('assigned_to')) {
+                $header[] = trans('admin/hardware/table.checkoutto');
+                $header[] = trans('general.type');
+            }
+
+            if ($request->has('username')) {
+                $header[] = 'Username';
+            }
+
+            if ($request->has('employee_num')) {
+                $header[] = 'Employee No.';
+            }
+
+            if ($request->has('status')) {
+                $header[] = trans('general.status');
+            }
+
+            if ($request->has('warranty')) {
+                $header[] = 'Warranty';
+                $header[] = 'Warranty Expires';
+            }
+            if ($request->has('depreciation')) {
+                $header[] = 'Purchase Cost';
+                $header[] = 'Value';
+                $header[] = 'Diff';
+            }
+
+            if ($request->has('checkout_date')) {
+                $header[] = trans('admin/hardware/table.checkout_date');
+            }
+
+            if ($request->has('expected_checkin')) {
+                $header[] = trans('admin/hardware/form.expected_checkin');
+            }
+
+            if ($request->has('created_at')) {
+                $header[] = trans('general.created_at');
+            }
+
+            if ($request->has('updated_at')) {
+                $header[] = trans('general.updated_at');
+            }
+
+            if ($request->has('notes')) {
+                $header[] = trans('general.notes');
+            }
+
+
             foreach ($customfields as $customfield) {
-                $column_name = $customfield->db_column_name();
                 if (e(Input::get($customfield->db_column_name())) == '1') {
-                    $row[] = str_replace(",", "\,", $asset->$column_name);
+                    $header[] = $customfield->name;
                 }
             }
 
 
-            $rows[] = implode($row, ',');
-        }
+            fputcsv($handle, $header);
+
+            $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
+                'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
+                'model.category', 'model.manufacturer','supplier');
+            
+            if ($request->has('by_location_id')) {
+                $assets->where('assets.location_id', $request->input('by_location_id'));
+            }
+
+            if ($request->has('by_supplier_id')) {
+                $assets->where('assets.supplier_id', $request->input('by_supplier_id'));
+            }
+
+            if ($request->has('by_company_id')) {
+                $assets->where('assets.company_id', $request->input('by_company_id'));
+            }
+
+            if ($request->has('by_model_id')) {
+                $assets->where('assets.model_id', $request->input('by_model_id'));
+            }
+
+            if ($request->has('by_category_id')) {
+                $assets->InCategory($request->input('by_category_id'));
+            }
+
+            if ($request->has('by_manufacturer_id')) {
+                $assets->ByManufacturer($request->input('by_manufacturer_id'));
+            }
+
+            if ($request->has('by_order_number')) {
+                $assets->where('assets.order_number', $request->input('by_order_number'));
+            }
+
+            if ($request->has('by_status_id')) {
+                $assets->where('assets.status_id', $request->input('by_status_id'));
+            }
+
+            if (($request->has('purchase_start')) && ($request->has('purchase_end'))) {
+                $assets->whereBetween('assets.purchase_date', [$request->input('purchase_start'), $request->input('purchase_end')]);
+            }
+
+            if (($request->has('created_start')) && ($request->has('created_end'))) {
+                $assets->whereBetween('assets.created_at', [$request->input('created_start'), $request->input('created_end')]);
+            }
+            
+            $assets->orderBy('assets.created_at', 'ASC')->chunk(500, function($assets) use($handle, $customfields, $request) {
+
+                foreach ($assets as $asset) {
+                    $row = [];
+                    
+                    if ($request->has('company')) {
+                        $row[] = ($asset->company) ? $asset->company->name : '';
+                    }
+
+                    if ($request->has('asset_name')) {
+                        $row[] = ($asset->name) ? $asset->name : '';
+                    }
+
+                    if ($request->has('asset_tag')) {
+                        $row[] = ($asset->asset_tag) ? $asset->asset_tag : '';
+                    }
+
+                    if ($request->has('model')) {
+                        $row[] = ($asset->model) ? $asset->model->name : '';
+                        $row[] = ($asset->model) ? $asset->model->model_number : '';
+                    }
+
+                    if ($request->has('category')) {
+                        $row[] = ($asset->model->category) ? $asset->model->category->name : '';
+                    }
+
+                    if ($request->has('manufacturer')) {
+                        $row[] = ($asset->model && $asset->model->manufacturer) ? $asset->model->manufacturer->name : '';
+                    }
+
+                    if ($request->has('serial')) {
+                        $row[] = ($asset->serial) ? $asset->serial : '';
+                    }
+
+                    if ($request->has('purchase_date')) {
+                        $row[] = ($asset->purchase_date) ? $asset->purchase_date : '';
+                    }
+
+                    if ($request->has('purchase_cost')) {
+                        $row[] = ($asset->purchase_cost) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '';
+                    }
+
+                    if ($request->has('eol')) {
+                        $row[] = ($asset->eol) ? $asset->present()->eol_date() : '';
+                    }
+
+                    if ($request->has('order')) {
+                        $row[] = ($asset->order_number) ? $asset->order_number : '';
+                    }
+
+                    if ($request->has('supplier')) {
+                        $row[] = ($asset->supplier) ? $asset->supplier->name : '';
+                    }
+                    
+
+                    if ($request->has('location')) {
+                        $row[] = ($asset->location) ? $asset->location->present()->name() : '';
+                    }
+
+                    if ($request->has('assigned_to')) {
+                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : '');
+                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType());
+                    }
+
+                    if ($request->has('username')) {
+                        // Only works if we're checked out to a user, not anything else.
+                        if ($asset->checkedOutToUser()) {
+                            $row[] = ($asset->assignedto) ? $asset->assignedto->username : '';
+                        } else {
+                            $row[] = ''; // Empty string if unassigned
+                        }
+                    }
+
+                    if ($request->has('employee_num')) {
+                        // Only works if we're checked out to a user, not anything else.
+                        if ($asset->checkedOutToUser()) {
+                            $row[] = ($asset->assignedto) ? $asset->assignedto->employee_num : '';
+                        } else {
+                            $row[] = ''; // Empty string if unassigned
+                        }
+                    }
+
+                    if ($request->has('status')) {
+                        $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
+                    }
+
+
+                    if ($request->has('warranty')) {
+                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
+                        $row[] = $asset->present()->warrantee_expires();
+                    }
+
+                    if ($request->has('purchase_cost')) {
+                        $row[]  = ($asset->purchase_cost!='') ? Helper::formatCurrencyOutput($asset->purchase_cost) : '';
+                    }
+
+                    if ($request->has('depreciation')) {
+                            $depreciation = $asset->getDepreciatedValue();
+                            $diff = ($asset->purchase_cost - $depreciation);
+                            $row[]        = Helper::formatCurrencyOutput($depreciation);
+                            $row[]        = Helper::formatCurrencyOutput($diff);
+                    }
+
+                    if ($request->has('checkout_date')) {
+                        $row[] = ($asset->last_checkout) ? $asset->last_checkout : '';
+                    }
+
+                    if ($request->has('expected_checkin')) {
+                        $row[] = ($asset->expected_checkin) ? $asset->expected_checkin : '';
+                    }
+
+                    if ($request->has('created_at')) {
+                        $row[] = ($asset->created_at) ? $asset->created_at : '';
+                    }
+
+                    if ($request->has('updated_at')) {
+                        $row[] = ($asset->updated_at) ? $asset->updated_at : '';
+                    }
+
+                    if ($request->has('notes')) {
+                        $row[] = ($asset->notes) ? $asset->notes : '';
+                    }
+
+                    foreach ($customfields as $customfield) {
+                        $column_name = $customfield->db_column_name();
+                        if ($request->has($customfield->db_column_name())) {
+                            $row[] = $asset->$column_name;
+                        }
+                    }
+                    fputcsv($handle, $row);
+                }
+            });
+
+            // Close the output stream
+            fclose($handle);
+        }, 200, [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition'
+            => 'attachment; filename="custom-assets-report-'.date('Y-m-d-his').'.csv"',
+        ]);
+
+        return $response;
 
-        // spit out a csv
-        if (array_filter($rows)) {
-            $csv      = implode($rows, "\n");
-            $response = Response::make($csv, 200);
-            $response->header('Content-Type', 'text/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'));
-        }
     }
 
 

app/Http/Controllers/SuppliersController.php

@@ -251,7 +251,7 @@ class SuppliersController extends Controller
         $error = trans('admin/suppliers/message.does_not_exist', compact('id'));
 
         // Redirect to the user management page
-        return redirect()->route('suppliers')->with('error', $error);
+        return redirect()->route('suppliers.index')->with('error', $error);
     }
 
 }

app/Models/Asset.php

@@ -257,13 +257,10 @@ class Asset extends Depreciable
   /**
    * Get the asset's location based on the assigned user
    **/
-    public function assetLoc()
+    public function assetLoc($iterations = 1,$first_asset = null)
     {
-        static $iterations=0;
-        static $first_asset;
         if (!empty($this->assignedType())) {
             if ($this->assignedType() == self::ASSET) {
-                $iterations++;
                 if(!$first_asset) {
                     $first_asset=$this;
                 }
@@ -272,7 +269,7 @@ class Asset extends Depreciable
                 }
                 $assigned_to=Asset::find($this->assigned_to); //have to do this this way because otherwise it errors
                 if ($assigned_to) {
-                    return $assigned_to->assetLoc();
+                    return $assigned_to->assetLoc($iterations + 1, $first_asset);
                 } // Recurse until we have a final location
             }
             if ($this->assignedType() == self::LOCATION) {
@@ -817,6 +814,8 @@ class Asset extends Depreciable
                     ->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%')
+                    ->orWhere('assets.purchase_date', 'LIKE', '%'.$search.'%')
+                    ->orWhere('assets.purchase_cost', 'LIKE', '%'.$search.'%')
                     ->orWhere('assets.notes', 'LIKE', '%'.$search.'%');
             }
             foreach (CustomField::all() as $field) {

app/Models/AssetModel.php

@@ -169,6 +169,32 @@ class AssetModel extends SnipeModel
 
     }
 
+    /**
+     * Query builder scope to search on text, including catgeory and manufacturer name
+     *
+     * @param  Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $search      Search term
+     *
+     * @return Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeSearchByManufacturerOrCat($query, $search)
+    {
+
+        return $query->where('models.name', 'LIKE', "%$search%")
+            ->orWhere('model_number', 'LIKE', "%$search%")
+            ->orWhere(function ($query) use ($search) {
+                $query->whereHas('category', function ($query) use ($search) {
+                    $query->where('categories.name', 'LIKE', '%'.$search.'%');
+                });
+            })
+            ->orWhere(function ($query) use ($search) {
+                $query->whereHas('manufacturer', function ($query) use ($search) {
+                    $query->where('manufacturers.name', 'LIKE', '%'.$search.'%');
+                });
+            });
+
+    }
+
     /**
      * Query builder scope to order on manufacturer
      *
@@ -182,5 +208,18 @@ class AssetModel extends SnipeModel
         return $query->leftJoin('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order);
     }
 
+    /**
+     * Query builder scope to order on category name
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderCategory($query, $order)
+    {
+        return $query->leftJoin('categories', 'models.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
+    }
+
 
 }

config/services.php

@@ -46,5 +46,9 @@ return [
         'level' => env('ROLLBAR_LEVEL', 'error'),
     ],
 
+    'google' => [
+        'maps_api_key' => env('GOOGLE_MAPS_API')
+    ],
+
 
 ];

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.1.6',
-  'full_app_version' => 'v4.1.6 - build 2963-g83c8449',
-  'build_version' => '2963',
+  'app_version' => 'v4.1.7',
+  'full_app_version' => 'v4.1.7 - build 3031-g4f3c932',
+  'build_version' => '3031',
   'prerelease_version' => '',
-  'hash_version' => 'g83c8449',
-  'full_hash' => 'v4.1.5-76-gb934d2e',
+  'hash_version' => 'g4f3c932',
+  'full_hash' => 'v4.1.6-37-g4f3c932',
   'branch' => 'master',
 );

public/mix-manifest.json

@@ -2,13 +2,13 @@
     "/js/build/vue.js": "/js/build/vue.js?id=e6804371942215bd1d7d",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
     "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
-    "/css/overrides.css": "/css/overrides.css?id=9ae1a3c861441320c5a1",
+    "/css/overrides.css": "/css/overrides.css?id=ca0621c2a909d165534d",
     "/js/build/vue.js.map": "/js/build/vue.js.map?id=3b3d417664a61dcce3e9",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
     "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
     "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
-    "/css/dist/all.css": "/css/dist/all.css?id=7c3842d2639193ac7e88",
-    "/js/dist/all.js": "/js/dist/all.js?id=7b52ead3a55086ea1f8d",
-    "/css/build/all.css": "/css/build/all.css?id=7c3842d2639193ac7e88",
-    "/js/build/all.js": "/js/build/all.js?id=7b52ead3a55086ea1f8d"
+    "/css/dist/all.css": "/css/dist/all.css?id=51e5995cec7ce583f5dd",
+    "/js/dist/all.js": "/js/dist/all.js?id=88f08e0103b14f7949b3",
+    "/css/build/all.css": "/css/build/all.css?id=51e5995cec7ce583f5dd",
+    "/js/build/all.js": "/js/build/all.js?id=88f08e0103b14f7949b3"
 }

resources/assets/js/snipeit.js

@@ -241,9 +241,9 @@ $(document).ready(function () {
         var markup = "<div class='clearfix'>" ;
         markup +="<div class='pull-left' style='padding-right: 10px;'>";
         if (datalist.image) {
-            markup += "<img src='" + datalist.image + "' style='max-height: 20px'>";
+            markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;'></div>";
         } else {
-            markup += "<div style='height: 20px; width: 20px;'></div>";
+            markup += "<div style='height: 20px; width: 30px;'></div>";
         }
 
         markup += "</div><div>" + datalist.text + "</div>";

resources/assets/less/overrides.less

@@ -315,3 +315,10 @@ img.navbar-brand-img, .navbar-brand>img {
   max-height: 50px;
 }
 
+.input-daterange {
+  border-radius: 0px;
+}
+
+.btn.bg-maroon, .btn.bg-purple{
+  min-width:90px;
+}

resources/views/accessories/edit.blade.php

@@ -11,9 +11,9 @@
 
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/accessories/general.accessory_name')])
-@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id'])
+@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true'])
 @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.order_number')

resources/views/account/profile.blade.php

@@ -38,7 +38,7 @@
 
 
         <!-- Location -->
-        @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+        @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location')])
 
         <!-- Language -->
         <div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">

resources/views/consumables/edit.blade.php

@@ -10,8 +10,8 @@
 
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/consumables/table.title')])
-@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id'])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
+@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.item_number')

resources/views/hardware/bulk-checkout.blade.php

@@ -34,7 +34,7 @@
               <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
                   {{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
                   <div class="col-md-8">
-                      <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
+                      <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}">
                           <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                       </div>
@@ -46,7 +46,7 @@
               <div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
                   {{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
                   <div class="col-md-8">
-                      <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
+                      <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
                           <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                       </div>

resources/views/hardware/checkout.blade.php

@@ -69,7 +69,7 @@
             <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
               {{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
               <div class="col-md-8">
-                  <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
+                  <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
                       <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Input::old('checkout_at') }}">
                       <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                   </div>
@@ -81,7 +81,7 @@
             <div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
               {{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
               <div class="col-md-8">
-                  <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd">
+                  <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
                       <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
                       <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                   </div>
@@ -144,4 +144,15 @@
 
 @section('moar_scripts')
     @include('partials/assets-assigned')
+
+    <script>
+//        $('#checkout_at').datepicker({
+//            clearBtn: true,
+//            todayHighlight: true,
+//            endDate: '0d',
+//            format: 'yyyy-mm-dd'
+//        });
+
+
+    </script>
 @stop

resources/views/hardware/edit.blade.php

@@ -26,7 +26,7 @@
     </div>
   </div>
 
-    @include ('partials.forms.edit.model-select', ['translated_name' => trans('admin/hardware/form.model'), 'fieldname' => 'model_id'])
+    @include ('partials.forms.edit.model-select', ['translated_name' => trans('admin/hardware/form.model'), 'fieldname' => 'model_id', 'required' => 'true'])
 
 
   <div id='custom_fields_content'>

resources/views/hardware/index.blade.php

@@ -42,8 +42,8 @@
 @stop
 
 @section('header_right')
-  <a href="{{ route('reports.export.assets', ['status'=> e(Input::get('status'))]) }}" style="margin-right: 5px;" class="btn btn-default"><i class="fa fa-download icon-white"></i>
-    {{ trans('admin/hardware/table.dl_csv') }}</a>
+  <a href="{{ route('reports/custom') }}" style="margin-right: 5px;" class="btn btn-default">
+    Custom Export</a>
   <a href="{{ route('hardware.create') }}" class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
 @stop
 
@@ -86,7 +86,7 @@
                   'company_id'=>e(Input::get('company_id')),
                   'status_id'=>e(Input::get('status_id'))))}}"
               data-click-to-select="true"
-              data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.hash_version') }}">
+              data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.app_version') }}">
               </table>
             </div><!-- /.col -->
           </div><!-- /.row -->

resources/views/layouts/default.blade.php

@@ -218,14 +218,6 @@
                            </a>
                        </li>
                        @endcan
-                       @can('create', \App\Models\User::class)
-                       <li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
-                           <a href="{{ route('users.create') }}">
-                           <i class="fa fa-user fa-fw"></i>
-                           {{ trans('general.user') }}
-                           </a>
-                       </li>
-                       @endcan
                        @can('create', \App\Models\Component::class)
                        <li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
                            <a href="{{ route('components.create') }}">
@@ -234,6 +226,14 @@
                            </a>
                        </li>
                        @endcan
+                         @can('create', \App\Models\User::class)
+                             <li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
+                                 <a href="{{ route('users.create') }}">
+                                     <i class="fa fa-user fa-fw"></i>
+                                     {{ trans('general.user') }}
+                                 </a>
+                             </li>
+                         @endcan
                    </ul>
                 </li>
                @endcan

resources/views/licenses/edit.blade.php

@@ -31,7 +31,7 @@
 </div>
 
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
 
 <!-- Licensed to name -->
 <div class="form-group {{ $errors->has('license_name') ? ' has-error' : '' }}">

resources/views/locations/view.blade.php

@@ -5,9 +5,7 @@
 
  {{ trans('general.location') }}:
  {{ $location->name }}
- @if ($location->manager)
-    <div class="h6"> {!! trans('admin/users/table.manager') . ': ' . $location->manager->present()->nameUrl() !!}</div>
- @endif
+ 
 @parent
 @stop
 
@@ -19,7 +17,9 @@
 @section('content')
 
 <div class="row">
-  <div class="col-md-12">
+  <div class="col-md-9">
+
+
     <div class="box box-default">
     <div class="box-header with-border">
         <div class="box-heading">
@@ -27,8 +27,6 @@
         </div>
     </div>
       <div class="box-body">
-        <div class="row">
-          <div class="col-md-12">
             <div class="table table-responsive">
               <table
               name="location_users"
@@ -40,53 +38,106 @@
               data-cookie-id-table="location_usersDetailTable">
                 <thead>
                   <tr>
-                    <th data-searchable="false" data-sortable="false"  data-formatter="usersLinkFormatter" data-field="name">{{ trans('general.user') }}</th>
+                    <th data-searchable="false" data-visible="false" data-sortable="true" data-field="id">{{ trans('general.id') }}</th>
+                    <th data-searchable="false" data-sortable="false"  data-formatter="imageFormatter" data-field="avatar">Avatar</th>
+                    <th data-searchable="true" data-sortable="true" data-formatter="usersLinkFormatter" data-field="name">{{ trans('general.user') }}</th>
+                    <th data-searchable="true" data-sortable="true"  data-formatter="usersLinkFormatter" data-field="jobtitle">{{ trans('admin/users/table.title') }}</th>
+                    <th data-searchable="true" data-sortable="true"  data-formatter="emailFormatter" data-field="email">{{ trans('admin/users/table.email') }}</th>
+                    <th data-searchable="true" data-visible="false" data-sortable="true" data-field="phone">{{ trans('admin/users/table.phone') }}</th>
+                    <th data-searchable="true" data-visible="false" data-sortable="true" data-formatter="usersLinkObjFormatter" data-field="manager">{{ trans('admin/users/table.manager') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="assets_count"><span class="hidden-md hidden-lg">Assets</span><span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span></th>
+                    <th data-searchable="true" data-sortable="true" data-field="licenses_count"><span class="hidden-md hidden-lg">Licenses</span><span class="hidden-xs"><i class="fa fa-floppy-o fa-lg"></i></span></th>
+                    <th data-searchable="true" data-sortable="true" data-field="consumables_count"><span class="hidden-md hidden-lg">Consumables</span><span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span></th>
+                    <th data-searchable="true" data-sortable="true" data-field="accessories_count"><span class="hidden-md hidden-lg">Accessories</span><span class="hidden-xs"><i class="fa fa-keyboard-o fa-lg"></i></span></th>
+                    <th data-searchable="true" data-sortable="true"  data-formatter="departmentsLinkObjFormatter" data-field="department">{{ trans('general.department') }}</th>
+                    <th data-searchable="true" data-sortable="true"  data-formatter="usersActionsFormatter" data-field="actions">{{ trans('table.actions') }}</th>
                   </tr>
                 </thead>
               </table>
-            </div>
+            </div><!-- /.table-responsive -->
+          </div><!-- /.box-body -->
+        </div> <!--/.box-->
+
+      <div class="box box-default">
+        <div class="box-header with-border">
+          <div class="box-heading">
+            <h3 class="box-title">{{ trans('general.assets') }}</h3>
           </div>
         </div>
+        <div class="box-body">
+              <div class="table table-responsive">
+                <table
+                        name="location_assets"
+                        id="table-assets"
+                        data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}"
+                        class="table table-striped snipe-table"
+                        data-cookie="true"
+                        data-show-footer="true"
+                        data-click-to-select="true"
+                        data-cookie-id-table="location_assetsDetailTable">
+                  <thead>
+                  <tr>
+                    <th data-searchable="false" data-visible="false" data-sortable="true" data-field="id">{{ trans('general.id') }}</th>
+                    <th data-searchable="false" data-visible="true" data-sortable="false" data-formatter="imageFormatter" data-field="image">{{ trans('admin/hardware/table.image') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-formatter="hardwareLinkFormatter" data-field="name">{{ trans('general.name') }}</th>
+                    <th data-searchable="true" data-formatter="modelsLinkObjFormatter" data-sortable="true" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/form.tag') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
+                    <th data-searchable="true" data-visible="false" data-sortable="true" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
+                    <th data-field="purchase_cost" data-searchable="true" data-sortable="true" data-footer-formatter="sumFormatter">{{ trans('general.purchase_cost') }}</th>
+                    <th data-searchable="false" data-sortable="false" data-field="checkincheckout" data-formatter="hardwareInOutFormatter">Checkin/Checkout</th>
+                    <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('table.actions') }}</th>
+                  </tr>
+                  </thead>
+                </table>
+              </div><!-- /.table-responsive -->
+            </div><!-- /.box-body -->
+          </div> <!--/.box-->
+
+  </div><!--/.col-md-9-->
+
+  <div class="col-md-3">
+
+    @if ($location->image!='')
+      <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+        <img src="{{ app('locations_upload_url') }}/{{ $location->image }}" class="img-responsive img-thumbnail" alt="{{ $location->name }}">
       </div>
-    </div>
+    @endif
+      <div class="col-md-12">
+        <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px;">
+          @if ($location->address!='')
+            <li>{{ $location->address }}</li>
+           @endif
+            @if ($location->address2!='')
+              <li>{{ $location->address2 }}</li>
+            @endif
+            @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
+              <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
+            @endif
+            @if (($location->manager))
+              <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
+            @endif
+            @if (($location->parent))
+              <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
+            @endif
+        </ul>
+
+        @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
+          <div class="col-md-12 text-center">
+            <img src="https://maps.googleapis.com/maps/api/staticmap?center={{ urlencode($location->city.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
+          </div>
+        @endif
+
+
+      </div>
+
+
   </div>
 </div>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-default">
-    <div class="box-header with-border">
-    <div class="box-heading">
-        <h3 class="box-title">{{ trans('general.assets') }}</h3>
-    </div>
-    </div>
-      <div class="box-body">
-        <div class="row">
-          <div class="col-md-12">
-            <div class="table table-responsive">
-              <table
-              name="location_assets"
-              id="table-assets"
-              data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}"
-              class="table table-striped snipe-table"
-              data-cookie="true"
-              data-click-to-select="true"
-              data-cookie-id-table="location_assetsDetailTable">
-                <thead>
-                  <tr>
-                    <th data-searchable="false" data-sortable="false"  data-formatter="hardwareLinkFormatter" data-field="name">{{ trans('general.name') }}</th>
-                    <th data-searchable="false" data-formatter="modelsLinkObjFormatter" data-sortable="false" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
-                    <th data-searchable="false" data-sortable="false" data-field="asset_tag">{{ trans('admin/hardware/form.tag') }}</th>
-                    <th data-searchable="false" data-sortable="false" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
-                  </tr>
-                </thead>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+
+
+
 </div>
 
 @stop

resources/views/models/edit.blade.php

@@ -10,8 +10,8 @@
 @section('inputFields')
 
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name')])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
-@include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
+@include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.depreciation')
 

resources/views/partials/forms/edit/category-select.blade.php

@@ -3,9 +3,9 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-7 required">
+    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
-            @if ($category_id = Input::old($fieldname, $item->{$fieldname}))
+            @if ($category_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $category_id }}" selected="selected">
                     {{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
                 </option>

resources/views/partials/forms/edit/location-profile-select.blade.php

@@ -0,0 +1,22 @@
+<!-- Location -->
+<div id="location_id" class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
+
+    {{ Form::label('location_id', $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="locations" name="location_id" style="width: 100%" id="location_id_location_select">
+            @if ($location_id = Input::old('location_id', (isset($user)) ? $user->location_id : ''))
+                <option value="{{ $location_id }}" selected="selected">
+                    {{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
+                </option>
+            @else
+                <option value="">{{ trans('general.select_location') }}</option>
+            @endif
+        </select>
+    </div>
+
+    {!! $errors->first('location_id', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
+
+</div>
+
+
+

resources/views/partials/forms/edit/location-select.blade.php

@@ -16,7 +16,9 @@
 
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\Location::class)
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
             <a href='{{ route('modal.location') }}' data-toggle="modal"  data-target="#createModal" data-dependency="location" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-default">New</a>
+            @endif
         @endcan
     </div>
 

resources/views/partials/forms/edit/manufacturer-select.blade.php

@@ -3,9 +3,9 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-7 required">
+    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="manufacturers" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
-            @if ($manufacturer_id = Input::old($fieldname, $item->{$fieldname}))
+            @if ($manufacturer_id = Input::old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $manufacturer_id }}" selected="selected">
                     {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
                 </option>

resources/views/partials/forms/edit/model-select.blade.php

@@ -3,7 +3,7 @@
 
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
-    <div class="col-md-7 required">
+    <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
         <select class="js-data-ajax" data-endpoint="models" name="{{ $fieldname }}" style="width: 100%" id="model_select_id">
             @if ($model_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $model_id }}" selected="selected">
@@ -17,8 +17,10 @@
     </div>
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\AssetModel::class)
-            <a href='{{ route('modal.model') }}' data-toggle="modal"  data-target="#createModal" data-dependency="model" data-select='model_select_id' class="btn btn-sm btn-default">New</a>
-            <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.model') }}' data-toggle="modal"  data-target="#createModal" data-dependency="model" data-select='model_select_id' class="btn btn-sm btn-default">New</a>
+                <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
+            @endif
         @endcan
     </div>
 

resources/views/partials/forms/edit/supplier-select.blade.php

@@ -16,7 +16,9 @@
 
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\Supplier::class)
-            <a href='{{ route('modal.supplier') }}' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select' class="btn btn-sm btn-default">New</a>
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.supplier') }}' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select' class="btn btn-sm btn-default">New</a>
+            @endif
         @endcan
     </div>
 

resources/views/partials/forms/edit/user-select.blade.php

@@ -16,7 +16,9 @@
 
     <div class="col-md-1 col-sm-1 text-left">
         @can('create', \App\Models\User::class)
-            <a href='{{ route('modal.user') }}' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_user_select' class="btn btn-sm btn-default">New</a>
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.user') }}' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_user_select' class="btn btn-sm btn-default">New</a>
+            @endif
         @endcan
     </div>
 

resources/views/reports/custom.blade.php

@@ -28,149 +28,239 @@
         </div><!-- /.box-header -->
 
         <div class="box-body">
-          <div class="col-md-3">
+          <div class="col-md-4">
+
 
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('company', '1') }}
+                <input type="checkbox" class="all minimal" checked="checked">
+               Select All
+              </label>
+            </div>
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox('company', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.company') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-              {{ Form::checkbox('asset_tag', '1') }}
+              {{ Form::checkbox('asset_tag', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.asset_tag') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('asset_name', '1') }}
+                {{ Form::checkbox('asset_name', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/form.name') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('manufacturer', '1') }}
+                {{ Form::checkbox('manufacturer', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.manufacturer') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('model', '1') }}
+                {{ Form::checkbox('model', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.asset_models') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('category', '1') }}
+                {{ Form::checkbox('category', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.category') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('serial', '1') }}
+                {{ Form::checkbox('serial', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/table.serial') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('purchase_date', '1') }}
+                {{ Form::checkbox('purchase_date', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/licenses/table.purchase_date') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('purchase_cost', '1') }}
+                {{ Form::checkbox('purchase_cost', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/form.cost') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('eol', '1') }}
+                {{ Form::checkbox('eol', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/table.eol') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('order', '1') }}
+                {{ Form::checkbox('order', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/form.order') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('supplier', '1') }}
+                {{ Form::checkbox('supplier', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.suppliers') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('location', '1') }}
+                {{ Form::checkbox('location', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.location') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('assigned_to', '1') }}
+                {{ Form::checkbox('assigned_to', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/licenses/table.assigned_to') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('username', '1') }}
+                {{ Form::checkbox('username', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/users/table.username') }}
               </label>
             </div>
+
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('employee_num', '1') }}
+                {{ Form::checkbox('employee_num', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/users/table.employee_num') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('status', '1') }}
+                {{ Form::checkbox('status', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.status') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('warranty', '1') }}
+                {{ Form::checkbox('warranty', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/form.warranty') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('depreciation', '1') }}
+                {{ Form::checkbox('depreciation', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.depreciation') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('expected_checkin', '1') }}
+                {{ Form::checkbox('checkout_date', '1', '1', ['class' => 'minimal']) }}
+                {{ trans('admin/hardware/table.checkout_date') }}
+              </label>
+            </div>
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox('expected_checkin', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('admin/hardware/form.expected_checkin') }}
               </label>
             </div>
             <div class="checkbox col-md-12">
               <label>
-                {{ Form::checkbox('notes', '1') }}
+                {{ Form::checkbox('created_at', '1', '1', ['class' => 'minimal']) }}
+                {{ trans('general.created_at') }}
+              </label>
+            </div>
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox('updated_at', '1', '1', ['class' => 'minimal']) }}
+                {{ trans('general.updated_at') }}
+              </label>
+            </div>
+            <div class="checkbox col-md-12">
+              <label>
+                {{ Form::checkbox('notes', '1', '1', ['class' => 'minimal']) }}
                 {{ trans('general.notes') }}
               </label>
             </div>
 
-            @foreach ($customfields as $customfield)
+            @if ($customfields->count() > 0)
               <div class="checkbox col-md-12">
-                <label>
-                  {{ Form::checkbox($customfield->db_column_name(), '1') }}
-                  {{ $customfield->name }}
-                </label>
+                <h4>Custom Fields:</h4>
               </div>
-            @endforeach
+              @foreach ($customfields as $customfield)
+                <div class="checkbox col-md-12">
+                  <label>
+                    {{ Form::checkbox($customfield->db_column_name(), '1', '1', ['class' => 'minimal']) }}
+                    {{ $customfield->name }}
+                  </label>
+                </div>
+              @endforeach
+            @endif
+
           </div> <!-- /.col-md-3-->
 
-          <div class="col-md-7">
-            <p>Select the fields you'd like to include in your custom report, and click Generate. The file (YYYY-mm-dd-his-custom-asset-report.csv) will download automatically, and you can open it in Excel.</p>
+          <div class="col-md-8">
+
+            <p>Select the fields you'd like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+            <p>If you'd like to export only certain assets, use the options below to fine-tune your results.</p>
+
+            @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'by_company_id', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'by_location_id', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'by_supplier_id', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.model-select', ['translated_name' => trans('general.asset_model'), 'fieldname' => 'by_model_id', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'by_manufacturer_id', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'by_category_id', 'hide_new' => 'true', 'category_type' => 'asset'])
+
+          <!-- Status -->
+            <div class="form-group">
+              <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
+              <div class="col-md-7 col-sm-11">
+                {{ Form::select('by_status_id', \App\Helpers\Helper::statusLabelList() , Input::old('by_status_id'), array('class'=>'select2', 'style'=>'width:100%')) }}
+              </div>
+            </div>
+
+
+            <!-- Order Number -->
+            <div class="form-group">
+              <label for="order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
+              <div class="col-md-5 col-sm-8">
+                <input class="form-control" type="text" name="by_order_number" value="">
+              </div>
+            </div>
+
+          <!-- Purchase Date -->
+            <div class="form-group purchase-range">
+              <label for="purchase_date" class="col-md-3 control-label">{{ trans('general.purchase_date') }} Range</label>
+              <div class="input-daterange input-group col-md-6" id="datepicker">
+                <input type="text" class="input-sm form-control" name="purchase_start" />
+                <span class="input-group-addon">to</span>
+                <input type="text" class="input-sm form-control" name="purchase_end" />
+              </div>
+            </div>
+
+            <!-- Created Date -->
+            <div class="form-group purchase-range">
+              <label for="purchase_date" class="col-md-3 control-label">{{ trans('general.created_at') }} Range</label>
+              <div class="input-daterange input-group col-md-6" id="datepicker">
+                <input type="text" class="input-sm form-control" name="created_start" />
+                <span class="input-group-addon">to</span>
+                <input type="text" class="input-sm form-control" name="created_end" />
+              </div>
+            </div>
+
+            
+
+            <div class="col-md-9 col-md-offset-3">
+              <label>
+                {{ Form::checkbox('use_bom', '1') }}
+                Add a BOM (byte-order mark) to this CSV
+              </label>
+
+            </div>
+
           </div>
 
+
         </div> <!-- /.box-body-->
         <div class="box-footer text-right">
           <button type="submit" class="btn btn-success"><i class="fa fa-download icon-white"></i> {{ trans('general.generate') }}</button>
@@ -181,3 +271,39 @@
 </div>
 
 @stop
+
+@section('moar_scripts')
+  <script>
+
+      $('.purchase-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate: '0d',
+          format: 'yyyy-mm-dd'
+      });
+
+    // Check-all / Uncheck all
+      $(function () {
+          var checkAll = $('input.all');
+          var checkboxes = $('input.minimal');
+
+
+          checkAll.on('ifChecked ifUnchecked', function(event) {
+              if (event.type == 'ifChecked') {
+                  checkboxes.iCheck('check');
+              } else {
+                  checkboxes.iCheck('uncheck');
+              }
+          });
+
+          checkboxes.on('ifChanged', function(event){
+              if(checkboxes.filter(':checked').length == checkboxes.length) {
+                  checkAll.prop('checked', 'checked');
+              } else {
+                  checkAll.removeProp('checked');
+              }
+              checkAll.iCheck('update');
+          });
+      });
+  </script>
+@stop

resources/views/suppliers/view.blade.php

@@ -23,74 +23,209 @@
     <!-- start tables -->
 
     <div class="box box-default">
-      @if ($supplier->id)
       <div class="box-header with-border">
         <div class="box-heading">
-          <h3 class="box-title"> {{ trans('general.assets') }}
-          </h3>
+          <h3 class="box-title"> {{ trans('general.assets') }}</h3>
         </div>
       </div><!-- /.box-header -->
-      @endif
 
       <div class="box-body">
         <!-- checked out suppliers table -->
-        <br>
         <div class="table-responsive">
-          <table class="display table table-hover">
+          <table
+                  name="suppliers_assets"
+                  id="table-users"
+                  class="table table-striped snipe-table"
+                  data-url="{{route('api.assets.index', ['supplier_id' => $supplier->id])}}"
+                  data-cookie="true"
+                  data-click-to-select="true"
+                  data-search="true"
+                  data-cookie-id-table="assets_by_supplierTable">
             <thead>
-              <tr role="row">
-                <th class="col-md-3">Asset Tag</th>
-                <th class="col-md-3"><span class="line"></span>Name</th>
-                <th class="col-md-3"><span class="line"></span>User</th>
-                <th class="col-md-2"><span class="line"></span>Actions</th>
-              </tr>
+            <tr>
+              <th data-searchable="false" data-visible="false" data-sortable="true" data-field="id">{{ trans('general.id') }}</th>
+              <th data-searchable="false" data-visible="true" data-sortable="true" data-formatter="imageFormatter" data-field="image">{{ trans('admin/hardware/table.image') }}</th>
+              <th data-searchable="false" data-sortable="true" data-formatter="hardwareLinkFormatter" data-field="name">{{ trans('general.name') }}</th>
+              <th data-searchable="false" data-formatter="modelsLinkObjFormatter" data-sortable="false" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
+              <th data-searchable="false" data-sortable="false" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/form.tag') }}</th>
+              <th data-searchable="false" data-sortable="false" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
+              <th data-searchable="false" data-visible="false" data-sortable="true" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
+              <th data-field="purchase_cost" data-footer-formatter="sumFormatter">{{ trans('general.purchase_cost') }}</th>
+              <th data-searchable="false" data-sortable="false" data-field="checkincheckout" data-formatter="hardwareInOutFormatter">Checkin/Checkout</th>
+              <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('table.actions') }}</th>
+            </tr>
             </thead>
-            <tbody>
-              @foreach ($supplier->assets as $supplierassets)
-              <tr>
-                <td>
-                  <a href="{{ route('hardware.show',  $supplierassets->id) }}">
-                    {{ $supplierassets->asset_tag }}
-                  </a>
-                </td>
-                <td>
-                  <a href="{{ route('hardware.show',  $supplierassets->id) }}">
-                    {{ $supplierassets->name }}
-                  </a>
-                </td>
-                <td>
-                  @if ($supplierassets->assignedTo)
-                  {!! $supplierassets->assignedTo->present()->nameUrl() !!}
-                  @endif
-                </td>
-                <td>
-                  @if ($supplierassets->assigned_to != '')
-                  <a href="{{ route('checkin/hardware', $supplierassets->id) }}" class="btn btn-info btn-sm">Checkin</a>
-                  @else
-                  <a href="{{ route('checkout/hardware', $supplierassets->id) }}" class="btn btn-success btn-sm">Checkout</a>
-                  @endif
-                </td>
-              </tr>
-              @endforeach
-            </tbody>
           </table>
-        </div>
-      </div> <!--/box-body-->
-    </div>
+        </div><!-- /.table-responsive -->
+      </div><!-- /.box-body -->
+      </div> <!--/.box-->
+
+        <div class="box box-default">
+
+          <div class="box-header with-border">
+            <div class="box-heading">
+              <h3 class="box-title"> {{ trans('general.accessories') }}</h3>
+            </div>
+          </div><!-- /.box-header -->
+
+          <div class="box-body">
+            <div class="table-responsive">
+
+              <table
+                      name="suppliers_accessories"
+                      id="table-users"
+                      class="table table-striped snipe-table"
+                      data-url="{{route('api.accessories.index', ['supplier_id' => $supplier->id])}}"
+                      data-search="true"
+                      data-cookie="true"
+                      data-click-to-select="true"
+                      data-cookie-id-table="accessories_by_supplierTable">
+                <thead>
+                <tr>
+                  <th data-searchable="false" data-visible="false" data-sortable="true" data-field="id">{{ trans('general.id') }}</th>
+                  <th data-searchable="false" data-sortable="true" data-formatter="accessoriesLinkFormatter" data-field="name">{{ trans('general.name') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="asset_tag">{{ trans('admin/hardware/form.tag') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
+                  <th data-searchable="false" data-visible="false" data-sortable="true" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
+                  <th data-field="purchase_cost" data-footer-formatter="sumFormatter">{{ trans('general.purchase_cost') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="accessoriesActionsFormatter">{{ trans('table.actions') }}</th>
+                </tr>
+                </thead>
+              </table>
+            </div><!-- /.table-responsive -->
+          </div><!-- /.box-body -->
+        </div> <!--/.box-->
+
+
+
+          <div class="box box-default">
+
+            @if ($supplier->id)
+              <div class="box-header with-border">
+                <div class="box-heading">
+                  <h3 class="box-title"> {{ trans('general.licenses') }}</h3>
+                </div>
+              </div><!-- /.box-header -->
+            @endif
+
+            <div class="box-body">
+              <div class="table-responsive">
+              <table
+                      name="suppliers_licenses"
+                      id="table-users"
+                      class="table table-striped snipe-table"
+                      data-url="{{route('api.licenses.index', ['supplier_id' => $supplier->id])}}"
+                      data-cookie="true"
+                      data-search="true"
+                      data-click-to-select="true"
+                      data-cookie-id-table="licenses_by_supplierTable">
+                <thead>
+                <tr>
+                  <th data-searchable="false" data-visible="false" data-sortable="true" data-field="id">{{ trans('general.id') }}</th>
+                  <th data-searchable="true" data-sortable="true" data-formatter="licensesLinkFormatter" data-field="name">{{ trans('general.name') }}</th>
+                  <th data-searchable="true" data-sortable="true" data-formatter="licensesLinkFormatter" data-field="product_key">{{ trans('admin/licenses/form.license_key') }}</th>
+                  <th data-searchable="true" data-sortable="true" data-formatter="licensesLinkFormatter" data-field="license_email">{{ trans('admin/licenses/form.to_email') }}</th>
+                  <th data-searchable="true" data-sortable="false" data-field="seats">{{ trans('admin/licenses/form.seats') }}</th>
+                  <th data-searchable="true" data-sortable="false" data-field="free_seats_count">{{ trans('admin/accessories/general.remaining') }}</th>
+                  <th data-field="purchase_cost" data-footer-formatter="sumFormatter">{{ trans('general.purchase_cost') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="licensesActionsFormatter">{{ trans('table.actions') }}</th>
+                  <th data-searchable="false" data-sortable="false" data-field="checkincheckout" data-formatter="licensesActionsFormatter">{{ trans('table.actions') }}</th>
+                </tr>
+                </thead>
+              </table>
+            </div><!-- /.table-responsive -->
+          </div><!-- /.box-body -->
+        </div> <!--/.box-->
+
+
+
+        <div class="box box-default">
+
+          @if ($supplier->id)
+            <div class="box-header with-border">
+              <div class="box-heading">
+                <h3 class="box-title"> Improvements</h3>
+              </div>
+            </div><!-- /.box-header -->
+          @endif
+
+          <div class="box-body">
+            <div class="table-responsive">
+            <table class="table table-hover">
+              <thead>
+              <tr>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.start_date') }}</th>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
+                <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.cost') }}</th>
+                <th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
+              </tr>
+              </thead>
+              <tbody>
+              <?php $totalCost = 0; ?>
+              @if ($supplier->asset_maintenances)
+                @foreach ($supplier->asset_maintenances as $improvement)
+                  @if (is_null($improvement->deleted_at))
+                    <tr>
+                      <td>
+                        @if ($improvement->asset)
+                          <a href="{{ route('hardware.show', $improvement->asset_id) }}">{{ $improvement->asset->name }}</a>
+                        @else
+                            (deleted asset)
+                        @endif
+                      </td>
+                      <td>{{ $improvement->asset_maintenance_type }}</td>
+                      <td>{{ $improvement->start_date }}</td>
+                      <td>{{ $improvement->completion_date }}</td>
+                      <td>{{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
+                      <td>{{ sprintf( $snipeSettings->default_currency. '%01.2f', $improvement->cost) }}</td>
+                        <?php $totalCost += $improvement->cost; ?>
+                      <td><a href="{{ route('maintenances.edit', $improvement->id) }}" class="btn btn-warning"><i class="fa fa-pencil icon-white"></i></a>
+                      </td>
+                    </tr>
+                  @endif
+                @endforeach
+              @endif
+              </tbody>
+              <tfoot>
+              <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>{{sprintf($snipeSettings->default_currency . '%01.2f', $totalCost)}}</td>
+              </tr>
+              </tfoot>
+            </table>
+          </div><!-- /.table-responsive -->
+        </div><!-- /.box-body -->
+     </div> <!--/.box-->
+
   </div> <!--/col-md-9-->
 
   <!-- side address column -->
   <div class="col-md-3">
-    <h4>Contact:</h4>
-    <ul class="list-unstyled">
+
+    @if (($supplier->state!='') && ($supplier->country!='') && (config('services.google.maps_api_key')))
+      <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+        <img src="https://maps.googleapis.com/maps/api/staticmap?center={{ urlencode($supplier->city.','.$supplier->city.' '.$supplier->state.' '.$supplier->country.' '.$supplier->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
+      </div>
+    @endif
+
+
+    <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px; padding-top: 20px;">
       @if ($supplier->contact)
-      <li><i class="fa fa-user"></i>{{ $supplier->contact }}</li>
+      <li><i class="fa fa-user"></i> {{ $supplier->contact }}</li>
       @endif
       @if ($supplier->phone)
-      <li><i class="fa fa-phone"></i>{{ $supplier->phone }}</li>
+      <li><i class="fa fa-phone"></i> {{ $supplier->phone }}</li>
       @endif
       @if ($supplier->fax)
-      <li><i class="fa fa-print"></i>{{ $supplier->fax }}</li>
+      <li><i class="fa fa-print"></i> {{ $supplier->fax }}</li>
       @endif
 
       @if ($supplier->email)
@@ -125,152 +260,20 @@
       @endif
 
       @if ($supplier->notes)
-      <li><i class="fa fa-comment"></i>{{ $supplier->notes }}</li>
+      <li><i class="fa fa-comment"></i> {{ $supplier->notes }}</li>
       @endif
 
-      @if ($supplier->image)
-      <li><br /><img src="{{ url('/') }}/uploads/suppliers/{{ $supplier->image }}" /></li>
-      @endif
     </ul>
+      @if ($supplier->image!='')
+        <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+          <img src="{{ app('suppliers_upload_url') }}/{{ $supplier->image }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}">
+        </div>
+      @endif
+
   </div> <!--/col-md-3-->
 </div> <!--/row-->
 
-<div class="row">
-  <div class="col-md-9">
 
-    <div class="box box-default">
-      <div class="box-header with-border">
-        <div class="box-heading">
-          <h3 class="box-title">Accessories</h3>
-        </div>
-      </div><!-- /.box-header -->
-      <div class="box-body">
-        <div class="table-responsive">
-
-          <table
-                  name="suppliersAccessories"
-                  id="table"
-                  class="snipe-table"
-                  data-url="{{ route('api.accessories.index', ['supplier_id' => $supplier->id]) }}"
-                  data-cookie="true"
-                  data-export-options='{"fileName": "testo"}'
-                  data-click-to-select="true"
-                  data-cookie-id-table="suppliersAccessories-{{ config('version.hash_version') }}">
-            <thead>
-            <tr>
-              <th class="col-md-4" data-field="name" data-formatter="accessoriesLinkFormatter">Name</th>
-              <th class="col-md-4" data-field="model_number">Model Number</th>
-              <th class="col-md-4" data-field="purchase_cost" data-footer-formatter="sumFormatter">Purchase_cost</th>
-
-              <th class="col-md-4" data-field="actions" data-formatter="accessoriesActionsFormatter">Actions</th>
-            </tr>
-            </thead>
-          </table>
-        </div>
-      </div>
-    </div>
-
-
-    <div class="box box-default">
-
-      @if ($supplier->id)
-      <div class="box-header with-border">
-        <div class="box-heading">
-          <h3 class="box-title">Software</h3>
-        </div>
-      </div><!-- /.box-header -->
-      @endif
-
-      <div class="box-body">
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th class="col-md-4">Name</th>
-              <th class="col-md-4"><span class="line"></span>Serial</th>
-            </tr>
-          </thead>
-          <tbody>
-            @foreach ($supplier->licenses as $license)
-            <tr>
-              <td>{!! $license->present()->nameUrl() !!}</td>
-              <td>{!! $license->present()->serialUrl() !!}</td>
-            </tr>
-            @endforeach
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-9">
-    <div class="box box-default">
-
-      @if ($supplier->id)
-      <div class="box-header with-border">
-        <div class="box-heading">
-          <h3 class="box-title"> Improvements</h3>
-        </div>
-      </div><!-- /.box-header -->
-      @endif
-
-      <div class="box-body">
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.start_date') }}</th>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
-              <th class="col-md-2"><span class="line"></span>{{ trans('admin/asset_maintenances/form.cost') }}</th>
-              <th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
-            </tr>
-          </thead>
-          <tbody>
-            <?php $totalCost = 0; ?>
-            @if ($supplier->asset_maintenances)
-              @foreach ($supplier->asset_maintenances as $improvement)
-                @if (is_null($improvement->deleted_at))
-                <tr>
-                  <td>
-                    @if ($improvement->asset)
-                      <a href="{{ route('hardware.show', $improvement->asset_id) }}">{{ $improvement->asset->name }}</a>
-                    @else
-                        (deleted asset)
-                    @endif
-                  </td>
-                  <td>{{ $improvement->asset_maintenance_type }}</td>
-                  <td>{{ $improvement->start_date }}</td>
-                  <td>{{ $improvement->completion_date }}</td>
-                  <td>{{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
-                  <td>{{ sprintf( $snipeSettings->default_currency. '%01.2f', $improvement->cost) }}</td>
-                    <?php $totalCost += $improvement->cost; ?>
-                  <td><a href="{{ route('maintenances.edit', $improvement->id) }}" class="btn btn-warning"><i class="fa fa-pencil icon-white"></i></a>
-                  </td>
-                </tr>
-                @endif
-              @endforeach
-            @endif
-          </tbody>
-
-          <tfoot>
-            <tr>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>{{sprintf($snipeSettings->default_currency . '%01.2f', $totalCost)}}</td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-
-    </div>
-  </div>
-</div> <!-- /.row-->
 
 @stop
 @section('moar_scripts')