diff --git a/.env.example b/.env.example index de1672f871..4d2743acb8 100644 --- a/.env.example +++ b/.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= diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.php index 8d71e23e79..e73b6aae5e 100644 --- a/app/Console/Commands/Version.php +++ b/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]; diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 368e5b9ee6..65b17474cc 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/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); diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c646e9e6ef..b568df42cd 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/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->location) ? $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')); - } } diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index fdd399a1fb..9047bf3572 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/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); } } diff --git a/config/services.php b/config/services.php index fa5440c8fa..83b8cca3ee 100644 --- a/config/services.php +++ b/config/services.php @@ -46,5 +46,9 @@ return [ 'level' => env('ROLLBAR_LEVEL', 'error'), ], + 'google' => [ + 'maps_api_key' => env('GOOGLE_MAPS_API') + ], + ]; diff --git a/config/version.php b/config/version.php index ddf07087f0..91741163ba 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,9 @@ 'v4.1.6', - 'full_app_version' => 'v4.1.6 - build 2963-g83c8449', - 'build_version' => '2963', + 'full_app_version' => 'v4.1.6 - build 2994-g83c8449', + 'build_version' => '2994', 'prerelease_version' => '', 'hash_version' => 'g83c8449', - 'full_hash' => 'v4.1.5-76-gb934d2e', - 'branch' => 'master', -); + 'full_hash' => 'v4.1.6-2994-g83c8449', + 'branch' => 'master' diff --git a/public/css/build/all.css b/public/css/build/all.css index b2c93cb859..1ae49d8efa 100644 Binary files a/public/css/build/all.css and b/public/css/build/all.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index b2c93cb859..1ae49d8efa 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/css/overrides.css b/public/css/overrides.css index 4db8c5ee3b..36cdb81376 100644 Binary files a/public/css/overrides.css and b/public/css/overrides.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e385227ab1..d0530f5098 100644 --- a/public/mix-manifest.json +++ b/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=a4994a56ec31f2099730", "/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", + "/css/dist/all.css": "/css/dist/all.css?id=277aaa6291c83cc8204f", "/js/dist/all.js": "/js/dist/all.js?id=7b52ead3a55086ea1f8d", - "/css/build/all.css": "/css/build/all.css?id=7c3842d2639193ac7e88", + "/css/build/all.css": "/css/build/all.css?id=277aaa6291c83cc8204f", "/js/build/all.js": "/js/build/all.js?id=7b52ead3a55086ea1f8d" } \ No newline at end of file diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 78d47f2fde..226f388477 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -315,3 +315,6 @@ img.navbar-brand-img, .navbar-brand>img { max-height: 50px; } +.input-daterange { + border-radius: 0px; +} diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index 2e9d278d80..40d0468fc7 100755 --- a/resources/views/accessories/edit.blade.php +++ b/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') diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php index 0b391507bc..632a838b40 100644 --- a/resources/views/consumables/edit.blade.php +++ b/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') diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index 3e0e0341a9..f188cd4e26 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -34,7 +34,7 @@
{{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
-
+
@@ -46,7 +46,7 @@
{{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
-
+
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 2ec61fc429..77cbbbf6ea 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -69,7 +69,7 @@
{{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
-
+
@@ -81,7 +81,7 @@
{{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
-
+
@@ -144,4 +144,15 @@ @section('moar_scripts') @include('partials/assets-assigned') + + @stop diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 70a96386e5..a2397a687e 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -26,7 +26,7 @@
- @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'])
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 1057dc380b..69c048951d 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -42,8 +42,8 @@ @stop @section('header_right') - - {{ trans('admin/hardware/table.dl_csv') }} + + Custom Export {{ trans('general.create') }} @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') }}">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index e642167f2c..f896bbb383 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -218,14 +218,6 @@ @endcan - @can('create', \App\Models\User::class) -
  • - - - {{ trans('general.user') }} - -
    • - @endcan @can('create', \App\Models\Component::class)
  • @@ -234,6 +226,14 @@
    • @endcan + @can('create', \App\Models\User::class) +
  • + + + {{ trans('general.user') }} + +
    • + @endcan @endcan diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index 23854fc826..717379e9d1 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -31,7 +31,7 @@
    @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'])
    diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index 4628a58ca4..b21d56c7da 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -5,9 +5,7 @@ {{ trans('general.location') }}: {{ $location->name }} - @if ($location->manager) -
    {!! trans('admin/users/table.manager') . ': ' . $location->manager->present()->nameUrl() !!}
    - @endif + @parent @stop @@ -19,7 +17,7 @@ @section('content')
    -
    +
    @@ -40,7 +38,19 @@ data-cookie-id-table="location_usersDetailTable"> - {{ trans('general.user') }} + {{ trans('general.id') }} + Avatar + {{ trans('general.user') }} + {{ trans('admin/users/table.title') }} + {{ trans('admin/users/table.email') }} + {{ trans('admin/users/table.phone') }} + {{ trans('admin/users/table.manager') }} + + + + + {{ trans('general.department') }} + {{ trans('table.actions') }} @@ -50,10 +60,49 @@
    +
    + + + + @if ($location->image!='') +
    + {{ $location->name }} +
    + @endif +
    +
      + @if ($location->address!='') +
    • {{ $location->address }}
      • + @endif + @if ($location->address2!='') +
    • {{ $location->address2 }}
      • + @endif + @if (($location->city!='') || ($location->state!='') || ($location->zip!='')) +
    • {{ $location->city }} {{ $location->state }} {{ $location->zip }}
      • + @endif + @if (($location->manager)) +
    • {{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}
      • + @endif + @if (($location->parent)) +
    • {{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}
      • + @endif +
    + + @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key'))) +
    + Map +
    + @endif + + +
    + + +
    -
    +
    @@ -74,10 +123,16 @@ data-cookie-id-table="location_assetsDetailTable"> - {{ trans('general.name') }} + {{ trans('general.id') }} + {{ trans('admin/hardware/table.image') }} + {{ trans('general.name') }} {{ trans('admin/hardware/form.model') }} - {{ trans('admin/hardware/form.tag') }} + {{ trans('admin/hardware/form.tag') }} {{ trans('admin/hardware/form.serial') }} + {{ trans('general.category') }} + {{ trans('general.purchase_cost') }} + Checkin/Checkout + {{ trans('table.actions') }} @@ -87,6 +142,9 @@
    + + +
    @stop diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index b31050a075..701a8a18df 100755 --- a/resources/views/models/edit.blade.php +++ b/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') diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php index 8a2e59b9f4..c7885dc5f0 100644 --- a/resources/views/partials/forms/edit/category-select.blade.php +++ b/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')) }} -
    +
    - @if ($manufacturer_id = Input::old($fieldname, $item->{$fieldname})) + @if ($manufacturer_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : '')) diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php index 84e30f4a93..11917f2dc9 100644 --- a/resources/views/partials/forms/edit/model-select.blade.php +++ b/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')) }} -
    +
    + Select All + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    - @foreach ($customfields as $customfield) + @if ($customfields->count() > 0)
    - +

    Custom Fields:

    - @endforeach + @foreach ($customfields as $customfield) +
    + +
    + @endforeach + @endif +
    -
    -

    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.

    +
    + +

    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.

    +

    If you'd like to export only certain assets, use the options below to fine-tune your results.

    + + @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']) + + +
    + +
    + {{ Form::select('by_status_id', \App\Helpers\Helper::statusLabelList() , Input::old('by_status_id'), array('class'=>'select2', 'style'=>'width:100%')) }} +
    +
    + + + +
    + +
    + +
    +
    + + +
    + +
    + + to + +
    +
    + + +
    + +
    + + to + +
    +
    + + + +
    + + +
    +
    +
    @@ -181,3 +271,39 @@
    @stop + +@section('moar_scripts') + +@stop diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 4b1c7120d4..217ddaffa1 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -36,43 +36,29 @@
    - +
    - - - - - - + + + + + + + + + + + + - - @foreach ($supplier->assets as $supplierassets) - - - - - - - @endforeach -
    Asset TagNameUserActions
    {{ trans('general.id') }}{{ trans('admin/hardware/table.image') }}{{ trans('general.name') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/hardware/form.tag') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.category') }}{{ trans('general.purchase_cost') }}Checkin/Checkout{{ trans('table.actions') }}
    - - {{ $supplierassets->asset_tag }} - - - - {{ $supplierassets->name }} - - - @if ($supplierassets->assignedTo) - {!! $supplierassets->assignedTo->present()->nameUrl() !!} - @endif - - @if ($supplierassets->assigned_to != '') - Checkin - @else - Checkout - @endif -
    @@ -81,16 +67,23 @@
    -

    Contact:

    -
      + + @if (($supplier->state!='') && ($supplier->country!='') && (config('services.google.maps_api_key'))) +
      + Map +
      + @endif + + +
        @if ($supplier->contact) -
      • {{ $supplier->contact }}
        • +
      • {{ $supplier->contact }}
        • @endif @if ($supplier->phone) -
      • {{ $supplier->phone }}
        • +
      • {{ $supplier->phone }}
        • @endif @if ($supplier->fax) -
      • {{ $supplier->fax }}
        • +
      • {{ $supplier->fax }}
        • @endif @if ($supplier->email) @@ -125,7 +118,7 @@ @endif @if ($supplier->notes) -
      • {{ $supplier->notes }}
        • +
      • {{ $supplier->notes }}
        • @endif @if ($supplier->image) @@ -148,21 +141,24 @@
        + data-cookie-id-table="accessories_by_supplierTable"> - - - - - + + + + + + + +
        NameModel NumberPurchase_costActions{{ trans('general.id') }}{{ trans('general.name') }}{{ trans('admin/models/table.modelnumber') }}{{ trans('admin/hardware/form.tag') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.category') }}{{ trans('general.purchase_cost') }}{{ trans('table.actions') }}
        @@ -182,21 +178,29 @@ @endif
        - +
        - - - - + + + + + + + + + + + + - - @foreach ($supplier->licenses as $license) - - - - - @endforeach -
        NameSerial
        {{ trans('general.id') }}{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.to_email') }}{{ trans('admin/licenses/form.seats') }}{{ trans('admin/accessories/general.remaining') }}{{ trans('general.purchase_cost') }}{{ trans('table.actions') }}{{ trans('table.actions') }}
        {!! $license->present()->nameUrl() !!}{!! $license->present()->serialUrl() !!}