3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-21 03:55:45 +00:00
Commit Graph

111 Commits

Author SHA1 Message Date
1258eb6533 Merge pull request #17913 from Godmartinz/add_types_to_unaccepted_asset_report
Fixed #15664 - Adds Accessories, Components, Consumables, and Licenses to Unaccepted Assets report
2025-11-10 12:24:13 +00:00
9e68497b63 Moved Traits into directory and modify the users to point to them 2025-10-21 16:45:58 +01:00
bc60d796a3 Fixed RB-20329 - ambiguous clause on deleted_at 2025-10-08 15:28:48 +01:00
4934dc85ac Reverse expires diff direction 2025-10-03 16:00:58 +01:00
1cd9fc47aa Use diff_in_days instead 2025-10-03 15:03:14 +01:00
dfd05e8b5b Refactored scope 2025-10-03 14:13:58 +01:00
3daa6dd051 Added accessors for termination date 2025-10-03 14:13:28 +01:00
fea0189479 Merge branch 'fix-factory-auto-gen-action-logs' into add_types_to_unaccepted_asset_report 2025-09-24 15:43:27 -07:00
0ce20c1edd fix send reminder method to handle other types 2025-09-23 18:40:03 -07:00
33a4c88c3a Added table to deleted_at clauses to resolve ambiguity 2025-09-17 11:44:28 +01:00
74b98083e2 Override the getEula() method at the SnipeModel level 2025-09-15 20:05:35 +01:00
7062962cc8 Show warnings on the dates if expired or terminated 2025-09-15 13:43:08 +01:00
58cda5ae6d Added scopes 2025-09-15 13:22:25 +01:00
13c0d335d3 Refactor alert query 2025-09-12 17:36:51 +01:00
6799c41d65 fixed typo 2025-09-11 10:23:53 -07:00
80c059be58 Skip terminated licenses in alert 2025-09-11 13:14:53 +01:00
e796c0da4a disallows checkout of expired or terminated licenses 2025-09-10 12:08:14 -07:00
db9f85e9da Merge branch 'develop' into checkin_non_reassignable_license
# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php
2025-09-03 11:09:51 -07:00
b06c58fe7b Switch to older style rules for consistency
Signed-off-by: snipe <snipe@snipe.net>
2025-09-03 15:06:27 +01:00
f5c8b3eb04 Fixed #17791 - increase size of purchase cost field
Signed-off-by: snipe <snipe@snipe.net>
2025-09-03 15:03:49 +01:00
7b5d90dd81 Moved model traits into proper directory
Signed-off-by: snipe <snipe@snipe.net>
2025-08-28 18:23:26 +01:00
95f867b267 Code formatting fixes
Signed-off-by: snipe <snipe@snipe.net>
2025-07-09 21:48:53 +01:00
58676b1f83 Fixed #8484 - added supplier to license relationship
Signed-off-by: snipe <snipe@snipe.net>
2025-06-30 11:27:30 +01:00
cd989768d4 Added HasUploads trait and remove uploads method for models
Signed-off-by: snipe <snipe@snipe.net>
2025-06-27 19:32:22 +01:00
de4764bd05 Limit changing of asset seat count to no more than 10k at a time 2025-06-24 13:53:11 +01:00
34e8360b10 moves counts to licenses, allows bulk check in of unreassignable licenses 2025-01-22 10:46:28 -08:00
2143952a1e removed unused models, castged unreassignable_seat, clean up in general 2025-01-21 11:43:47 -08:00
d217c2e295 last rename 2025-01-16 12:24:32 -08:00
52bf0faaa5 renamed unassignable to reassignable_seat 2025-01-16 12:19:59 -08:00
f050864fb4 renamed dead to unassigned, replaced 0 and 1 with true and flase 2025-01-16 12:12:14 -08:00
db11fc35f4 fixed typo, fixed variable name 2025-01-16 12:00:49 -08:00
7a23372489 adds migration for column unavailable, changes logic to utlize value 2025-01-15 15:36:12 -08:00
5e1562ae4c adds count on tabs and reports and index 2025-01-13 14:31:54 -08:00
69e74bbdd3 Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php

PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219

This simple fix switches the offending statements to {$var} syntax.
2024-10-30 19:43:54 -07:00
822ea96dfd Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:31:46 +01:00
354b00ef15 Made method name consistent
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 16:45:51 +01:00
7650628d30 Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 16:00:59 +01:00
1582d81e5b Change user_id to created_by
Signed-off-by: snipe <snipe@snipe.net>
2024-09-17 22:16:41 +01:00
57f6ecb1da Added created_by to license view
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 10:24:13 +01:00
63f0b5279d Added check for purchase_date
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 20:13:01 +01:00
fb233c0aa4 Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
4ab7112988 Added validation and fillable attributes for min_amt
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 11:08:47 +00:00
f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
5779a63221 Undoing that thing I just did :(
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:28:57 +00:00
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
b98c1a0627 fixes getExpiringLicenses query 2023-10-18 13:25:34 -07:00
1509c512a5 Add guard clauses around some License and LicenseSeat models functions 2023-09-06 11:54:11 -06:00