72 commits

Author	SHA1	Message	Date
snipe	4363e8b34c	Updated importer ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:20:42 +01:00
snipe	1582d81e5b	Change user_id to created_by ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-17 22:16:41 +01:00
snipe	3ae4a5caf0	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 22:53:27 +01:00
snipe	7658f7c41d	First shot ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 20:29:53 +01:00
snipe	793cf27318	Fixed use statement ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-19 22:50:24 +01:00
snipe	ae9085b11f	Modernize use statements, switch to auth() ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-04 20:49:22 +01:00
snipe	45dbe5cb77	Return the id, not the entire status label ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 15:05:38 +01:00
snipe	a1ff35f6ce	Possible fix for #14915 ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-20 14:47:46 +01:00
snipe	71c9b03779	Fixed incorrect field name ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-19 11:05:22 +01:00
snipe	52950f1322	Refactored date parsing ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	0ee2b74ff3	Added date parsers for new date fields ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	4ccbfb56a4	Make sure the status label is deployable ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-05 10:28:35 +01:00
snipe	fb233c0aa4	Cleaned up facade names and references ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 12:38:15 +01:00
spencerrlongg	3574ef5bb9	a few more imports, component sample	2024-01-25 19:54:53 -06:00
spencerrlongg	4a7df470f0	this works	2024-01-25 19:34:41 -06:00
spencerrlongg	c9101f4d97	initial work, not working yet	2024-01-25 18:18:24 -06:00
Ivan Nieto Vivanco	7d30001ff8	Ignore the importer checkout if user is not found	2023-11-08 15:32:33 -06:00
snipe	8e20071254	Merge pull request #13731 from snipe/improvements/trim_on_import ... Added trim to import values	2023-10-30 14:17:37 +00:00
Ivan Nieto Vivanco	ca1845efd7	Only log checkin event if the assigned_to property is not empty	2023-10-25 16:41:31 -06:00
Ivan Nieto Vivanco	7ed58a177b	Evaluate if the asset was assigned to a different user than current target to log a checkin event	2023-10-25 16:31:23 -06:00
snipe	758d3aadb4	Added trim to import values ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-10 11:52:35 +01:00
spencerrlongg	3e3bb594ea	some import stuff	2023-09-11 17:34:04 -05:00
spencerrlongg	3fb62874f0	quick push to check something else	2023-09-11 17:22:46 -05:00
spencerrlongg	c66804bcee	a little cleanup	2023-09-11 17:22:46 -05:00
slong753	27bea2abb9	just some more wip on the importer	2023-09-11 17:21:51 -05:00
slong753	78c400e948	fix conflicts	2023-09-11 17:21:50 -05:00
slong753	41b65bd9a2	small changes	2023-09-11 17:15:25 -05:00
slong753	17a83129b9	this all needs to be tested tediously	2023-09-11 17:15:25 -05:00
Ivan Nieto Vivanco	67e47a7d8b	Add guard clause to obtain the default ID of imported asset's status label	2023-06-22 13:53:58 -06:00
snipe	47fa490e8a	More translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-23 19:28:23 -07:00
snipe	61d5bd8567	Removed comment ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-23 14:57:15 -07:00
snipe	3296716dfa	Added EOL date to importer ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-16 19:06:35 -07:00
Marcus Moore	4cbe683a1a	Explicitly cast asset tag to string when querying	2023-03-29 11:28:04 -07:00
Marcus Moore	c80595e05c	Ensure asset name is maintained when importing assets that are checked out	2023-03-07 11:09:25 -08:00
snipe	a34cb8b862	Check for boolean on requestable ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 17:11:08 -08:00
snipe	304ccaa30e	Added byod to asset importer ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 14:28:24 -08:00
Ivan Nieto Vivanco	9f0ecba9b9	Add autoincrementing asset tags to the import if the CSV column is empty	2022-08-03 12:48:48 -05:00
Ivan Nieto Vivanco	52901f50eb	Add date to checkout action when importing assets	2022-05-19 17:38:10 -05:00
Ivan Nieto Vivanco	cdc0805fc4	Sanitize dates input in the importer before saving	2022-03-10 12:07:07 -06:00
snipe	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
Ivan Nieto Vivanco	64fa7e23fc	Separate notes on assets and asset models	2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco	577dc6b02c	Separate notes on assets and asset models	2022-02-24 15:50:59 -06:00
Ivan Nieto Vivanco	949fe2a14a	Adds last_audit_date and next_audit_date in the asset importer	2022-01-13 15:14:20 -06:00
Laravel Shift	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
Ivan Nieto Vivanco	90a24539b0	Fixes/cli importer issue (#9199) ... * Added logic to handle the CLI importer. * Fix bug introduced with the commit previous to the regression. * Adds a validation for variable when is null, add comments to clarify where the class variable came from. * Add support for when variable is an instance of User class.	2021-04-05 19:28:31 -07:00
snipe	5754f0aa3f	Revert "Added logic to handle the CLI importer. (#9088)" ... This reverts commit 2e2d087639.	2021-02-18 14:21:19 -08:00
Ivan Nieto	2e2d087639	Added logic to handle the CLI importer. (#9088)	2021-02-17 13:13:17 -08:00
snipe	87464e6ec0	Merge branch 'develop' into integrations/2020-04-15-v5-merge ... # Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js	2020-04-20 23:20:34 -07:00
snipe	192917cc84	Slightly better fix for requestable import bug	2020-02-10 17:34:32 -08:00
snipe	81880645ed	Possible requestable fix	2020-02-10 11:40:39 -08:00