DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11124 commits 101 branches 268 tags 288 MiB
Commit graph

4367 commits

Author SHA1 Message Date
Marcus Moore 9cb0decf35
Adapt multiple column search based on database driver 2023-05-18 12:54:00 -07:00
snipe 2c4c9a16c9 Refactored the static arrays into mount arrays for translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:31:58 -07:00
snipe d228b7f347 Remove 99% of the defaultMap stuff (might pull all of this later) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:31:01 -07:00
snipe 3296716dfa Added EOL date to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 19:06:35 -07:00
snipe f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif 
adds translation to checkout notification
 2023-05-16 17:25:50 -07:00
snipe 71234228b4
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to 
removes assigned_to if archived
 2023-05-16 17:25:24 -07:00
snipe 4ca914d773
Merge pull request #13038 from uberbrady/fix_asset_checkout_on_update 
Importer fix for non-Location imports
 2023-05-16 16:41:27 -07:00
Brady Wetherington 2eb34d423f Importer fix for non-Location imports 2023-05-16 16:33:07 -07:00
snipe 02cacf76c6 Additional multi-select options for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 13:58:21 -07:00
Godfrey M 8e3cbdad90 removes assigned_to if archived 2023-05-15 11:52:57 -07:00
Godfrey M 46d6783fc5 adds translation to checkout notification 2023-05-15 09:01:30 -07:00
snipe 0f3b77ee2d Added multi-select option to custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 14:45:31 -07:00
snipe 9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report 
Added Multiselect of companies for custom reports
 2023-05-10 11:36:21 -07:00
snipe 7c77f4a697 Extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:10:53 -07:00
akemidx 537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page 2023-05-10 09:30:54 -04:00
snipe 8bad72a80f Added validation on google client ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:40:45 -07:00
snipe 788c03ef57 Hide client secret if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:22:49 -07:00
snipe 7062583710 Check for http or https in avatar value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:38 -07:00
snipe 2dd32d8785 Re-add the image update 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:27 -07:00
snipe ff66a938c1 Clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:15 -07:00
snipe 7f0e677908 Use normal translation style 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:05 -07:00
snipe e8a0c7f2ce Remove avatar update, since we don’t take URLs for that 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:59:33 -07:00
snipe e950cf4279 Switch to using username as match for google login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:58:36 -07:00
snipe 567a800c51 Added debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:47:52 -07:00
snipe e5eb5932ca Create constructor to override expected config variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:37:03 -07:00
snipe 3612526632 Disallow saving data if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:14:54 -07:00
snipe 63bf93b786 Pulled redirect from settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:56:04 -07:00
snipe 3fb5188037 Removed redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:46 -07:00
snipe aefd330e4e Added methods for google settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:28 -07:00
snipe b7e8ce3064 Changed redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:14 -07:00
snipe 054a2ab9d4 Add validation and fillable fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:31 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
snipe b76c5206ff
Merge pull request #12986 from snipe/features/import_backup_filename 
Pass filename to pre-import backup
 2023-05-08 15:08:59 -07:00
snipe 332b017dcc Pass filename for manual backups 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 15:00:02 -07:00
snipe 5960a5425d Pass filename to pre-import backup 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:48:26 -07:00
snipe f1d85c67f1 Make validation match database fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:12:54 -07:00
snipe 6486ea4fb7
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model 
Refactor of #12955
 2023-05-08 13:14:02 -07:00
snipe d685335aea
Merge pull request #12975 from inietov/fixes/import_asset_notes 
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
 2023-05-08 13:11:50 -07:00
snipe d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177 
Fixes user name missing in accessory acceptance notifications
 2023-05-08 13:04:37 -07:00
snipe ba462d1e93 Check that the filename we pass ends in zip, add it if not 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:41:32 -07:00
snipe 85243423cf Add optional filename to backup 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:20:43 -07:00
snipe 8b73fa0053 Added missing use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-06 06:36:09 -07:00
Ivan Nieto Vivanco fbb7c55450 Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models 2023-05-04 03:12:36 -06:00
Ivan Nieto Vivanco 89fbd60d97 Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form 2023-05-04 02:00:04 -06:00
Marcus Moore 96c6d8896f
Add additional information to acceptance notifications for assets, accessories, and consumables 2023-05-03 17:04:01 -07:00
Marcus Moore 4a0b3efd1f
Include user's name in Acceptance result notifications for accessories 2023-05-03 14:22:05 -07:00
Marcus Moore f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -07:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset 
Fixed Error 500 after sign and accept asset
 2023-05-03 11:43:14 -07:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import 
Location importer via Livewire Importer
 2023-05-03 11:02:06 -07:00
snipe f5cd58e9b7 Unmix return type variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:57:02 -07:00
snipe da4841987e Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:55:30 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe 914b2658cc
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report 
Remove the loading of asset maintenances that are not used by view
 2023-05-03 10:41:52 -07:00
Ivan Nieto Vivanco 6936d76661 Prevent hard fail when retrieving acceptance data 2023-05-01 16:50:18 -06:00
Ivan Nieto Vivanco 1b2d830380 Check if model exists before create asset via API 2023-05-01 16:05:03 -06:00
snipe aa814cf761 Fixed #12946 - warranty lookup url was not nullable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-29 13:47:52 -07:00
Marcus Moore 3cae32b236
Eager load default locations 2023-04-27 17:13:09 -07:00
Marcus Moore 429c4cb99f
Remove the loading of asset maintenances that are not used by view 2023-04-27 17:12:53 -07:00
snipe 8b476e55b6
Merge pull request #12941 from akemidx/feature/sc-23153 
Created At and Updated At fields on License table view
 2023-04-27 16:59:30 -07:00
snipe 567e19bcc0 Added missing case for licenses for item_count 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-27 16:26:50 -07:00
akemidx 67a2b796a4 requested edits 2023-04-27 19:19:53 -04:00
akemidx d94bed3f57 push for testing 2023-04-27 18:58:59 -04:00
snipe e25dc42121 Switch to externalLinkFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:42:34 -07:00
snipe deff312381 Remove auto-link from from manufacturer warranty 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:16:23 -07:00
snipe 7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
akemidx 497d17835f requested edits 2023-04-26 17:06:08 -04:00
akemidx aab53cf683 remove regex, add in starts_with 2023-04-26 15:18:13 -04:00
snipe 8f0b823fb3 Applies #12868 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 23:39:32 -07:00
snipe 22d73f503a
Merge pull request #12756 from dboth/develop 
Fixed #8208, #8896, #8985 and #9789:  Currency issues when using non-english locales (resubmission)
 2023-04-25 22:32:13 -07:00
snipe 970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034 
Fixes sending webhook notifications for checkout and checkin
 2023-04-25 22:22:58 -07:00
snipe 17275cbeb8
Merge pull request #12905 from marcusmoore/fixes/checkout-via-artisan 
Fixes where clause operator in artisan checkout command
 2023-04-25 22:21:59 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe c8c6f879d4
Merge pull request #12912 from Godmartinz/ldap_location_sync 
added ldap_location to settings
 2023-04-25 21:54:28 -07:00
snipe 27477085fe Merge branch 'develop' into features/auto_add_to_fieldset 2023-04-25 21:31:50 -07:00
snipe 45f22e7561 Updated the sync to disassociate if all boxed are unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:31:23 -07:00
snipe 5759d2c948 Added a check to fail validation if the associated fieldsets are not value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:30:47 -07:00
snipe 15dc4e4779 Added fieldset sync 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:29:57 -07:00
snipe 5eeca937cb Added logic for syncing fieldset info 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:08:26 -07:00
snipe 662b7787a1 Updated redirect return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:07:50 -07:00
snipe 28d9cec1e3 Added auto_add_to_fieldsets to API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:48 -07:00
snipe 07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00
Brady Wetherington 3da5df0127 Change from a standard Eloquent mapping for ID to a custom setRead 2023-04-25 11:50:55 -07:00
Godfrey M 20d8ff2a4f removed a typo 2023-04-25 11:49:33 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
snipe 66ce02fc48 Added permission on restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:09:16 -07:00
snipe 6e7f0728fd Added more granular permissions on bulk actions for assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:06:45 -07:00
Marcus Moore b4f162f316
Fix operator in where clause 2023-04-24 17:26:06 -07:00
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
Marcus Moore 2aba8252f3
Ensure users editing themselves do not deactivate their account 2023-04-20 21:59:55 -07:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
Ivan Nieto Vivanco 747d6cfdb4 Change the flow of the condition using an early return 2023-04-20 10:37:26 -06:00
Ivan Nieto Vivanco ae53609b1b Declare variables only if license is found 2023-04-20 10:16:11 -06:00
Marcus Moore dd40798c43
Remove unneeded comments 2023-04-19 17:49:31 -07:00
Marcus Moore e92c1e7bea
Minor docblock update 2023-04-19 17:22:56 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Marcus Moore 144382e57a
Update docblock types 2023-04-19 12:31:12 -07:00
Marcus Moore 835f8876c4
Move notification sending into try catch block 2023-04-19 12:26:48 -07:00
Marcus Moore 15280c435e
Merge branch 'develop' into bug/sc-15034 2023-04-19 11:45:16 -07:00
Godfrey M bdd1045272 adds a checkout range for custom asset reports 2023-04-19 09:11:44 -07:00
snipe fd5cb32dd9 Honor the “update” flag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 16:34:47 -07:00
snipe 345662c5c2 Rearrange some of the user creation logic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 16:34:10 -07:00
snipe aedfef78d3
Update app/Importer/LocationImporter.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2023-04-18 13:26:23 -07:00
Marcus Moore 508660b1df
Skip notifications for component checkouts and checkins 2023-04-18 13:07:55 -07:00
snipe 3a808aa806 Updated method for available seat count 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:33 -07:00
snipe 41490f1e3a Use “name” instead of “license” for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:43:59 -07:00
snipe 9da36833be Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:43:44 -07:00
snipe dc6eb6f104 Throw a warning if there were no users affected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:07:17 -07:00
snipe a8a3ca3624 Use count on availSeats 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:06:42 -07:00
snipe e84ba0c7a0 Revert back to old method name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:06:32 -07:00
snipe f21d9c27e6 Use new translations for logs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:26 -07:00
snipe bfcbd9628a Refactored license controller with new counts 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:58 -07:00
snipe de78f8d41f Renamed/refactorered licenses method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:44 -07:00
snipe 6ab4314221 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:13 -07:00
snipe 087f0e596a Fixed has to where 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 22:44:05 -07:00
Marcus Moore 2d56675ade
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	database/factories/SettingFactory.php
 2023-04-17 17:22:55 -07:00
snipe 99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui 2023-04-17 14:54:30 -07:00
snipe b22cad9ced
Merge pull request #12855 from koelle25/fixes/last_component_checkout 
Allow checkout of available components down to zero stock (fixes #12854)
 2023-04-17 09:49:14 -07:00
snipe e0c53d8d09 Remove start/end dates form casts array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 09:33:31 -07:00
Kevin Köllmann 04f3c4bf69
Fixed #12854: Allow checkout of available components down to zero stock 2023-04-17 11:45:11 +02:00
snipe a83991041a Better placement for errors 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 16:08:06 -07:00
snipe 0afaaa4a6b Added autoassign_licenses option to create admin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:28:08 -07:00
snipe 16ab2bec06 Added sorting and searching on autoassign_licenses via user API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:27:39 -07:00
snipe 4b66ca6ac5 Added method to bulk checkin (much simpler than checking out) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:27:15 -07:00
snipe 844ad83431 Added method to bulk checkout license seats 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:26:59 -07:00
snipe 9833d861d4 Added autoassign_licenses tp bulk users conditional 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:26:33 -07:00
snipe 03cc55cb6a Set autoassign_licenses to false if unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:52 -07:00
snipe 6a94a2f515 Return true/false for autoassign_licenses in the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:26 -07:00
snipe f40bef8f9b Added autoassign_licenses to user importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:25:08 -07:00
snipe 6acce098c9 Added autoassign_licenses on user model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:56 -07:00
snipe 73cf62e060 Added autoassign_licenses to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:24:00 -07:00
snipe 79ff6a8fc2 Disallow deleting in the API view if there are things checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:23 -07:00
snipe 8183b8deba Added stub method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:02 -07:00
snipe 144a6f28ec Added intval 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 08:54:23 -07:00
snipe 64256351d8 Used a singleton to filter API limit value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 08:46:39 -07:00
snipe 78ec21acc4 Added location case 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:49 -07:00
snipe 5a1d03c1dc Added alias maps 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:42 -07:00
snipe a831a34594 New field mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:26 -07:00
snipe bcf9188dcd Made default password longer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:19 -07:00
snipe c149885ceb Skip the magical user creation if it’s a location 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:47:04 -07:00
snipe 1509672463 Added location importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:36 -07:00
snipe bceb0b8a47 Allowed slightly longer zip codes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 07:46:29 -07:00
snipe 955539807c
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components 
Added supplier to components and consumables
 2023-04-15 18:42:23 -07:00
snipe fc7f1f907d Fixed variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 17:37:25 -07:00
snipe 4cbb9c2409 Use abs() instead of max 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 17:28:25 -07:00
Godfrey M ab67d903b5 adds multi select to custom report for companies 2023-04-13 12:02:11 -07:00
snipe 2fe7fcecdb Added case switch for sorting on suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:13:45 -07:00
snipe d2b3e251ad Added counters to API controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:12:16 -07:00
snipe 07c0a1927b Added supplier id to controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:12:01 -07:00
snipe ab7c75232b Added supplier to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:51 -07:00
snipe 6e183f2ced Added counters for consumables and components 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:32 -07:00
snipe 6097d534e9 Added eloquent model relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:10:16 -07:00
snipe 3aac8bccd2 Added presenters for suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:09:59 -07:00
snipe 112a04b108 Better handle weird data passed to the API via limit and offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 11:28:46 -07:00
snipe 74babfa081 Added maxlength="10" 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:26:36 -07:00
snipe 04f83d34ff Added withInput to carry over older fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:25:03 -07:00
snipe d3d464e179 Improved commenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 04:36:05 -07:00
snipe afd01869a5 Check for Carbon exception 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-11 23:35:41 -07:00
snipe 70ce0d9ee6 Maintain activated state on editing a user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-09 14:06:29 -07:00
snipe baf267e2e9 Small cleanups 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-07 09:45:16 -07:00
snipe cb76815e8b Removed if check on assets, since that’s already handled via validation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-07 09:42:31 -07:00
snipe 4c88c751ef Code cleanup, better validation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:03:40 -07:00
snipe 0abb993600 General cleanup and standardization for component API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:02:57 -07:00
snipe 4840046f44 Check for available quantity on consumables before checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 20:38:02 -07:00
snipe ffdc0d76f7 Fixed accessories verifying that enough remain to be checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 18:40:29 -07:00
snipe 383d48fd9c
Merge pull request #12787 from Godmartinz/accessory_unavailable_message 
Added unavailable message to prevent over-checkout of Accessories
 2023-04-06 15:05:18 -07:00
snipe bd4757ad7a
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css 
Move from iCheck to pure CSS for radio and checkboxes
 2023-04-06 14:58:33 -07:00
Godfrey M 3d7c55deb3 removed an unncessary query 2023-04-06 13:06:05 -07:00
Godfrey M 55943d8897 uses numRemaining now 2023-04-06 10:05:17 -07:00
snipe 161999fbca Fixed #12772 - use the APP_URL config more consistently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:05:40 -07:00
snipe 752365aa85 Updated support URL 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 14:54:40 -07:00
snipe 9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css 2023-04-05 13:04:12 -07:00
Marcus Moore 3054d633b0
Improve comments and remove unused imports 2023-04-05 12:39:41 -07:00
Marcus Moore 3cc3662992
Send webhook notifications for accessory checkins when enabled 2023-04-05 12:36:24 -07:00
Marcus Moore 6df8f0f35c
Merge branch 'develop' into bug/sc-15034 2023-04-05 11:49:53 -07:00
Godfrey M b038fe8f2e adds unavailable message to overcheckout 2023-04-05 10:00:39 -07:00
snipe ead5293ee0
Merge pull request #12765 from spencerrlongg/chore/sc-20230 
Change protected $dates to casts
 2023-04-04 01:29:24 -07:00
snipe 8b315a6502 Updated contrller to use trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 18:55:09 -07:00
Marcus Moore 621d8500eb
Merge branch 'develop' into bug/sc-15034 2023-03-30 16:17:42 -07:00
snipe cfef9d8cca
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null 
Fixed Call to a Member Function Licenses() on null [sc-20606]
 2023-03-30 14:20:13 -07:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304 
Bulk Restore from Deleted
 2023-03-30 12:37:50 -07:00
slong753 0f72554a9f translations for messages 2023-03-30 13:57:18 -05:00
slong753 382d849ee1 added catch for no assets selected 2023-03-30 13:52:29 -05:00
slong753 8c1c0e81b6 rm deplicates 2023-03-30 13:31:58 -05:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix 
Fixes potential unwanted overwrites in asset imports
 2023-03-30 09:40:58 -07:00
slong753 e126a75f7a pretty sure this was it 2023-03-29 21:37:26 -05:00
Ivan Nieto Vivanco d10b7fd6af Use firstorfail on eloquent query to return error if asset is not found 2023-03-29 19:11:28 -06:00
Marcus Moore 0998c70a92
Remove unneeded import 2023-03-29 16:59:26 -07:00
Marcus Moore 9f8b8f6cc1
Remove unneeded variable 2023-03-29 16:58:55 -07:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753 162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
Marcus Moore 4cbe683a1a
Explicitly cast asset tag to string when querying 2023-03-29 11:28:04 -07:00
Dominik Both 3271c9dc9f Fix #8208, #8896, #8985, #9789 2023-03-29 09:56:34 +02:00
snipe c9d1274edc
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found 
Fixes/lang for group not found
 2023-03-28 16:45:22 -07:00
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -07:00
Ivan Nieto Vivanco 77d513f80b Assign target variable as the other checkout types 2023-03-28 17:25:57 -06:00