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

1171 commits

Author SHA1 Message Date
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 2226bd2cd7 Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 14:03:55 +00:00
snipe 7aabf94a35 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:43:38 +00:00
snipe 40052e99a7 Added user agent to log method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:39 +00:00
snipe 70303c2b2d Added searchable fields, improved formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:25 +00:00
snipe aa4aaf69b0 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-08 08:58:45 +00:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 133c469e36 organization 2023-11-30 14:25:58 -06:00
spencerrlongg 7e780c1187 cleanup rules formatting 2023-11-30 12:20:02 -06:00
spencerrlongg df954a3af2 return types 2023-11-30 12:06:58 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
snipe 3152df2c48 Created mutator for requestable attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-29 10:07:47 +00:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg cba5f869c0 standardize some of the validation rules, fix int/string issue 2023-11-28 21:19:19 -06:00
spencerrlongg 4aae82fa38 cleanup validation rules a little 2023-11-28 17:28:17 -06:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
snipe 9d786d9386 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:43:33 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
Brady Wetherington 8916c976e1 Merge branch 'develop' into scim_active_flag 2023-11-23 16:36:17 +00:00
Brady Wetherington 7b12d511f8 Force active flag to be returned as true or false 2023-11-23 16:34:03 +00:00
snipe 19877244cd Added/refactorerd isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:03:26 +00:00
snipe 2353c8199c Set qty mutators 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 15:25:22 +00:00
snipe d6a337a584 English hard 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:23:17 +00:00
snipe 83ee07cca1 Created mutator on category checkin_email 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:14:04 +00:00
snipe 4eb435e148 Use unique_undeleted instead of unique_serial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 12:36:11 +00:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
spencerrlongg c9604b896a nevermind 2023-11-01 13:46:32 -05:00
spencerrlongg d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg d4b9f6a2a4 add not_array (not ready, doesn't catch for specific exception) 2023-10-31 21:00:22 -05:00
snipe e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
Ivan Nieto Vivanco 9f9f8c173b Add condition to only run trough custom fields if a custom fieldset exist 2023-10-31 10:00:36 -06:00
snipe 5779a63221 Undoing that thing I just did :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:28:57 +00:00
snipe 9fc1cbd7ae Change cast to include format 
https://laravel.com/docs/8.x/eloquent-mutators#date-casting - this doesn’t seem to work tho?
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:24:48 +00:00
snipe d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add 
adds employee number as a searchable field to the asset table
 2023-10-25 21:04:54 +01:00
Godfrey M 1b614c13fb ugh 2023-10-25 13:03:42 -07:00
Godfrey M 56fd41eee4 removed erroneous code 2023-10-25 13:03:12 -07:00
Godfrey M 33b45898b1 adds to advancedsearch 2023-10-25 12:59:58 -07:00
snipe 8b9b46c562 Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:41:59 +01:00
snipe 307f84dff8 Removed extraneous method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 19:41:53 +01:00
snipe e5bd78a722 Added show_in_requestable_list validation, casting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:28:35 +01:00
snipe 08693f09b0 Added requests() method on Assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-25 17:22:12 +01:00
spencerrlongg 38de69b3da new validation rule 2023-10-18 12:41:24 -05:00
spencerrlongg 388e4c10c4 catch custom fields that are arrays 2023-10-17 19:03:58 -05:00
Ivan Nieto Vivanco 74ed32903f Adds condition to check if parameter is of the proper type 2023-10-17 15:48:51 -06:00
spencerrlongg 277608d962 this seems to work 2023-10-17 13:30:51 -05:00
snipe 93cccf4f5f Handle case where value is deleted in history 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 19:32:09 +01:00
Marcus Moore e82fec2a5f Grammar fix 2023-10-02 16:19:20 -07:00
Marcus Moore db4c86a4f4 Filter null field options before attempting to process them 2023-10-02 16:14:20 -07:00
Marcus Moore 724c054838 Log non-compliant barcode error as debug message 2023-10-02 12:06:24 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
snipe 0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778 
Fixed uncaught type error when attempting to render barcodes with invalid characters
 2023-09-29 01:50:07 +01:00
Marcus Moore bed1055c4e Catch TypeError when rendering 1d barcode 2023-09-28 17:32:16 -07:00
Marcus Moore 3aa256ec02 Ensure non-checked out items can be displayed 2023-09-28 12:33:20 -07:00
Marcus Moore 4675f02349 Format assigned to field 2023-09-28 11:35:20 -07:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
spencerrlongg c48a47936c add validation back in 2023-09-20 14:00:59 -05:00
spencerrlongg 6b4f8f1813 rm duplicate fillable 2023-09-19 18:07:15 -05:00
spencerrlongg 929e107a20 rm byod from casts 2023-09-19 18:04:16 -05:00
snipe 2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled 
Fixed #13336 - Save unhashed password if no password provided
 2023-09-14 14:15:53 +01:00
snipe dcae5503c8 Use $attributes array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 13:52:57 +01:00
snipe d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping 
Added `CompanyableTrait` to `Department` model
 2023-09-14 12:52:53 +01:00
spencerrlongg 7047869367 cleanup 2023-09-12 18:03:13 -05:00
spencerrlongg fb001caee4 fix conflicts 2023-09-11 17:33:31 -05:00
slong753 75d7e3e1a0 fix conflicts 2023-09-11 17:20:21 -05:00
slong753 774f21bb7f some more cleanup 2023-09-11 17:17:59 -05:00
slong753 20367eecc9 fix conflicts 2023-09-11 17:17:59 -05:00
slong753 c1daabef08 progress 2023-09-11 17:10:41 -05:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
Ivan Nieto Vivanco 1509c512a5 Add guard clauses around some License and LicenseSeat models functions 2023-09-06 11:54:11 -06:00
johnson-yi 5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog 2023-09-06 00:36:48 +00:00
snipe d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog 
Added/Fixed: track changes on asset checkin/out
 2023-09-05 19:08:49 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
Johnson Yi 09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
snipe 663faffcc1 Un-cast byod, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 19:13:55 +01:00
snipe 2a93c38830 Don’t cast as boolean, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 16:40:28 +01:00
snipe 18ff810d7e Reverse orderof parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:51:52 +01:00
snipe baffcbad71 Set password property properly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:47:56 +01:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue 
Fixed #13317 Accessories declined by user remain assigned
 2023-08-22 12:42:55 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
snipe 354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
Marcus Moore 489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
snipe 45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe 0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00
Ivan Nieto Vivanco b607a59875 Add query to search default locations in advanced search 2023-08-16 15:04:17 -06:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Ivan Nieto Vivanco 96440834bd Move the declinedCheckout function so it don/'t separate the class properties 2023-08-14 16:16:28 -06:00
Ivan Nieto Vivanco 4796598bb6 Add declinedCheckout method to Accessory model 2023-08-14 14:35:31 -06:00
Robert-Azelis bbb8ecfee4
Update Company.php 2023-08-13 17:21:55 +02:00
Marcus Moore f7b2075e9e
Add CompanyableTrait to Department 2023-08-07 16:54:02 -07:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe 540b09c506 Possible alternative to fixing #13296 - custom report failing when the model is busted 
Related: https://github.com/snipe/snipe-it/pull/13297
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 17:45:45 +01:00
snipe 1e09320ebe Check that $this->get_depreciation() returns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-20 16:30:07 +01:00
snipe b54e7dc3ee Fixed #13336 - Save unhashed password if no password provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 17:44:40 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags 
Better auto increment asset-tags [FD-32892]
 2023-07-13 09:49:44 +01:00
Brady Wetherington 76191a09ed Improvements to asset_tag auto-incrementing, with auto-fixups for gaps 2023-07-12 16:39:45 +01:00
snipe ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations 
Added phone, fax to departments, locations, companies
 2023-07-11 11:15:13 +01:00
Ivan Nieto Vivanco ec8cb1b09e Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash 2023-07-10 16:34:00 -06:00
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
snipe bcefe73c9c Use proper alias for table scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 16:52:09 +01:00
snipe a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset 
Cancel requested assets without checkin/out [ch-17606]
 2023-06-29 16:18:13 +01:00
Ivan Nieto Vivanco eb4d764601 Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want 2023-06-27 17:13:11 -06:00
slong753 2a352619f7 clean up 2023-06-26 16:25:48 -05:00
Godfrey M 114d946437 adds half_year fix from jdickerson71388 2023-06-26 11:26:46 -07:00
snipe 4f7b2836b5 Set table alias for model number sort scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-26 08:27:17 +01:00
Spencer Long f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields 2023-06-22 18:00:31 -05:00
Ivan Nieto Vivanco f9a20bc917 Replace join with left join in pertinent eloquent query 2023-06-01 12:08:51 -06:00
snipe e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value 
Fixed #12978 Custom Field Checkboxes not holding assigned values
 2023-05-31 10:55:37 -04:00
ak-piracha 1cdf089306 Fixes: issue #13073: deleted component addearing in asset component tab fixed 2023-05-31 00:11:11 +09:30
Ivan Nieto Vivanco f4947bfa93 Use trim() function when format the custom field values as array 2023-05-24 04:06:31 -06:00
Marcus Moore 0a3d46824e
Automatically add table prefixes when building multi-column search string 2023-05-23 15:58:58 -07:00
Marcus Moore b2b6f0cf96
Use new dynamic scope where possible 2023-05-23 13:38:50 -07:00
Marcus Moore 054d71aedc
Add docblock 2023-05-23 13:37:04 -07:00
Marcus Moore 9078d4c71c
Add dynamic scope for prettier multiple column search 2023-05-23 13:35:19 -07:00
Marcus Moore 05a2e568d7
Add comment 2023-05-23 11:37:09 -07:00
Marcus Moore f40e722397
Add docblock 2023-05-22 17:44:17 -07:00
Marcus Moore 9b512648a3
Update searchRelations in Searchable trait 2023-05-22 17:33:19 -07:00
Marcus Moore 64e83ed9f5
Update scopeAssignedSearch in Asset 2023-05-22 16:54:54 -07:00
Marcus Moore 2d86c8f030
Update advancedTextSearch methods in Asset and User models 2023-05-18 17:06:41 -07:00
Marcus Moore 85974c7f65
Apply formatting 2023-05-18 13:16:52 -07:00
Marcus Moore ffbde46180
Simplify sqlite query 2023-05-18 13:06:50 -07:00
Marcus Moore d8d672c4c1
Move multiple column search function to Searchable trait 2023-05-18 13:05:40 -07:00
Marcus Moore 9cb0decf35
Adapt multiple column search based on database driver 2023-05-18 12:54:00 -07: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 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 054a2ab9d4 Add validation and fillable fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:31 -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 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
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
Marcus Moore f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -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 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 aa814cf761 Fixed #12946 - warranty lookup url was not nullable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-29 13:47:52 -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 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