mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-20 15:57:41 -07:00
9c8ca6af21
commite321aeabaeMerge:8ec99ff4337568ae9eAuthor: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit37568ae9ecMerge:01a83216932ad9050cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit32ad9050cfAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169cMerge:bcad49ce73c6883489Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit3c6883489cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1bMerge:714576be429f3a5c48Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit29f3a5c48fAuthor: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45Merge:b999c50a2512899294Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit5128992940Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2eMerge:9ca20e496e3906b245Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commite3906b245cAuthor: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964Merge:e0644dbbf456a74d88Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit456a74d88cAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commitb725bd0faeAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6Merge:5b6925b00004ecad05Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit5b6925b00cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bfAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit24c43056baAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit606b7e905dAuthor: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commitd73ddad477Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721eMerge:7410b16838994f3e15Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit7410b16835Merge:e955c983ab09e7d19bAuthor: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit8994f3e15eAuthor: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77caAuthor: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3Merge:2fa17ac18eed41e454Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commitb09e7d19b3Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit2fa17ac185Merge:b905154373b1e46f72Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit3b1e46f72bAuthor: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754fAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792aAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfbAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46aAuthor: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229Merge:81a633288897757bd0Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit897757bd04Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit6e563f6e4bMerge:5320f5c677f69ae953Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67cAuthor: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953bMerge:c79f8c1ba17f6fbabfAuthor: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit17f6fbabfaAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commitc79f8c1bafMerge:12c92e30b536401fe0Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit12c92e30b7Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commitfd10b755b0Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commitdbbb7680d9Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commitcf0dd5bbadAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7fMerge:ec6ed256f89d433b41Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit89d433b41aAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6fAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit536401fe0fAuthor: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fbAuthor: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2dMerge:339bdddc3cc9f1577aAuthor: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0cAuthor: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371eAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit2e60a457bfAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160bMerge:b42801f6a00b051b8cAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit00b051b8c7Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7eAuthor: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384fAuthor: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6aeMerge:de4934f21946129f20Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit946129f206Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commitd1aa11ec89Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commitde4934f21dMerge:af06e4205b10076b01Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commitb10076b015Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4bMerge:beae8efb22ac1c1636Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit2ac1c1636cAuthor: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit004ecad059Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21Merge:d14ab7e3e9839e5e56Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit9839e5e566Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commite7f74d94c1Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530Merge:f886837668210da6e8Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit8210da6e82Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commitf88683766bAuthor: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8cAuthor: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffaAuthor: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit7fb3a9b82cMerge:9a2ed804cecb1e87feAuthor: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commitecb1e87fe6Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit9a2ed804caAuthor: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commitd20fad28e5Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commitae813ddf75Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0cAuthor: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit9ee28c7513Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit1a8ba06702Merge:0fd232e70ee4d69b1cAuthor: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70dAuthor: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commitee4d69b1c5Merge:31c535094d1ad11194Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commitd1ad111949Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit31c5350941Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit7eb70e17e0Merge:5bb4f271a3dfcb4699Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit3dfcb46991Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3baAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59fAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit5bb4f271aaAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>
1121 lines
65 KiB
PHP
Executable file
1121 lines
65 KiB
PHP
Executable file
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
{{ trans('admin/hardware/general.view') }} {{ $asset->asset_tag }}
|
|
@parent
|
|
@stop
|
|
|
|
{{-- Right header --}}
|
|
@section('header_right')
|
|
|
|
@can('manage', \App\Models\Asset::class)
|
|
<div class="dropdown pull-right">
|
|
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
|
|
<span class="caret"></span>
|
|
</button>
|
|
<ul class="dropdown-menu pull-right" role="menu">
|
|
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
|
|
@if ($asset->assigned_to != '')
|
|
@can('checkin', \App\Models\Asset::class)
|
|
<li role="menuitem">
|
|
<a href="{{ route('checkin/hardware', $asset->id) }}">
|
|
{{ trans('admin/hardware/general.checkin') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@else
|
|
@can('checkout', \App\Models\Asset::class)
|
|
<li role="menuitem">
|
|
<a href="{{ route('checkout/hardware', $asset->id) }}">
|
|
{{ trans('admin/hardware/general.checkout') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@endif
|
|
@endif
|
|
|
|
@can('update', \App\Models\Asset::class)
|
|
<li role="menuitem">
|
|
<a href="{{ route('hardware.edit', $asset->id) }}">
|
|
{{ trans('admin/hardware/general.edit') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('create', \App\Models\Asset::class)
|
|
<li role="menuitem">
|
|
<a href="{{ route('clone/hardware', $asset->id) }}">
|
|
{{ trans('admin/hardware/general.clone') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('audit', \App\Models\Asset::class)
|
|
<li role="menuitem">
|
|
<a href="{{ route('asset.audit.create', $asset->id) }}">
|
|
{{ trans('general.audit') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
</div>
|
|
@endcan
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
|
|
@if (!$asset->model)
|
|
<div class="col-md-12">
|
|
<div class="callout callout-danger">
|
|
<h2>NO MODEL ASSOCIATED</h4>
|
|
<p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->deleted_at!='')
|
|
<div class="col-md-12">
|
|
<div class="alert alert-danger">
|
|
<i class="fa fa-exclamation-circle faa-pulse animated" aria-hidden="true"></i>
|
|
<strong>WARNING: </strong>
|
|
This asset has been deleted.
|
|
You must <a href="{{ route('restore/hardware', $asset->id) }}">restore it</a> before you can assign it to someone.
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<div class="col-md-12">
|
|
|
|
|
|
|
|
|
|
<!-- Custom Tabs -->
|
|
<div class="nav-tabs-custom">
|
|
<ul class="nav nav-tabs">
|
|
<li class="active">
|
|
<a href="#details" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-info-circle" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.details') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#software" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-floppy-o" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.licenses') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#components" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-hdd-o" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.components') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#assets" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-barcode" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.assets') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#maintenances" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-wrench" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.maintenances') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#history" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-history" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.history') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="#files" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<i class="fa fa-files-o" aria-hidden="true"></i>
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
{{ trans('general.files') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
@can('update', \App\Models\Asset::class)
|
|
<li class="pull-right">
|
|
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
|
|
<i class="fa fa-paperclip" aria-hidden="true"></i>
|
|
{{ trans('button.upload') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
<div class="tab-content">
|
|
<div class="tab-pane fade in active" id="details">
|
|
<div class="row">
|
|
<div class="col-md-8">
|
|
|
|
|
|
<!-- start striped rows -->
|
|
<div class="container row-striped">
|
|
|
|
@if ($asset->assetstatus)
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>{{ trans('general.status') }}</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if (($asset->assignedTo) && ($asset->deleted_at==''))
|
|
<i class="fa fa-circle text-blue"></i>
|
|
{{ $asset->assetstatus->name }}
|
|
<label class="label label-default">{{ trans('general.deployed') }}</label>
|
|
|
|
<i class="fa fa-long-arrow-right" aria-hidden="true"></i>
|
|
{!! $asset->assignedTo->present()->glyph() !!}
|
|
{!! $asset->assignedTo->present()->nameUrl() !!}
|
|
@else
|
|
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
|
|
<i class="fa fa-circle text-green"></i>
|
|
@elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1'))
|
|
<i class="fa fa-circle text-orange"></i>
|
|
@elseif (($asset->assetstatus) && ($asset->assetstatus->archived=='1'))
|
|
<i class="fa fa-times text-red"></i>
|
|
@endif
|
|
<a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">
|
|
{{ $asset->assetstatus->name }}</a>
|
|
<label class="label label-default">{{ $asset->present()->statusMeta }}</label>
|
|
|
|
@endif
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->company)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>{{ trans('general.company') }}</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
<a href="{{ url('/companies/' . $asset->company->id) }}">{{ $asset->company->name }}</a>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->name)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>{{ trans('admin/hardware/form.name') }}</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->name }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->serial)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>{{ trans('admin/hardware/form.serial') }}</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->serial }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
@if ((isset($audit_log)) && ($audit_log->created_at))
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.last_audit') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }} (by {{ link_to_route('users.show', $audit_log->user->present()->fullname(), [$audit_log->user->id]) }})
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->next_audit_date)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.next_audit_date') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->model->manufacturer))
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.manufacturer') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
<ul class="list-unstyled" style="line-height: 25px;">
|
|
@can('view', \App\Models\Manufacturer::class)
|
|
|
|
<li>
|
|
<a href="{{ route('manufacturers.show', $asset->model->manufacturer->id) }}">
|
|
{{ $asset->model->manufacturer->name }}
|
|
</a>
|
|
</li>
|
|
|
|
@else
|
|
<li> {{ $asset->model->manufacturer->name }}</li>
|
|
@endcan
|
|
|
|
@if (($asset->model) && ($asset->model->manufacturer->url))
|
|
<li>
|
|
<i class="fa fa-globe" aria-hidden="true"></i>
|
|
<a href="{{ $asset->model->manufacturer->url }}">
|
|
{{ $asset->model->manufacturer->url }}
|
|
</a>
|
|
</li>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->model->manufacturer->support_url))
|
|
<li>
|
|
<i class="fa fa-life-ring" aria-hidden="true"></i>
|
|
<a href="{{ $asset->model->manufacturer->support_url }}">
|
|
{{ $asset->model->manufacturer->support_url }}
|
|
</a>
|
|
</li>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->model->manufacturer->support_phone))
|
|
<li>
|
|
<i class="fa fa-phone" aria-hidden="true"></i>
|
|
<a href="tel:{{ $asset->model->manufacturer->support_phone }}">
|
|
{{ $asset->model->manufacturer->support_phone }}
|
|
</a>
|
|
</li>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->model->manufacturer->support_email))
|
|
<li><i class="fa fa-envelope" aria-hidden="true"></i>
|
|
<a href="mailto:{{ $asset->model->manufacturer->support_email }}">
|
|
{{ $asset->model->manufacturer->support_email }}
|
|
</a>
|
|
</li>
|
|
@endif
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.category') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if (($asset->model) && ($asset->model->category))
|
|
|
|
@can('view', \App\Models\Category::class)
|
|
|
|
<a href="{{ route('categories.show', $asset->model->category->id) }}">
|
|
{{ $asset->model->category->name }}
|
|
</a>
|
|
@else
|
|
{{ $asset->model->category->name }}
|
|
@endcan
|
|
@else
|
|
Invalid category
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
@if ($asset->model)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.model') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if ($asset->model)
|
|
|
|
@can('view', \App\Models\AssetModel::class)
|
|
<a href="{{ route('models.show', $asset->model->id) }}">
|
|
{{ $asset->model->name }}
|
|
</a>
|
|
@else
|
|
{{ $asset->model->name }}
|
|
@endcan
|
|
|
|
@endif
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/models/table.modelnumber') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ ($asset->model) ? $asset->model->model_number : ''}}
|
|
</div>
|
|
</div>
|
|
|
|
@if (($asset->model) && ($asset->model->fieldset))
|
|
@foreach($asset->model->fieldset->fields as $field)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ $field->name }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if ($field->field_encrypted=='1')
|
|
<i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
|
|
@endif
|
|
|
|
@if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
|
|
@can('superuser')
|
|
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
|
|
<a href="{{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
|
|
@else
|
|
{{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}
|
|
@endif
|
|
@else
|
|
{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}
|
|
@endcan
|
|
|
|
@else
|
|
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
|
|
<a href="{{ $asset->{$field->db_column_name()} }}" target="_new">{{ $asset->{$field->db_column_name()} }}</a>
|
|
@else
|
|
{!! nl2br(e($asset->{$field->db_column_name()})) !!}
|
|
@endif
|
|
@endif
|
|
</div>
|
|
</div>
|
|
@endforeach
|
|
@endif
|
|
|
|
|
|
@if ($asset->purchase_date)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.date') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->purchase_cost)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.cost') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if (($asset->id) && ($asset->location))
|
|
{{ $asset->location->currency }}
|
|
@elseif (($asset->id) && ($asset->location))
|
|
{{ $asset->location->currency }}
|
|
@else
|
|
{{ $snipeSettings->default_currency }}
|
|
@endif
|
|
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost)}}
|
|
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->order_number)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.order_number') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
#{{ $asset->order_number }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->supplier)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.supplier') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@can ('superuser')
|
|
<a href="{{ route('suppliers.show', $asset->supplier_id) }}">
|
|
{{ $asset->supplier->name }}
|
|
</a>
|
|
@else
|
|
{{ $asset->supplier->name }}
|
|
@endcan
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
@if ($asset->warranty_months)
|
|
<div class="row{!! $asset->present()->warrantee_expires() < date("Y-m-d") ? ' warning' : '' !!}">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.warranty') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->warranty_months }}
|
|
{{ trans('admin/hardware/form.months') }}
|
|
|
|
({{ trans('admin/hardware/form.expires') }}
|
|
{{ $asset->present()->warrantee_expires() }})
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->depreciation))
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.depreciation') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->depreciation->name }}
|
|
({{ $asset->depreciation->months }}
|
|
{{ trans('admin/hardware/form.months') }}
|
|
)
|
|
</div>
|
|
</div>
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.fully_depreciated') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@if ($asset->time_until_depreciated()->y > 0)
|
|
{{ $asset->time_until_depreciated()->y }}
|
|
{{ trans('admin/hardware/form.years') }},
|
|
@endif
|
|
{{ $asset->time_until_depreciated()->m }}
|
|
{{ trans('admin/hardware/form.months') }}
|
|
({{ $asset->depreciated_date()->format('Y-m-d') }})
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if (($asset->model) && ($asset->model->eol))
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.eol_rate') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->model->eol }}
|
|
{{ trans('admin/hardware/form.months') }}
|
|
|
|
</div>
|
|
</div>
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.eol_date') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ $asset->present()->eol_date() }}
|
|
|
|
|
|
@if ($asset->present()->months_until_eol())
|
|
-
|
|
@if ($asset->present()->months_until_eol()->y > 0)
|
|
{{ $asset->present()->months_until_eol()->y }}
|
|
{{ trans('general.years') }},
|
|
@endif
|
|
|
|
{{ $asset->present()->months_until_eol()->m }}
|
|
{{ trans('general.months') }}
|
|
|
|
@endif
|
|
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->expected_checkin!='')
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.expected_checkin') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.notes') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{!! nl2br(e($asset->notes)) !!}
|
|
</div>
|
|
</div>
|
|
|
|
@if ($asset->location)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.location') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@can('superuser')
|
|
<a href="{{ route('locations.show', ['location' => $asset->location->id]) }}">
|
|
{{ $asset->location->name }}
|
|
</a>
|
|
@else
|
|
{{ $asset->location->name }}
|
|
@endcan
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->defaultLoc)
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('admin/hardware/form.default_location') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
@can('superuser')
|
|
<a href="{{ route('locations.show', ['location' => $asset->defaultLoc->id]) }}">
|
|
{{ $asset->defaultLoc->name }}
|
|
</a>
|
|
@else
|
|
{{ $asset->defaultLoc->name }}
|
|
@endcan
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->created_at!='')
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.created_at') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($asset->updated_at!='')
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.updated_at') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.checkouts_count') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.checkins_count') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div class="row">
|
|
<div class="col-md-2">
|
|
<strong>
|
|
{{ trans('general.user_requests_count') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-6">
|
|
{{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
|
|
</div>
|
|
</div>
|
|
|
|
</div> <!-- end row-striped -->
|
|
|
|
</div><!-- /col-md-8 -->
|
|
|
|
<div class="col-md-4">
|
|
|
|
@if ($asset->image)
|
|
<div class="col-md-12 text-center" style="padding-bottom: 15px;">
|
|
<a href="{{ url('/') }}/uploads/assets/{{ $asset->image }}" data-toggle="lightbox">
|
|
<img src="{{ url('/') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
|
|
</a>
|
|
</div>
|
|
@elseif (($asset->model) && ($asset->model->image!=''))
|
|
<div class="col-md-12 text-center" style="padding-bottom: 15px;">
|
|
<a href="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" data-toggle="lightbox">
|
|
<img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
|
|
</a>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($snipeSettings->qr_code=='1')
|
|
<img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
|
|
@endif
|
|
|
|
@if (($asset->assignedTo) && ($asset->deleted_at==''))
|
|
<h2>{{ trans('admin/hardware/form.checkedout_to') }}</h4>
|
|
<p>
|
|
@if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
|
|
<img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
|
|
@endif
|
|
{!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
|
|
</p>
|
|
|
|
<ul class="list-unstyled" style="line-height: 25px;">
|
|
@if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
|
|
<li>
|
|
<i class="fa fa-envelope-o" aria-hidden="true"></i>
|
|
<a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
|
|
</li>
|
|
@endif
|
|
|
|
@if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
|
|
<li>
|
|
<i class="fa fa-phone" aria-hidden="true"></i>
|
|
<a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
|
|
</li>
|
|
@endif
|
|
|
|
@if (isset($asset->location))
|
|
<li>{{ $asset->location->name }}</li>
|
|
<li>{{ $asset->location->address }}
|
|
@if ($asset->location->address2!='')
|
|
{{ $asset->location->address2 }}
|
|
@endif
|
|
</li>
|
|
|
|
<li>{{ $asset->location->city }}
|
|
@if (($asset->location->city!='') && ($asset->location->state!=''))
|
|
,
|
|
@endif
|
|
{{ $asset->location->state }} {{ $asset->location->zip }}
|
|
</li>
|
|
@endif
|
|
</ul>
|
|
|
|
@endif
|
|
</div> <!-- div.col-md-4 -->
|
|
</div><!-- /row -->
|
|
</div><!-- /.tab-pane asset details -->
|
|
|
|
<div class="tab-pane fade" id="software">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<!-- Licenses assets table -->
|
|
@if ($asset->licenses->count() > 0)
|
|
<table class="table">
|
|
<thead>
|
|
<tr>
|
|
<th class="col-md-4">{{ trans('general.name') }}</th>
|
|
<th class="col-md-4"><span class="line"></span>{{ trans('admin/licenses/form.license_key') }}</th>
|
|
<th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($asset->licenseseats as $seat)
|
|
@if ($seat->license)
|
|
<tr>
|
|
<td><a href="{{ route('licenses.show', $seat->license->id) }}">{{ $seat->license->name }}</a></td>
|
|
<td>
|
|
@can('viewKeys', $seat->license)
|
|
{!! nl2br(e($seat->license->serial)) !!}
|
|
@else
|
|
------------
|
|
@endcan
|
|
</td>
|
|
<td>
|
|
<a href="{{ route('licenses.checkin', $seat->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a>
|
|
</td>
|
|
</tr>
|
|
@endif
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
@else
|
|
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
@endif
|
|
</div><!-- /col -->
|
|
</div> <!-- row -->
|
|
</div> <!-- /.tab-pane software -->
|
|
|
|
<div class="tab-pane fade" id="components">
|
|
<!-- checked out assets table -->
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
@if($asset->components->count() > 0)
|
|
<table class="table table-striped">
|
|
<thead>
|
|
<th>{{ trans('general.name') }}</th>
|
|
<th>{{ trans('general.qty') }}</th>
|
|
<th>{{ trans('general.purchase_cost') }}</th>
|
|
</thead>
|
|
<tbody>
|
|
<?php $totalCost = 0; ?>
|
|
@foreach ($asset->components as $component)
|
|
|
|
|
|
@if (is_null($component->deleted_at))
|
|
<tr>
|
|
<td>
|
|
<a href="{{ route('components.show', $component->id) }}">{{ $component->name }}</a>
|
|
</td>
|
|
<td>{{ $component->pivot->assigned_qty }}</td>
|
|
<td>{{ $component->purchase_cost }}</td>
|
|
<?php $totalCost = $totalCost + $component->purchase_cost ;?>
|
|
|
|
</tr>
|
|
@endif
|
|
@endforeach
|
|
</tbody>
|
|
|
|
<tfoot>
|
|
<tr>
|
|
<td colspan="2">
|
|
</td>
|
|
<td>{{ $totalCost }}</td>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
@else
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
</div> <!-- /.tab-pane components -->
|
|
|
|
|
|
<div class="tab-pane fade" id="assets">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
|
|
@if ($asset->assignedAssets->count() > 0)
|
|
|
|
|
|
{{ Form::open([
|
|
'method' => 'POST',
|
|
'route' => ['hardware/bulkedit'],
|
|
'class' => 'form-inline',
|
|
'id' => 'bulkForm']) }}
|
|
<div id="toolbar">
|
|
<label for="bulk_actions"><span class="sr-only">Bulk Actions</span></label>
|
|
<select name="bulk_actions" class="form-control select2" style="width: 150px;" aria-label="bulk_actions">
|
|
<option value="edit">Edit</option>
|
|
<option value="delete">Delete</option>
|
|
<option value="labels">Generate Labels</option>
|
|
</select>
|
|
<button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
|
|
</div>
|
|
|
|
<!-- checked out assets table -->
|
|
<div class="table-responsive">
|
|
|
|
<table
|
|
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
|
|
data-cookie-id-table="assetsTable"
|
|
data-pagination="true"
|
|
data-id-table="assetsTable"
|
|
data-search="true"
|
|
data-side-pagination="server"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="assetsListingTable"
|
|
class="table table-striped snipe-table"
|
|
data-url="{{route('api.assets.index',['assigned_to' => $asset->id, 'assigned_type' => 'App\Models\Asset']) }}"
|
|
data-export-options='{
|
|
"fileName": "export-assets-{{ str_slug($asset->name) }}-assets-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
|
|
</table>
|
|
|
|
|
|
{{ Form::close() }}
|
|
</div>
|
|
|
|
@else
|
|
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
@endif
|
|
|
|
|
|
</div><!-- /col -->
|
|
</div> <!-- row -->
|
|
</div> <!-- /.tab-pane software -->
|
|
|
|
|
|
<div class="tab-pane fade" id="maintenances">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
@can('update', \App\Models\Asset::class)
|
|
<div id="maintenance-toolbar">
|
|
<a href="{{ route('maintenances.create', ['asset_id' => $asset->id]) }}" class="btn btn-primary">Add Maintenance</a>
|
|
</div>
|
|
@endcan
|
|
|
|
<!-- Asset Maintenance table -->
|
|
<table
|
|
data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
|
|
class="table table-striped snipe-table"
|
|
id="assetMaintenancesTable"
|
|
data-pagination="true"
|
|
data-id-table="assetMaintenancesTable"
|
|
data-search="true"
|
|
data-side-pagination="server"
|
|
data-toolbar="#maintenance-toolbar"
|
|
data-show-columns="true"
|
|
data-show-refresh="true"
|
|
data-show-export="true"
|
|
data-export-options='{
|
|
"fileName": "export-{{ $asset->asset_tag }}-maintenances",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'
|
|
data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}"
|
|
data-cookie-id-table="assetMaintenancesTable">
|
|
</table>
|
|
</div> <!-- /.col-md-12 -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.tab-pane maintenances -->
|
|
|
|
<div class="tab-pane fade" id="history">
|
|
<!-- checked out assets table -->
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<table
|
|
class="table table-striped snipe-table"
|
|
id="assetHistory"
|
|
data-pagination="true"
|
|
data-id-table="assetHistory"
|
|
data-search="true"
|
|
data-side-pagination="server"
|
|
data-show-columns="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="desc"
|
|
data-sort-name="created_at"
|
|
data-show-export="true"
|
|
data-export-options='{
|
|
"fileName": "export-asset-{{ $asset->id }}-history",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'
|
|
|
|
data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
|
|
data-cookie-id-table="assetHistory">
|
|
<thead>
|
|
<tr>
|
|
<th data-visible="true" style="width: 40px;" class="hidden-xs">Icon</th>
|
|
<th class="col-sm-2" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
|
|
<th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
|
|
<th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
|
|
<th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
|
|
<th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
|
|
<th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
|
|
@if ($snipeSettings->require_accept_signature=='1')
|
|
<th class="col-md-3" data-field="signature_file" data-visible="false" data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
|
|
@endif
|
|
<th class="col-md-3" data-visible="false" data-field="file" data-visible="false" data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
|
|
<th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">Changed</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
|
|
</div>
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.tab-pane history -->
|
|
|
|
<div class="tab-pane fade" id="files">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
|
|
@if ($asset->uploads->count() > 0)
|
|
<table
|
|
class="table table-striped snipe-table"
|
|
id="assetFileHistory"
|
|
data-pagination="true"
|
|
data-id-table="assetFileHistory"
|
|
data-search="true"
|
|
data-side-pagination="client"
|
|
data-show-columns="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="desc"
|
|
data-sort-name="created_at"
|
|
data-show-export="true"
|
|
data-export-options='{
|
|
"fileName": "export-asset-{{ $asset->id }}-files",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'
|
|
data-cookie-id-table="assetFileHistory">
|
|
<thead>
|
|
<tr>
|
|
<th data-visible="true" data-field="icon">{{trans('general.file_type')}}</th>
|
|
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes">{{ trans('general.notes') }}</th>
|
|
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
|
|
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename">{{ trans('general.file_name') }}</th>
|
|
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
|
|
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at">{{ trans('general.created_at') }}</th>
|
|
<th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
|
|
@foreach ($asset->uploads as $file)
|
|
<tr>
|
|
<td><i class="{{ \App\Helpers\Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
|
|
<td>
|
|
@if ($file->note)
|
|
{{ $file->note }}
|
|
@endif
|
|
</td>
|
|
<td>
|
|
@if ( \App\Helpers\Helper::checkUploadIsImage($file->get_src('assets')))
|
|
<a href="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
|
|
<img src="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
|
|
</a>
|
|
@endif
|
|
</td>
|
|
<td>
|
|
{{ $file->filename }}
|
|
</td>
|
|
<td>
|
|
@if ($file->filename)
|
|
<a href="{{ route('show/assetfile', [$asset->id, $file->id]) }}" class="btn btn-default">
|
|
<i class="fa fa-download" aria-hidden="true"></i>
|
|
</a>
|
|
@endif
|
|
</td>
|
|
|
|
<td>
|
|
@if ($file->created_at)
|
|
{{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
|
|
@endif
|
|
</td>
|
|
|
|
|
|
<td>
|
|
@can('update', \App\Models\Asset::class)
|
|
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fa fa-trash icon-white" aria-hidden="true"></i></a>
|
|
@endcan
|
|
</td>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
|
|
@else
|
|
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
@endif
|
|
|
|
</div> <!-- /.col-md-12 -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.tab-pane files -->
|
|
</div> <!-- /. tab-content -->
|
|
</div> <!-- /.nav-tabs-custom -->
|
|
</div> <!-- /. col-md-12 -->
|
|
</div> <!-- /. row -->
|
|
|
|
@can('update', \App\Models\Asset::class)
|
|
@include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id])
|
|
@endcan
|
|
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
@include ('partials.bootstrap-table')
|
|
|
|
@stop
|