80b7ebd508
Moved adminuser method to the SnipeModel
2026-03-27 19:20:54 +00:00
0fe753b7da
Added % bars to accessories, licenses, etc
2026-03-23 10:41:48 +00:00
53c090fd6c
First stab
2026-03-19 17:13:24 +00:00
9623fa4d87
Use pint on models directory
2026-03-13 15:55:28 +00:00
27ece84d52
Adds withTrashed() to adminuser and updates presenter to show strikethrough
2026-02-23 10:49:44 +00:00
c9f41c950a
Added copy+paste, added additional fields
2026-02-18 15:57:40 +00:00
5e9e0b70db
Fixes #18377 - make min value for names consistent
2026-01-05 12:51:49 +00:00
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
b7193a06fd
Normalize advanced search
2025-10-08 20:51:35 +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
14b829aa30
add total cost to components and consumables
2025-09-16 10:37:32 -07:00
74b98083e2
Override the getEula() method at the SnipeModel level
2025-09-15 20:05:35 +01: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
3b243b38c8
Fixed #9965 - fallback to category images (f there are any) when no consumable image is present
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-15 15:03:09 +02:00
95f867b267
Code formatting fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-09 21:48:53 +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
4e06b597fe
Handle category missing in Consumable
2025-06-10 10:43:02 -07:00
43c15ef134
Merge branch 'develop' into feature/locations_with_companies
2025-04-08 09:18:48 +01:00
2d9be4e9e0
Added supplier_id as fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:10:25 +01:00
4e0bcac1a1
Furhter validation for scoped locations
...
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2025-01-24 11:12:11 +01:00
cae8aa7840
Added maxlengths to additional fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 14:02:54 +01:00
02a29c71ef
Added created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:01:48 +01:00
1582d81e5b
Change user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 22:16:41 +01:00
7d9a0eba04
Added ability to sort on qty and remaining for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-09 03:49:58 +01:00
42dbc894e0
Better handle numRemaining for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:21:45 +01:00
2353c8199c
Set qty mutators
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 15:25:22 +00:00
6097d534e9
Added eloquent model relationships
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:10:16 -07:00
3c4f254583
Enforce Y-m-d as date format for date fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-24 13:38:53 -08:00
25f69a7bd2
Added consumable methods for uploads
...
Signed-off-by: snipe <snipe@snipe.net >
2022-11-01 17:52:28 -07:00
9cf5f30c77
Set safeMode to true and use helper for all parsedown
...
Signed-off-by: snipe <snipe@snipe.net >
2022-08-29 11:26:47 -07:00
728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop
...
Fixes Accessories total quantity shows a negative number for develop branch
2022-06-08 10:53:57 -07:00
2c1f368828
adds validation for all purchase costs variables
2022-05-10 16:26:06 -07:00
570dd09dcd
Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out
2022-03-15 17:52:19 -06:00
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
ac8a7d0bc9
Made notes field fillable and searchable
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-03 20:29:48 -08:00
f2f8f96991
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
2021-11-15 19:24:38 -08:00
76cc46c419
Merge pull request #9814 from 01ste02/importMinAmt
...
Improved Consumable Import: Import min_amt for consumables
2021-10-28 17:49:44 -07:00
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
9687bcb41c
Fixed issue where consumables model number was not searchable
...
Signed-off-by: snipe <snipe@snipe.net >
2021-08-20 17:30:35 -07:00
5b5874499d
Added import for min_amt for consumables
2021-07-12 11:46:19 +02:00
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
9f43ce97e9
Convert deprecated $dates property to $casts
2021-06-10 20:17:18 +00:00
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
fa5134603f
Added type casting and a few more validation rules
...
Signed-off-by: snipe <snipe@snipe.net >
2020-04-22 06:37:40 -07:00
