mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
9c8ca6af21
commite321aeabae
Merge:8ec99ff43
37568ae9e
Author: 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 commit37568ae9ec
Merge:01a832169
32ad9050c
Author: 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 commit32ad9050cf
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169c
Merge:bcad49ce7
3c6883489
Author: 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 commit3c6883489c
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1b
Merge:714576be4
29f3a5c48
Author: 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 commit29f3a5c48f
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45
Merge:b999c50a2
512899294
Author: 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 commit5128992940
Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2e
Merge:9ca20e496
e3906b245
Author: 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! commite3906b245c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964
Merge:e0644dbbf
456a74d88
Author: 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 commit456a74d88c
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778
Author: 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 commitb725bd0fae
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6
Merge:5b6925b00
004ecad05
Author: 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() commit5b6925b00c
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bf
Author: 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 commit24c43056ba
Author: 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 commit606b7e905d
Author: 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 commitd73ddad477
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721e
Merge:7410b1683
8994f3e15
Author: 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! commit7410b16835
Merge:e955c983a
b09e7d19b
Author: 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 commit8994f3e15e
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77ca
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3
Merge:2fa17ac18
eed41e454
Author: 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 commitb09e7d19b3
Author: 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 commit2fa17ac185
Merge:b90515437
3b1e46f72
Author: 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… commit3b1e46f72b
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818
Author: 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 commiteed41e4549
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754f
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792a
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfb
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373
Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46a
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229
Merge:81a633288
897757bd0
Author: 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 commit897757bd04
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889
Author: 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 commit6e563f6e4b
Merge:5320f5c67
7f69ae953
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67c
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953b
Merge:c79f8c1ba
17f6fbabf
Author: 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 commit17f6fbabfa
Author: 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 commitc79f8c1baf
Merge:12c92e30b
536401fe0
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9
Author: 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 commit12c92e30b7
Author: 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 commitfd10b755b0
Author: 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 :( commitdbbb7680d9
Author: 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 commitcf0dd5bbad
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7f
Merge:ec6ed256f
89d433b41
Author: 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 commit89d433b41a
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6f
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1
Author: 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) commit536401fe0f
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fb
Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2d
Merge:339bdddc3
cc9f1577a
Author: 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 commitcc9f1577a4
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0c
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371e
Author: 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. ¯\_(ツ)_/¯ commit2e60a457bf
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160b
Merge:b42801f6a
00b051b8c
Author: 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 commit00b051b8c7
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7e
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384f
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6ae
Merge:de4934f21
946129f20
Author: 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 commit946129f206
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08
Author: 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 commitd1aa11ec89
Author: 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 commitde4934f21d
Merge:af06e4205
b10076b01
Author: 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 commitb10076b015
Author: 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. commitaf06e42056
Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4b
Merge:beae8efb2
2ac1c1636
Author: 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] commit2ac1c1636c
Author: 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 commit004ecad059
Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21
Merge:d14ab7e3e
9839e5e56
Author: 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 commit9839e5e566
Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1
Author: 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> commite7f74d94c1
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530
Merge:f88683766
8210da6e8
Author: 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] commit8210da6e82
Author: 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. commitf88683766b
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8c
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffa
Author: 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> commit7fb3a9b82c
Merge:9a2ed804c
ecb1e87fe
Author: 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 commitecb1e87fe6
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422
Author: 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> commit9a2ed804ca
Author: 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> commitd20fad28e5
Author: 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> commitae813ddf75
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0c
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6
Author: 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> commit9ee28c7513
Author: 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> commit1a8ba06702
Merge:0fd232e70
ee4d69b1c
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70d
Author: 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> commitee4d69b1c5
Merge:31c535094
d1ad11194
Author: 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 commitd1ad111949
Author: 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 commit31c5350941
Author: 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> commit7eb70e17e0
Merge:5bb4f271a
3dfcb4699
Author: 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 commit3dfcb46991
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3ba
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59f
Author: 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> commit5bb4f271aa
Author: 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>
1639 lines
53 KiB
PHP
1639 lines
53 KiB
PHP
<?php
|
|
namespace App\Models;
|
|
|
|
use App\Events\AssetCheckedOut;
|
|
use App\Events\CheckoutableCheckedOut;
|
|
use App\Exceptions\CheckoutNotAllowed;
|
|
use App\Http\Traits\UniqueSerialTrait;
|
|
use App\Http\Traits\UniqueUndeletedTrait;
|
|
use App\Models\Traits\Acceptable;
|
|
use App\Models\Traits\Searchable;
|
|
use App\Presenters\Presentable;
|
|
use AssetPresenter;
|
|
use Auth;
|
|
use Carbon\Carbon;
|
|
use DB;
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
use Illuminate\Support\Facades\Storage;
|
|
use Watson\Validating\ValidatingTrait;
|
|
|
|
/**
|
|
* Model for Assets.
|
|
*
|
|
* @version v1.0
|
|
*/
|
|
class Asset extends Depreciable
|
|
{
|
|
protected $presenter = 'App\Presenters\AssetPresenter';
|
|
use Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait;
|
|
|
|
const LOCATION = 'location';
|
|
const ASSET = 'asset';
|
|
const USER = 'user';
|
|
|
|
use Acceptable;
|
|
|
|
/**
|
|
* Run after the checkout acceptance was declined by the user
|
|
*
|
|
* @param User $acceptedBy
|
|
* @param string $signature
|
|
*/
|
|
public function declinedCheckout(User $declinedBy, $signature) {
|
|
$this->assigned_to = null;
|
|
$this->assigned_type = null;
|
|
$this->accepted = null;
|
|
$this->save();
|
|
}
|
|
|
|
|
|
/**
|
|
* The database table used by the model.
|
|
*
|
|
* @var string
|
|
*/
|
|
protected $table = 'assets';
|
|
|
|
/**
|
|
* Whether the model should inject it's identifier to the unique
|
|
* validation rules before attempting validation. If this property
|
|
* is not set in the model it will default to true.
|
|
*
|
|
* @var boolean
|
|
*/
|
|
protected $injectUniqueIdentifier = true;
|
|
|
|
// We set these as protected dates so that they will be easily accessible via Carbon
|
|
protected $dates = [
|
|
'created_at',
|
|
'updated_at',
|
|
'deleted_at',
|
|
'purchase_date',
|
|
'last_checkout',
|
|
'expected_checkin',
|
|
'last_audit_date',
|
|
'next_audit_date'
|
|
];
|
|
|
|
|
|
protected $casts = [
|
|
'model_id' => 'integer',
|
|
'status_id' => 'integer',
|
|
'company_id' => 'integer',
|
|
'location_id' => 'integer',
|
|
'rtd_company_id' => 'integer',
|
|
'supplier_id' => 'integer',
|
|
];
|
|
|
|
protected $rules = [
|
|
'name' => 'max:255|nullable',
|
|
'model_id' => 'required|integer|exists:models,id',
|
|
'status_id' => 'required|integer|exists:status_labels,id',
|
|
'company_id' => 'integer|nullable',
|
|
'warranty_months' => 'numeric|nullable|digits_between:0,240',
|
|
'physical' => 'numeric|max:1|nullable',
|
|
'checkout_date' => 'date|max:10|min:10|nullable',
|
|
'checkin_date' => 'date|max:10|min:10|nullable',
|
|
'supplier_id' => 'exists:suppliers,id|numeric|nullable',
|
|
'location_id' => 'exists:locations,id|nullable',
|
|
'rtd_location_id' => 'exists:locations,id|nullable',
|
|
'asset_tag' => 'required|min:1|max:255|unique_undeleted',
|
|
'status' => 'integer',
|
|
'serial' => 'unique_serial|nullable',
|
|
'purchase_cost' => 'numeric|nullable',
|
|
'next_audit_date' => 'date|nullable',
|
|
'last_audit_date' => 'date|nullable',
|
|
];
|
|
|
|
/**
|
|
* The attributes that are mass assignable.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $fillable = [
|
|
'asset_tag',
|
|
'assigned_to',
|
|
'assigned_type',
|
|
'company_id',
|
|
'image',
|
|
'location_id',
|
|
'model_id',
|
|
'name',
|
|
'notes',
|
|
'order_number',
|
|
'purchase_cost',
|
|
'purchase_date',
|
|
'rtd_location_id',
|
|
'serial',
|
|
'status_id',
|
|
'supplier_id',
|
|
'warranty_months',
|
|
'requestable',
|
|
];
|
|
|
|
use Searchable;
|
|
|
|
/**
|
|
* The attributes that should be included when searching the model.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $searchableAttributes = [
|
|
'name',
|
|
'asset_tag',
|
|
'serial',
|
|
'order_number',
|
|
'purchase_cost',
|
|
'notes',
|
|
'created_at',
|
|
'updated_at',
|
|
'purchase_date',
|
|
'expected_checkin',
|
|
'next_audit_date',
|
|
'last_audit_date'
|
|
];
|
|
|
|
/**
|
|
* The relations and their attributes that should be included when searching the model.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $searchableRelations = [
|
|
'assetstatus' => ['name'],
|
|
'supplier' => ['name'],
|
|
'company' => ['name'],
|
|
'defaultLoc' => ['name'],
|
|
'model' => ['name', 'model_number'],
|
|
'model.category' => ['name'],
|
|
'model.manufacturer' => ['name'],
|
|
];
|
|
|
|
|
|
/**
|
|
* This handles the custom field validation for assets
|
|
*
|
|
* @var array
|
|
*/
|
|
public function save(array $params = [])
|
|
{
|
|
$settings = \App\Models\Setting::getSettings();
|
|
|
|
// I don't remember why we have this here? Asset tag would always be required, even if auto increment is on...
|
|
$this->rules['asset_tag'] = ($settings->auto_increment_assets == '1') ? 'max:255' : 'required';
|
|
|
|
if($this->model_id != '') {
|
|
$model = AssetModel::find($this->model_id);
|
|
|
|
if (($model) && ($model->fieldset)) {
|
|
$this->rules += $model->fieldset->validation_rules();
|
|
}
|
|
}
|
|
|
|
return parent::save($params);
|
|
}
|
|
|
|
|
|
public function getDisplayNameAttribute()
|
|
{
|
|
return $this->present()->name();
|
|
}
|
|
|
|
/**
|
|
* Returns the warranty expiration date as Carbon object
|
|
* @return \Carbon|null
|
|
*/
|
|
public function getWarrantyExpiresAttribute()
|
|
{
|
|
if (isset($this->attributes['warranty_months']) && isset($this->attributes['purchase_date'])) {
|
|
if (is_string($this->attributes['purchase_date']) || is_string($this->attributes['purchase_date'])) {
|
|
$purchase_date = \Carbon\Carbon::parse($this->attributes['purchase_date']);
|
|
} else {
|
|
$purchase_date = \Carbon\Carbon::instance($this->attributes['purchase_date']);
|
|
}
|
|
$purchase_date->setTime(0, 0, 0);
|
|
return $purchase_date->addMonths((int) $this->attributes['warranty_months']);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
|
|
/**
|
|
* Establishes the asset -> company relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v3.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function company()
|
|
{
|
|
return $this->belongsTo('\App\Models\Company', 'company_id');
|
|
}
|
|
|
|
/**
|
|
* Determines if an asset is available for checkout
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v3.0]
|
|
* @return boolean
|
|
*/
|
|
public function availableForCheckout()
|
|
{
|
|
if (
|
|
(empty($this->assigned_to)) &&
|
|
(empty($this->deleted_at)) &&
|
|
(($this->assetstatus) && ($this->assetstatus->deployable == 1)))
|
|
{
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
/**
|
|
* Checks the asset out to the target
|
|
*
|
|
* @todo The admin parameter is never used. Can probably be removed.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @param User $user
|
|
* @param User $admin
|
|
* @param Carbon $checkout_at
|
|
* @param Carbon $expected_checkin
|
|
* @param string $note
|
|
* @param null $name
|
|
* @return bool
|
|
* @since [v3.0]
|
|
* @return boolean
|
|
*/
|
|
public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null)
|
|
{
|
|
if (!$target) {
|
|
return false;
|
|
}
|
|
if ($this->is($target)) {
|
|
throw new CheckoutNotAllowed('You cannot check an asset out to itself.');
|
|
}
|
|
|
|
if ($expected_checkin) {
|
|
$this->expected_checkin = $expected_checkin;
|
|
}
|
|
|
|
$this->last_checkout = $checkout_at;
|
|
|
|
$this->assignedTo()->associate($target);
|
|
|
|
|
|
if ($name != null) {
|
|
$this->name = $name;
|
|
}
|
|
|
|
if ($location != null) {
|
|
$this->location_id = $location;
|
|
} else {
|
|
if (isset($target->location)) {
|
|
$this->location_id = $target->location->id;
|
|
}
|
|
if ($target instanceof Location) {
|
|
$this->location_id = $target->id;
|
|
}
|
|
}
|
|
|
|
if ($this->save()) {
|
|
|
|
event(new CheckoutableCheckedOut($this, $target, Auth::user(), $note));
|
|
|
|
$this->increment('checkout_counter', 1);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Sets the detailedNameAttribute
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v3.0]
|
|
* @return string
|
|
*/
|
|
public function getDetailedNameAttribute()
|
|
{
|
|
if ($this->assignedto) {
|
|
$user_name = $this->assignedto->present()->name();
|
|
} else {
|
|
$user_name = "Unassigned";
|
|
}
|
|
return $this->asset_tag . ' - ' . $this->name . ' (' . $user_name . ') ' . ($this->model) ? $this->model->name: '';
|
|
}
|
|
|
|
/**
|
|
* Pulls in the validation rules
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v3.0]
|
|
* @return array
|
|
*/
|
|
public function validationRules()
|
|
{
|
|
return $this->rules;
|
|
}
|
|
|
|
|
|
/**
|
|
* Establishes the asset -> depreciation relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v3.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function depreciation()
|
|
{
|
|
return $this->model->belongsTo('\App\Models\Depreciation', 'depreciation_id');
|
|
}
|
|
|
|
|
|
/**
|
|
* Get components assigned to this asset
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function components()
|
|
{
|
|
return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed();
|
|
}
|
|
|
|
|
|
/**
|
|
* Get depreciation attribute from associated asset model
|
|
*
|
|
* @todo Is this still needed?
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function get_depreciation()
|
|
{
|
|
if (($this->model) && ($this->model->depreciation)) {
|
|
return $this->model->depreciation;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Get uploads for this asset
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function uploads()
|
|
{
|
|
return $this->hasMany('\App\Models\Actionlog', 'item_id')
|
|
->where('item_type', '=', Asset::class)
|
|
->where('action_type', '=', 'uploaded')
|
|
->whereNotNull('filename')
|
|
->orderBy('created_at', 'desc');
|
|
}
|
|
|
|
|
|
/**
|
|
* Determines whether the asset is checked out to a user
|
|
*
|
|
* Even though we allow allow for checkout to things beyond users
|
|
* this method is an easy way of seeing if we are checked out to a user.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return boolean
|
|
*/
|
|
public function checkedOutToUser()
|
|
{
|
|
return $this->assignedType() === self::USER;
|
|
}
|
|
|
|
/**
|
|
* Get the target this asset is checked out to
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function assignedTo()
|
|
{
|
|
return $this->morphTo('assigned', 'assigned_type', 'assigned_to');
|
|
}
|
|
|
|
/**
|
|
* Gets assets assigned to this asset
|
|
*
|
|
* Sigh.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function assignedAssets()
|
|
{
|
|
return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
|
|
}
|
|
|
|
|
|
/**
|
|
* Get the asset's location based on the assigned user
|
|
*
|
|
* @todo Refactor this if possible. It's awful.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \ArrayObject
|
|
*/
|
|
public function assetLoc($iterations = 1,$first_asset = null)
|
|
{
|
|
if (!empty($this->assignedType())) {
|
|
if ($this->assignedType() == self::ASSET) {
|
|
if(!$first_asset) {
|
|
$first_asset=$this;
|
|
}
|
|
if($iterations>10) {
|
|
throw new \Exception("Asset assignment Loop for Asset ID: ".$first_asset->id);
|
|
}
|
|
$assigned_to=Asset::find($this->assigned_to); //have to do this this way because otherwise it errors
|
|
if ($assigned_to) {
|
|
return $assigned_to->assetLoc($iterations + 1, $first_asset);
|
|
} // Recurse until we have a final location
|
|
}
|
|
if ($this->assignedType() == self::LOCATION) {
|
|
if ($this->assignedTo) {
|
|
return $this->assignedTo;
|
|
}
|
|
|
|
}
|
|
if ($this->assignedType() == self::USER) {
|
|
if (($this->assignedTo) && $this->assignedTo->userLoc) {
|
|
return $this->assignedTo->userLoc;
|
|
}
|
|
//this makes no sense
|
|
return $this->defaultLoc;
|
|
|
|
}
|
|
|
|
}
|
|
return $this->defaultLoc;
|
|
}
|
|
|
|
/**
|
|
* Gets the lowercased name of the type of target the asset is assigned to
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return string
|
|
*/
|
|
public function assignedType()
|
|
{
|
|
return strtolower(class_basename($this->assigned_type));
|
|
}
|
|
|
|
/**
|
|
* Get the asset's location based on default RTD location
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function defaultLoc()
|
|
{
|
|
return $this->belongsTo('\App\Models\Location', 'rtd_location_id');
|
|
}
|
|
|
|
/**
|
|
* Get the image URL of the asset.
|
|
*
|
|
* Check first to see if there is a specific image uploaded to the asset,
|
|
* and if not, check for an image uploaded to the asset model.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return string | false
|
|
*/
|
|
public function getImageUrl()
|
|
{
|
|
if ($this->image && !empty($this->image)) {
|
|
return Storage::disk('public')->url(app('assets_upload_path').e($this->image));
|
|
} elseif ($this->model && !empty($this->model->image)) {
|
|
return Storage::disk('public')->url(app('models_upload_path').e($this->model->image));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
/**
|
|
* Get the asset's logs
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function assetlog()
|
|
{
|
|
return $this->hasMany('\App\Models\Actionlog', 'item_id')
|
|
->where('item_type', '=', Asset::class)
|
|
->orderBy('created_at', 'desc')
|
|
->withTrashed();
|
|
}
|
|
|
|
/**
|
|
* Get the list of checkouts for this asset
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function checkouts()
|
|
{
|
|
return $this->assetlog()->where('action_type', '=', 'checkout')
|
|
->orderBy('created_at', 'desc')
|
|
->withTrashed();
|
|
}
|
|
|
|
/**
|
|
* Get the list of checkins for this asset
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function checkins()
|
|
{
|
|
return $this->assetlog()
|
|
->where('action_type', '=', 'checkin from')
|
|
->orderBy('created_at', 'desc')
|
|
->withTrashed();
|
|
}
|
|
|
|
/**
|
|
* Get the asset's user requests
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function userRequests()
|
|
{
|
|
return $this->assetlog()
|
|
->where('action_type', '=', 'requested')
|
|
->orderBy('created_at', 'desc')
|
|
->withTrashed();
|
|
}
|
|
|
|
|
|
/**
|
|
* Get maintenances for this asset
|
|
*
|
|
* @author Vincent Sposato <vincent.sposato@gmail.com>
|
|
* @since 1.0
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function assetmaintenances()
|
|
{
|
|
return $this->hasMany('\App\Models\AssetMaintenance', 'asset_id')
|
|
->orderBy('created_at', 'desc');
|
|
}
|
|
|
|
/**
|
|
* Get action logs history for this asset
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function adminuser()
|
|
{
|
|
return $this->belongsTo('\App\Models\User', 'user_id');
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Establishes the asset -> status relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function assetstatus()
|
|
{
|
|
return $this->belongsTo('\App\Models\Statuslabel', 'status_id');
|
|
}
|
|
|
|
/**
|
|
* Establishes the asset -> model relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v1.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function model()
|
|
{
|
|
return $this->belongsTo('\App\Models\AssetModel', 'model_id')->withTrashed();
|
|
}
|
|
|
|
/**
|
|
* Return the assets with a warranty expiring within x days
|
|
*
|
|
* @param $days
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return mixed
|
|
*/
|
|
public static function getExpiringWarrantee($days = 30)
|
|
{
|
|
return Asset::where('archived', '=', '0')
|
|
->whereNotNull('warranty_months')
|
|
->whereNotNull('purchase_date')
|
|
->whereNull('deleted_at')
|
|
->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
|
|
. $days
|
|
. ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()'))
|
|
->orderBy('purchase_date', 'ASC')
|
|
->get();
|
|
}
|
|
|
|
|
|
/**
|
|
* Establishes the asset -> assigned licenses relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function licenses()
|
|
{
|
|
return $this->belongsToMany('\App\Models\License', 'license_seats', 'asset_id', 'license_id');
|
|
}
|
|
|
|
/**
|
|
* Establishes the asset -> status relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function licenseseats()
|
|
{
|
|
return $this->hasMany('\App\Models\LicenseSeat', 'asset_id');
|
|
}
|
|
|
|
/**
|
|
* Establishes the asset -> aupplier relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function supplier()
|
|
{
|
|
return $this->belongsTo('\App\Models\Supplier', 'supplier_id');
|
|
}
|
|
|
|
/**
|
|
* Establishes the asset -> location relationship
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v2.0]
|
|
* @return \Illuminate\Database\Eloquent\Relations\Relation
|
|
*/
|
|
public function location()
|
|
{
|
|
return $this->belongsTo('\App\Models\Location', 'location_id');
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Get the next autoincremented asset tag
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return string | false
|
|
*/
|
|
public static function autoincrement_asset()
|
|
{
|
|
$settings = \App\Models\Setting::getSettings();
|
|
|
|
|
|
if ($settings->auto_increment_assets == '1') {
|
|
$temp_asset_tag = \DB::table('assets')
|
|
->where('physical', '=', '1')
|
|
->max('asset_tag');
|
|
|
|
$asset_tag_digits = preg_replace('/\D/', '', $temp_asset_tag);
|
|
$asset_tag = preg_replace('/^0*/', '', $asset_tag_digits);
|
|
|
|
if ($settings->zerofill_count > 0) {
|
|
return $settings->auto_increment_prefix.Asset::zerofill($settings->next_auto_tag_base, $settings->zerofill_count);
|
|
}
|
|
return $settings->auto_increment_prefix.$settings->next_auto_tag_base;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Get the next base number for the auto-incrementer.
|
|
*
|
|
* We'll add the zerofill and prefixes on the fly as we generate the number.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return int
|
|
*/
|
|
public static function nextAutoIncrement($assets)
|
|
{
|
|
|
|
$max = 1;
|
|
|
|
foreach ($assets as $asset) {
|
|
$results = preg_match ( "/\d+$/" , $asset['asset_tag'], $matches);
|
|
|
|
if ($results)
|
|
{
|
|
$number = $matches[0];
|
|
|
|
if ($number > $max)
|
|
{
|
|
$max = $number;
|
|
}
|
|
}
|
|
}
|
|
return $max + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Add zerofilling based on Settings
|
|
*
|
|
* We'll add the zerofill and prefixes on the fly as we generate the number.
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return string
|
|
*/
|
|
public static function zerofill($num, $zerofill = 3)
|
|
{
|
|
return str_pad($num, $zerofill, '0', STR_PAD_LEFT);
|
|
}
|
|
|
|
/**
|
|
* Determine whether to send a checkin/checkout email based on
|
|
* asset model category
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return boolean
|
|
*/
|
|
public function checkin_email()
|
|
{
|
|
return $this->model->category->checkin_email;
|
|
}
|
|
|
|
/**
|
|
* Determine whether this asset requires acceptance by the assigned user
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return boolean
|
|
*/
|
|
public function requireAcceptance()
|
|
{
|
|
if (($this->model) && ($this->model->category)) {
|
|
return $this->model->category->require_acceptance;
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* Checks for a category-specific EULA, and if that doesn't exist,
|
|
* checks for a settings level EULA
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v4.0]
|
|
* @return string | false
|
|
*/
|
|
public function getEula()
|
|
{
|
|
$Parsedown = new \Parsedown();
|
|
|
|
if (($this->model) && ($this->model->category)) {
|
|
if ($this->model->category->eula_text) {
|
|
return $Parsedown->text(e($this->model->category->eula_text));
|
|
} elseif ($this->model->category->use_default_eula == '1') {
|
|
return $Parsedown->text(e(Setting::getSettings()->default_eula_text));
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
|
|
/**
|
|
* -----------------------------------------------
|
|
* BEGIN QUERY SCOPES
|
|
* -----------------------------------------------
|
|
**/
|
|
|
|
/**
|
|
* Run additional, advanced searches.
|
|
*
|
|
* @param \Illuminate\Database\Eloquent\Builder $query
|
|
* @param array $terms The search terms
|
|
* @return \Illuminate\Database\Eloquent\Builder
|
|
*/
|
|
public function advancedTextSearch(Builder $query, array $terms) {
|
|
|
|
/**
|
|
* Assigned user
|
|
*/
|
|
$query = $query->leftJoin('users as assets_users',function ($leftJoin) {
|
|
$leftJoin->on("assets_users.id", "=", "assets.assigned_to")
|
|
->where("assets.assigned_type", "=", User::class);
|
|
});
|
|
|
|
foreach($terms as $term) {
|
|
|
|
$query = $query
|
|
->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%')
|
|
->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
|
|
->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
|
|
->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$term%", "%$term%"]);
|
|
|
|
}
|
|
|
|
/**
|
|
* Assigned location
|
|
*/
|
|
$query = $query->leftJoin('locations as assets_locations',function ($leftJoin) {
|
|
$leftJoin->on("assets_locations.id","=","assets.assigned_to")
|
|
->where("assets.assigned_type","=",Location::class);
|
|
});
|
|
|
|
foreach($terms as $term) {
|
|
|
|
$query = $query->orWhere('assets_locations.name', 'LIKE', '%'.$term.'%');
|
|
|
|
}
|
|
|
|
/**
|
|
* Assigned assets
|
|
*/
|
|
$query = $query->leftJoin('assets as assigned_assets',function ($leftJoin) {
|
|
$leftJoin->on('assigned_assets.id', '=', 'assets.assigned_to')
|
|
->where('assets.assigned_type', '=', Asset::class);
|
|
});
|
|
|
|
foreach($terms as $term) {
|
|
|
|
$query = $query->orWhere('assigned_assets.name', 'LIKE', '%'.$term.'%');
|
|
|
|
}
|
|
|
|
return $query;
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope for hardware
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeHardware($query)
|
|
{
|
|
return $query->where('physical', '=', '1');
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for pending assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopePending($query)
|
|
{
|
|
return $query->whereHas('assetstatus', function ($query) {
|
|
$query->where('deployable', '=', 0)
|
|
->where('pending', '=', 1)
|
|
->where('archived', '=', 0);
|
|
});
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope for searching location
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeAssetsByLocation($query, $location)
|
|
{
|
|
return $query->where(function ($query) use ($location) {
|
|
$query->whereHas('assignedTo', function ($query) use ($location) {
|
|
$query->where([
|
|
['users.location_id', '=', $location->id],
|
|
['assets.assigned_type', '=', User::class]
|
|
])->orWhere([
|
|
['locations.id', '=', $location->id],
|
|
['assets.assigned_type', '=', Location::class]
|
|
])->orWhere([
|
|
['assets.rtd_location_id', '=', $location->id],
|
|
['assets.assigned_type', '=', Asset::class]
|
|
]);
|
|
})->orWhere(function ($query) use ($location) {
|
|
$query->where('assets.rtd_location_id', '=', $location->id);
|
|
$query->whereNull('assets.assigned_to');
|
|
});
|
|
});
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope for RTD assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeRTD($query)
|
|
{
|
|
return $query->whereNull('assets.assigned_to')
|
|
->whereHas('assetstatus', function ($query) {
|
|
$query->where('deployable', '=', 1)
|
|
->where('pending', '=', 0)
|
|
->where('archived', '=', 0);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Undeployable assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeUndeployable($query)
|
|
{
|
|
return $query->whereHas('assetstatus', function ($query) {
|
|
$query->where('deployable', '=', 0)
|
|
->where('pending', '=', 0)
|
|
->where('archived', '=', 0);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for non-Archived assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeNotArchived($query)
|
|
{
|
|
return $query->whereHas('assetstatus', function ($query) {
|
|
$query->where('archived', '=', 0);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Assets that are due for auditing, based on the assets.next_audit_date
|
|
* and settings.audit_warning_days.
|
|
*
|
|
* This is/will be used in the artisan command snipeit:upcoming-audits and also
|
|
* for an upcoming API call for retrieving a report on assets that will need to be audited.
|
|
*
|
|
* Due for audit soon:
|
|
* next_audit_date greater than or equal to now (must be in the future)
|
|
* and (next_audit_date - threshold days) <= now ()
|
|
*
|
|
* Example:
|
|
* next_audit_date = May 4, 2025
|
|
* threshold for alerts = 30 days
|
|
* now = May 4, 2019
|
|
*
|
|
* @author A. Gianotto <snipe@snipe.net>
|
|
* @since v4.6.16
|
|
* @param Setting $settings
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeDueForAudit($query, $settings)
|
|
{
|
|
$interval = $settings->audit_warning_days ?? 0;
|
|
|
|
return $query->whereNotNull('assets.next_audit_date')
|
|
->where('assets.next_audit_date', '>=', Carbon::now())
|
|
->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $interval DAY) <= '".Carbon::now()."'")
|
|
->where('assets.archived', '=', 0)
|
|
->NotArchived();
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Assets that are OVERDUE for auditing, based on the assets.next_audit_date
|
|
* and settings.audit_warning_days. It checks to see if assets.next audit_date is before now
|
|
*
|
|
* This is/will be used in the artisan command snipeit:upcoming-audits and also
|
|
* for an upcoming API call for retrieving a report on overdue assets.
|
|
*
|
|
* @author A. Gianotto <snipe@snipe.net>
|
|
* @since v4.6.16
|
|
* @param Setting $settings
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeOverdueForAudit($query)
|
|
{
|
|
return $query->whereNotNull('assets.next_audit_date')
|
|
->where('assets.next_audit_date', '<', Carbon::now())
|
|
->where('assets.archived', '=', 0)
|
|
->NotArchived();
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Assets that are due for auditing OR overdue, based on the assets.next_audit_date
|
|
* and settings.audit_warning_days.
|
|
*
|
|
* This is/will be used in the artisan command snipeit:upcoming-audits and also
|
|
* for an upcoming API call for retrieving a report on assets that will need to be audited.
|
|
*
|
|
* @author A. Gianotto <snipe@snipe.net>
|
|
* @since v4.6.16
|
|
* @param Setting $settings
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeDueOrOverdueForAudit($query, $settings)
|
|
{
|
|
$interval = $settings->audit_warning_days ?? 0;
|
|
|
|
return $query->whereNotNull('assets.next_audit_date')
|
|
->whereRaw("DATE_SUB(".DB::getTablePrefix()."assets.next_audit_date, INTERVAL $interval DAY) <= '".Carbon::now()."'")
|
|
->where('assets.archived', '=', 0)
|
|
->NotArchived();
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope for Archived assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeArchived($query)
|
|
{
|
|
return $query->whereHas('assetstatus', function ($query) {
|
|
$query->where('deployable', '=', 0)
|
|
->where('pending', '=', 0)
|
|
->where('archived', '=', 1);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Deployed assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeDeployed($query)
|
|
{
|
|
return $query->where('assigned_to', '>', '0');
|
|
}
|
|
|
|
/**
|
|
* Query builder scope for Requestable assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
|
|
public function scopeRequestableAssets($query)
|
|
{
|
|
return Company::scopeCompanyables($query->where('requestable', '=', 1))
|
|
->whereHas('assetstatus', function ($query) {
|
|
$query->where('deployable', '=', 1)
|
|
->where('pending', '=', 0)
|
|
->where('archived', '=', 0);
|
|
});
|
|
}
|
|
|
|
|
|
/**
|
|
* scopeInModelList
|
|
* Get all assets in the provided listing of model ids
|
|
*
|
|
* @param $query
|
|
* @param array $modelIdListing
|
|
*
|
|
* @return mixed
|
|
* @author Vincent Sposato <vincent.sposato@gmail.com>
|
|
* @version v1.0
|
|
*/
|
|
public function scopeInModelList($query, array $modelIdListing)
|
|
{
|
|
return $query->whereIn('assets.model_id', $modelIdListing);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to get not-yet-accepted assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeNotYetAccepted($query)
|
|
{
|
|
return $query->where("accepted", "=", "pending");
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to get rejected assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeRejected($query)
|
|
{
|
|
return $query->where("accepted", "=", "rejected");
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to get accepted assets
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeAccepted($query)
|
|
{
|
|
return $query->where("accepted", "=", "accepted");
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to search on text for complex Bootstrap Tables API.
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $search Search term
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeAssignedSearch($query, $search)
|
|
{
|
|
$search = explode(' OR ', $search);
|
|
|
|
return $query->leftJoin('users as assets_users',function ($leftJoin) {
|
|
$leftJoin->on("assets_users.id", "=", "assets.assigned_to")
|
|
->where("assets.assigned_type", "=", User::class);
|
|
})->leftJoin('locations as assets_locations',function ($leftJoin) {
|
|
$leftJoin->on("assets_locations.id","=","assets.assigned_to")
|
|
->where("assets.assigned_type","=",Location::class);
|
|
})->leftJoin('assets as assigned_assets',function ($leftJoin) {
|
|
$leftJoin->on('assigned_assets.id', '=', 'assets.assigned_to')
|
|
->where('assets.assigned_type', '=', Asset::class);
|
|
})->where(function ($query) use ($search) {
|
|
foreach ($search as $search) {
|
|
$query->whereHas('model', function ($query) use ($search) {
|
|
$query->whereHas('category', function ($query) use ($search) {
|
|
$query->where(function ($query) use ($search) {
|
|
$query->where('categories.name', 'LIKE', '%'.$search.'%')
|
|
->orWhere('models.name', 'LIKE', '%'.$search.'%')
|
|
->orWhere('models.model_number', 'LIKE', '%'.$search.'%');
|
|
});
|
|
});
|
|
})->orWhereHas('model', function ($query) use ($search) {
|
|
$query->whereHas('manufacturer', function ($query) use ($search) {
|
|
$query->where(function ($query) use ($search) {
|
|
$query->where('manufacturers.name', 'LIKE', '%'.$search.'%');
|
|
});
|
|
});
|
|
})->orWhere(function ($query) use ($search) {
|
|
$query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
|
|
->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$search%", "%$search%"])
|
|
->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
|
|
})->orWhere('assets.name', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets.asset_tag', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets.serial', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets.order_number', 'LIKE', '%'.$search.'%')
|
|
->orWhere('assets.notes', 'LIKE', '%'.$search.'%');
|
|
}
|
|
|
|
})->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to search the department ID of users assigned to assets
|
|
*
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
* @since [v5.0]
|
|
* @return string | false
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeCheckedOutToTargetInDepartment($query, $search)
|
|
{
|
|
return $query->leftJoin('users as assets_dept_users',function ($leftJoin) {
|
|
$leftJoin->on("assets_dept_users.id", "=", "assets.assigned_to")
|
|
->where("assets.assigned_type", "=", User::class);
|
|
})->where(function ($query) use ($search) {
|
|
$query->where('assets_dept_users.department_id', '=', $search);
|
|
|
|
})->withTrashed()->whereNull("assets.deleted_at"); //workaround for laravel bug
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Query builder scope to search on text filters for complex Bootstrap Tables API
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $filter JSON array of search keys and terms
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeByFilter($query, $filter)
|
|
{
|
|
return $query->where(function ($query) use ($filter) {
|
|
foreach ($filter as $key => $search_val) {
|
|
|
|
$fieldname = str_replace('custom_fields.','', $key) ;
|
|
|
|
if ($fieldname =='asset_tag') {
|
|
$query->where('assets.asset_tag', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='name') {
|
|
$query->where('assets.name', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='product_key') {
|
|
$query->where('assets.serial', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='purchase_date') {
|
|
$query->where('assets.purchase_date', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='purchase_cost') {
|
|
$query->where('assets.purchase_cost', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='notes') {
|
|
$query->where('assets.notes', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='order_number') {
|
|
$query->where('assets.order_number', 'LIKE', '%'.$search_val.'%');
|
|
}
|
|
|
|
if ($fieldname =='status_label') {
|
|
$query->whereHas('assetstatus', function ($query) use ($search_val) {
|
|
$query->where('status_labels.name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='location') {
|
|
$query->whereHas('location', function ($query) use ($search_val) {
|
|
$query->where('locations.name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='checkedout_to') {
|
|
$query->whereHas('assigneduser', function ($query) use ($search_val) {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->where('users.first_name', 'LIKE', '%' . $search_val . '%')
|
|
->orWhere('users.last_name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
}
|
|
|
|
|
|
if ($fieldname =='manufacturer') {
|
|
$query->whereHas('model', function ($query) use ($search_val) {
|
|
$query->whereHas('manufacturer', function ($query) use ($search_val) {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->where('manufacturers.name', 'LIKE', '%'.$search_val.'%');
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='category') {
|
|
$query->whereHas('model', function ($query) use ($search_val) {
|
|
$query->whereHas('category', function ($query) use ($search_val) {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->where('categories.name', 'LIKE', '%' . $search_val . '%')
|
|
->orWhere('models.name', 'LIKE', '%' . $search_val . '%')
|
|
->orWhere('models.model_number', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='model') {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->whereHas('model', function ($query) use ($search_val) {
|
|
$query->where('models.name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='model_number') {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->whereHas('model', function ($query) use ($search_val) {
|
|
$query->where('models.model_number', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
}
|
|
|
|
|
|
if ($fieldname =='company') {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->whereHas('company', function ($query) use ($search_val) {
|
|
$query->where('companies.name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
}
|
|
|
|
if ($fieldname =='supplier') {
|
|
$query->where(function ($query) use ($search_val) {
|
|
$query->whereHas('supplier', function ($query) use ($search_val) {
|
|
$query->where('suppliers.name', 'LIKE', '%' . $search_val . '%');
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* THIS CLUNKY BIT IS VERY IMPORTANT
|
|
*
|
|
* Although inelegant, this section matters a lot when querying against fields that do not
|
|
* exist on the asset table. There's probably a better way to do this moving forward, for
|
|
* example using the Schema:: methods to determine whether or not a column actually exists,
|
|
* or even just using the $searchableRelations variable earlier in this file.
|
|
*
|
|
* In short, this set of statements tells the query builder to ONLY query against an
|
|
* actual field that's being passed if it doesn't meet known relational fields. This
|
|
* allows us to query custom fields directly in the assetsv table
|
|
* (regardless of their name) and *skip* any fields that we already know can only be
|
|
* searched through relational searches that we do earlier in this method.
|
|
*
|
|
* For example, we do not store "location" as a field on the assets table, we store
|
|
* that relationship through location_id on the assets table, therefore querying
|
|
* assets.location would fail, as that field doesn't exist -- plus we're already searching
|
|
* against those relationships earlier in this method.
|
|
*
|
|
* - snipe
|
|
*
|
|
*/
|
|
if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')
|
|
&& ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
|
|
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
|
|
}
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to order on model
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderModels($query, $order)
|
|
{
|
|
return $query->join('models as asset_models', 'assets.model_id', '=', 'asset_models.id')->orderBy('asset_models.name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to order on model number
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderModelNumber($query, $order)
|
|
{
|
|
return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order);
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to order on assigned user
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderAssigned($query, $order)
|
|
{
|
|
return $query->leftJoin('users as users_sort', 'assets.assigned_to', '=', 'users_sort.id')->select('assets.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to order on status
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderStatus($query, $order)
|
|
{
|
|
return $query->join('status_labels as status_sort', 'assets.status_id', '=', 'status_sort.id')->orderBy('status_sort.name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to order on company
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderCompany($query, $order)
|
|
{
|
|
return $query->leftJoin('companies as company_sort', 'assets.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order);
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to return results of a category
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeInCategory($query, $category_id)
|
|
{
|
|
return $query->join('models as category_models', 'assets.model_id', '=', 'category_models.id')
|
|
->join('categories', 'category_models.category_id', '=', 'categories.id')->where('category_models.category_id', '=', $category_id);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to return results of a manufacturer
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeByManufacturer($query, $manufacturer_id)
|
|
{
|
|
return $query->join('models', 'assets.model_id', '=', 'models.id')
|
|
->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->where('models.manufacturer_id', '=', $manufacturer_id);
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* Query builder scope to order on category
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderCategory($query, $order)
|
|
{
|
|
return $query->join('models as order_model_category', 'assets.model_id', '=', 'order_model_category.id')
|
|
->join('categories as category_order', 'order_model_category.category_id', '=', 'category_order.id')
|
|
->orderBy('category_order.name', $order);
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to order on manufacturer
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderManufacturer($query, $order)
|
|
{
|
|
return $query->join('models', 'assets.model_id', '=', 'models.id')
|
|
->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')
|
|
->orderBy('manufacturers.name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to order on location
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderLocation($query, $order)
|
|
{
|
|
return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.location_id')->orderBy('asset_locations.name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to order on default
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderRtdLocation($query, $order)
|
|
{
|
|
return $query->leftJoin('locations as rtd_asset_locations', 'rtd_asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('rtd_asset_locations.name', $order);
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to order on supplier name
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $order Order
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeOrderSupplier($query, $order)
|
|
{
|
|
return $query->leftJoin('suppliers as suppliers_assets', 'assets.supplier_id', '=', 'suppliers_assets.id')->orderBy('suppliers_assets.name', $order);
|
|
}
|
|
|
|
/**
|
|
* Query builder scope to search on location ID
|
|
*
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $search Search term
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeByLocationId($query, $search)
|
|
{
|
|
return $query->where(function ($query) use ($search) {
|
|
$query->whereHas('location', function ($query) use ($search) {
|
|
$query->where('locations.id', '=', $search);
|
|
});
|
|
});
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
* Query builder scope to search on depreciation name
|
|
* @param \Illuminate\Database\Query\Builder $query Query builder instance
|
|
* @param text $search Search term
|
|
*
|
|
* @return \Illuminate\Database\Query\Builder Modified query builder
|
|
*/
|
|
public function scopeByDepreciationId($query, $search)
|
|
{
|
|
return $query->join('models', 'assets.model_id', '=', 'models.id')
|
|
->join('depreciations', 'models.depreciation_id', '=', 'depreciations.id')->where('models.depreciation_id', '=', $search);
|
|
|
|
}
|
|
|
|
|
|
}
|