71 commits

Author	SHA1	Message	Date
snipe	001348c638	Unset required on checkout select :( ... Related to the discussion at #15552 Signed-off-by: snipe <snipe@snipe.net>	2024-09-29 14:33:42 +01:00
snipe	d545537a43	More icons ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:34:13 +01:00
snipe	4d8904938d	Added calendar icon for datepickers ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:24:26 +01:00
snipe	0c09f2b2c0	Moar icon replacement ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 18:13:49 +01:00
snipe	856c57cb12	Corrected some translations ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 12:39:59 +01:00
snipe	243ab51def	Fixed back button ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 10:40:48 +01:00
snipe	73a80a5fbc	Use blade component for redirect option ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-25 21:35:13 +01:00
snipe	eb9e276ba7	Fixed #15094 - wrong translation string for model on checkout ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-16 17:14:13 +01:00
snipe	427615f627	Fiest start at switching to regular html labels ... Signed-off-by: snipe <snipe@snipe.net>	2024-06-23 18:24:23 +01:00
snipe	a15ed6eaee	Wrap disabled <a> links in a span for tooltips ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 19:29:29 +01:00
snipe	b936591240	Warn and disable on checkout if model is invalid ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-31 18:47:34 +01:00
Godfrey M	b5553af8ed	rename variable	2024-05-21 10:11:53 -07:00
Godfrey M	4d6f4303f5	fixed partial up	2024-05-21 10:11:01 -07:00
Godfrey M	15cc4345ab	adds dynamic redirects to Assets	2024-05-14 13:25:52 -07:00
Godfrey M	c94a7613ca	dropdown redirect options, helper function and session variable added	2024-05-02 12:16:20 -07:00
Marcus Moore	fe6295a5e4	Update slack_* properties to webhook_*	2023-03-22 14:43:00 -07:00
snipe	eb6357636a	Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies ... Fix full company scoping in user selects	2023-02-23 10:36:33 -08:00
Marcus Moore	aae2106658	Use existing language translation string	2023-02-22 12:02:14 -08:00
Marcus Moore	45e8e9bbed	Move company name to better location	2023-02-06 12:21:09 -08:00
Marcus Moore	78343ddb7c	Add asset's company name to checkout page	2023-02-06 10:58:10 -08:00
akemidx	214a1af61a	apostrophe updates	2023-01-30 16:54:23 -05:00
akemidx	79d9cff22a	translations added for the hardware blades	2023-01-26 16:26:31 -05:00
snipe	9d93c72534	Use BS datepicker’s built in clear button ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-26 14:34:35 -07:00
Wächtler, Yannick	c16ade2d87	Added localized strings for hardware	2021-11-02 14:02:48 +01:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	e03d7b7016	More fa icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 13:07:02 -07:00
snipe	985193ffff	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
Lucas Pleß	f3a7467235	Added today as default Date for checkout Form. (#8938)	2021-01-26 12:06:58 -08:00
snipe	05e9861b71	Checkin/checkout fixes	2020-04-21 11:28:31 -07:00
snipe	cb71bcc4af	Switch to old() helper	2020-04-21 03:58:31 -07: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	9ab3370be5	Hide icons in error messages	2020-04-01 03:21:15 -07:00
snipe	7718abaa72	Added aria-hidden	2020-04-01 01:26:44 -07:00
snipe	c3d2e8ff26	Added aria-hidden to inline form error text	2020-04-01 00:18:20 -07:00
snipe	c6c75cc11f	Fixed missing </h3 tags	2020-03-31 23:36:56 -07:00
snipe	bde45cbb34	Fixed h3 to h2 for semantic header levels	2020-03-31 21:30:24 -07:00
snipe	296de34e8a	WIP: Upgrade develop to Laravel 6.6.1 (#7637) ... I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials	2019-12-10 19:32:50 -08:00
snipe	88fb1370f0	Added slightly friendlier error handling for assets without models ... This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.	2019-12-06 18:17:03 -08:00
snipe	6b6cf06530	Display asset name if one exists and the user cannot edit	2018-10-15 17:02:31 -07:00
snipe	539c3023b9	Added - check whether the user can edit an asset before allowing them to change the name on checkout	2018-10-15 16:52:45 -07:00
snipe	15916e6668	Allow checkout to non-user objects even if the object requires checkout	2018-05-21 17:35:04 -07:00
snipe	46f5f21368	Notification improvements (#5254) ... * Added “show fields in email” to custom fields * Added “show images in email” to settings * Added nicer HTML emails * Break notifications out into their own, instead of trying to mash them all together * Remove old notification for accessory checkout * Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you” * Add method for image url for accessories * Added accessory checkout email blade * Make accessory email notification on checkout screen consistent with assets * Added native consumables notifications * Fixes for asset notification * Updated notification blades with correct-er fields * Updated notifications * License checkin notification - does not work yet Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target * Added alternate “cc” email for admins * Only try to trigger notifications if the target is a user * Fix tests * Fixed consumable URL * Removed unused notification * Pass target type in params * Show slack status * Pass additional parameters There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck. * Pass a variable to the notification to supress the duplicate slack message * Slack is broken :( Trying to fix Will try a git bisect * Put preview back into checkout * Pulled old archaic mail * Removed debugging * Fixed wrong email title * Fixed slack endpoint not firing * Poobot, we hardly knew ye. * Removed old, manual mail from API * Typo :-/ * Code cleanup * Use defined formatted date in JSON * Use static properties for checkin/checkout notifiers for cleaner code * Removed debugging * Use date formatter * Fixed target_type * Fixed language in consumable email	2018-03-25 13:46:57 -07:00
snipe	22c4d79cfb	Fixed #4345 - Disallow future date for checkin date, disallow past date for expected checkin	2017-12-01 17:52:56 -08:00
snipe	980be65193	Added ability to turn items on/off in checkout-selector	2017-11-22 07:07:18 -08:00
snipe	4696e799ed	Fixes #4491 and #4483 - handle pre-selected asset on checkout, better checkout-to selection UI (#4501) ... * Added form checkout selector partial * Stupid stash * Added radio button checkout selector javascript * New compiled production assets * Added $style override in form partials for select2 ajax lists * Added checkout-to radio button selector TODO: Fix for accessibility - currently cannot tab-select this radio button * Added new checkout-to selector to hardware edit * Added new checkout-to selector to asset checkout form * Refactored postCheckout to use radio button submission This defaults to user checkout if nothing is passed for some reason * Better visual feedback on whether or not an asset is deployable in edit screen	2017-11-21 15:58:31 -08:00
snipe	4bb546a882	Pull assigned asets preview into its own blade for re-use	2017-10-31 04:47:59 -07:00
snipe	cfd1925625	Nicer display of notifications on checkout	2017-10-28 01:00:26 -07:00
snipe	ea07517ad5	Added more ajax select2 boxes to checkouts, remove helper ->with() methods	2017-10-26 03:43:28 -07:00
snipe	82690e1fd7	Integrate ajax select2 menus in all asset checkouts	2017-10-26 02:28:17 -07:00
snipe	17d58d9cc5	Added snazzy rich user selection menu ... TODO: - Abstract this out so it can be used by other select2 menus - Write a select2 transformer to standardize output	2017-10-24 19:24:35 -07:00