snipe
ef10f2e50e
Use more correct route in redirect
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:38 +00:00
snipe
08153d418f
Use new alert box and linked string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:18 +00:00
snipe
bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922
...
New Translation Strings for Custom Asset Export
2023-11-08 08:57:20 +00:00
snipe
44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932
...
Fixed notes not saving to action log when licenses are checked in/out
2023-11-08 08:53:00 +00:00
Marcus Moore
a08e0bd547
Ensure notes are saved to the action log when licenses are checked in and out
2023-11-06 12:20:13 -08:00
snipe
7a638e4a65
RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-03 14:06:27 +00:00
Godfrey M
3b6a0d6525
allows multi location sync for ldap
2023-11-02 16:50:19 -07:00
spencerrlongg
3f834cb88f
authorization tested in request
2023-11-01 11:43:53 -05:00
spencerrlongg
8f75bb8706
fix translation strings
2023-10-31 21:38:52 -05:00
spencerrlongg
b67b00dd82
this is a start, something up with asset_tag unique rule
2023-10-31 21:06:44 -05:00
snipe
f822f8b186
More graceful failure if ldap_results JSON decode isn’t set
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 17:09:18 +00:00
snipe
57372fc82a
Correctly call the validator in the response if it fails
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:30:38 +00:00
snipe
3495652827
Added checkboxes to intentionally remove field values in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:52:53 +00:00
snipe
96211cf73c
Add additional fields to Download All in Activity Report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 09:43:47 +00:00
spencerrlongg
90eb3b86cf
added user phone & address fields
2023-10-26 19:10:53 -05:00
spencerrlongg
f12d44509e
asset_eol_date should always be filled now
2023-10-26 14:39:02 -05:00
spencerrlongg
91b53bffa1
resolved
2023-10-26 14:23:31 -05:00
snipe
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
...
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
2023-10-26 15:56:47 +01:00
snipe
9bba0b764a
Added clearer comments
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:38:39 +01:00
snipe
64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
2023-10-26 13:36:18 +01:00
snipe
05de8a5731
Re-added missing break
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:21:27 +01:00
snipe
0cebccac95
Removed extra logging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 06:51:07 +01:00
snipe
2695576968
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:20 +01:00
snipe
f25ddee857
Removed debugging, use new model rules if model has changed
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:21:14 +01:00
snipe
541ba0c0ba
Removed conditional add for model_id
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:20:52 +01:00
snipe
b87879f8e7
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:35:53 +01:00
snipe
6ebc01ca50
Bulk edit refactor
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:23 +01:00
snipe
7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
...
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +01:00
snipe
da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
...
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
snipe
887d013a39
Added listable fields in profile -> requested assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:33 +01:00
snipe
63a86c5622
Added field to controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:27:36 +01:00
snipe
933ce61efd
Removed eager loading for defaultLoc, added requests loading, sorting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:26:51 +01:00
snipe
96f7f49b68
Fixed response docblock
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 16:40:49 +01:00
Robert-Azelis
bd195a6911
Update AssetsController.php
...
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
2023-10-22 18:11:19 +02:00
Robert-Azelis
58062ff9f5
Update AssetModelsController.php
...
if EOL of model has been changed and value is >0 assets will be updates with new EOL rate, date
if EOL of model has been changes and value is null or 0 then assets will be updates by null EOL rate, date
*asset with set expilicity market will not be updated
2023-10-22 17:56:38 +02:00
snipe
38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355
...
Fixed ErrorException: Array to String Conversion rb17355
2023-10-18 19:09:13 +01:00
spencerrlongg
38de69b3da
new validation rule
2023-10-18 12:41:24 -05:00
snipe
1be503b21a
Make sure order number is not an array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:36:16 +01:00
snipe
4d841dbc79
Use custom report validator
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:13:25 +01:00
spencerrlongg
f7bb911b99
clean up
2023-10-17 19:06:53 -05:00
spencerrlongg
388e4c10c4
catch custom fields that are arrays
2023-10-17 19:03:58 -05:00
snipe
3f6554ee34
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-16 23:23:43 +01:00
Marcus Moore
417f9c21e4
Fix the storing of group permissions when creating via API
2023-10-10 17:51:29 -07:00
snipe
f685ba01b6
Reversed order of find
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:43:14 +01:00
snipe
e3591dc756
Merge pull request #13728 from snipe/fixes/13725_for_dev
...
Fixes qty remaining requirements for component checkout via API
2023-10-09 16:34:40 +01:00
snipe
b9dc7f88d0
Fix qty requirements for Components API checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:32:30 +01:00
snipe
866bbe5e11
Removed extra debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:15:14 +01:00
snipe
6d55d78280
Set resend acceptance to POST
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:13:41 +01:00
snipe
e5f5802235
Added tighter controls for matching log ID and item_id
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 15:17:03 +01:00
snipe
cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
...
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
Godfrey M
c69958d95d
removed dead space
2023-10-03 12:32:24 -07:00
Godfrey M
92776adb93
remove unnecessary changes
2023-10-03 12:31:58 -07:00
Godfrey M
dee36fc294
adds component checkin to asset tab
2023-10-03 12:30:08 -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
41eccaeae0
Set dummy asset tag to value that is valid for EAN13
2023-09-28 17:31:45 -07:00
Marcus Moore
eb2edb7475
Add more default values for label preview
2023-09-28 13:40:51 -07:00
snipe
f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596
...
Fieldset Properly Sortable in Asset Models Table
2023-09-28 19:24:04 +01:00
spencerrlongg
a54fab5c33
add fieldset to allowed_columns
2023-09-28 13:02:12 -05:00
spencerrlongg
4d67c72eea
scope and switch case in api
2023-09-28 12:26:23 -05:00
snipe
6fa0d42bc2
Fixed bug where license checkout/checkin notes were not being saved
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:40:18 +01:00
Marcus Moore
a47e36c1e5
Add custom fields as options
2023-09-27 16:51:53 -07:00
snipe
279e6c7e4f
Check for null company ID
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 14:33:42 +01:00
spencerrlongg
4660a2e5b7
rm more duplicate
2023-09-20 14:37:32 -05:00
spencerrlongg
a9123754f5
remove unnecessary code
2023-09-20 14:34:42 -05:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
spencerrlongg
d65d1930e4
asset models
2023-09-19 19:24:53 -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
d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping
...
Added `CompanyableTrait` to `Department` model
2023-09-14 12:52:53 +01:00
snipe
b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature
...
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
2023-09-14 12:52:13 +01:00
spencerrlongg
70a251de55
fix up gui edit
2023-09-13 13:51:14 -05:00
spencerrlongg
e21a8b6717
fix up this file
2023-09-12 18:11:36 -05:00
Ivan Nieto Vivanco
9cbd2d032c
Add a boolean variable and condition to handle the call to checkedOutToUser() method
2023-09-11 17:40:59 -06:00
slong753
78c400e948
fix conflicts
2023-09-11 17:21:50 -05:00
slong753
75d7e3e1a0
fix conflicts
2023-09-11 17:20:21 -05:00
slong753
5948679a4a
fix purchase date update
2023-09-11 17:17:59 -05:00
slong753
774f21bb7f
some more cleanup
2023-09-11 17:17:59 -05:00
slong753
cda9dd57dd
asset update logic
2023-09-11 17:15:25 -05:00
slong753
1ea0de8bca
prevent injection, fix asset update
2023-09-11 17:15:25 -05:00
slong753
17ccfa9ada
resolve some conflicts
2023-09-11 17:15:24 -05:00
slong753
c1daabef08
progress
2023-09-11 17:10:41 -05:00
Godfrey M
e73b16846e
adds an option to bulk edit actual location for bulk edit and fixes update issue
2023-09-11 11:21:56 -07:00
Godfrey Martinez
a26b96185b
Merge branch 'develop' into asset-model-notifs
2023-09-11 09:37:22 -07:00
snipe
02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
...
Fixed #13562 - Added inline file link
2023-09-07 20:50:13 +01:00
Ivan Nieto Vivanco
abd2ed3b81
Filter unaccepted assets that are not assigned to users
2023-09-07 13:39:16 -06:00
snipe
894c34ff4f
Update to only use relative paths
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-07 20:22:14 +01:00
snipe
a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
...
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541 )
2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco
91b1cc7121
Move the early return to the controller instead of the Label model
2023-09-05 13:23:51 -06: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
f53db8ba75
Fixed #13562 - allow inline view for uploaded files
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-05 18:28:01 +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
b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675
...
Fixed user search not adhering to company scoping
2023-08-30 08:54:41 +01:00
Marcus Moore
806ab2cb9d
Ensure users are scoped by company in index method
2023-08-29 16:17:29 -07:00
Ivan Nieto Vivanco
4e4ba38038
Pass the model_id variable in the controller and get it only if we are cloning the asset model
2023-08-28 16:23:26 -06:00
snipe
baffcbad71
Set password property properly
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-28 20:47:56 +01:00
snipe
611db4c0d2
Removed stray line
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-28 20:46:45 +01:00
Godfrey M
8ebb9afedd
adds min_amt to asset model edit, index, and table
2023-08-24 10:30:07 -07:00
Ivan Nieto Vivanco
6161a0d76d
Add condition in LicenseCheckinController:bulkCheckin method to evaluate if the license is reassignable
2023-08-23 16:22:40 -06:00
snipe
79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
...
Fixed Asset acceptance error when user company and asset company don't match
2023-08-22 15:49:56 +01: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
Marcus Moore
4e2ef4f056
Default to using the current date if last check in end date is not provided
2023-08-21 14:35:15 -07:00
Marcus Moore
c332b98456
Add last checkin options to report front end
2023-08-21 13:44:49 -07:00
snipe
474c03e3fc
Added name order to settings save controller method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-21 20:10:03 +01:00
Marcus Moore
489d30c685
Set last_checkin in ui and api controllers
2023-08-21 11:57:33 -07:00
snipe
1e82c2bfad
Changed example asset name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-18 22:17:54 +01:00
snipe
da2f22d504
Fixed #13487 - include supplier url in listing
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-18 15:31:15 +01:00
snipe
34f2221b02
Merge pull request #13471 from inietov/fixes/components_search
...
Fixed #13409 Search in component detail view not working
2023-08-16 21:59:40 +01:00
Brady Wetherington
852e9ff311
Accessory checkin via API reported wrong target user
2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco
92df32dfaa
Move a couple assignation of variables inside an else to only execute once
2023-08-15 21:10:48 -06:00
Ivan Nieto Vivanco
993918f47c
Add query to search into the per-component view
2023-08-15 15:31:36 -06:00
snipe
01ab360ef3
Fixed accessory clone typo
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:39:09 +01:00
snipe
64342838fd
Return the user to the labels page on save
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 18:48:12 +01:00
snipe
e41368daac
Merge pull request #12050 from cram42/develop
...
New Label Engine
2023-08-15 17:58:57 +01:00
snipe
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
...
Add email to companies
2023-08-15 13:26:20 +01:00
snipe
12e9d2adeb
Fixed #13450 - remove escaping on saveing new custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco
8da2a8a79c
Allows to save signature for declined items
2023-08-14 14:58:10 -06:00
Robert-Azelis
ed5b4ca0a2
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
Robert-Azelis
07bafa9508
Update CompaniesController.php
2023-08-13 17:15:20 +02:00
snipe
df8f6a8d2b
Correctly call the route for accessory index
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-11 09:40:49 +01:00
Marcus Moore
c32f099053
Remove unneeded call to Company::scopeCompanyables
2023-08-08 17:22:15 -07:00
Marcus Moore
7c5a1b376e
Remove redundant Company::scopeCompanyables wrapper
2023-08-07 16:54:23 -07:00
Ivan Nieto Vivanco
053d3fc9ed
Prevent asset to be checked out if full company support is enabled and companies not match
2023-08-02 19:23:28 -06:00
Ivan Nieto Vivanco
9ca163e8cf
Stop asset acceptances from shown to user if full company support is enabled and companies not match
2023-08-02 19:22:35 -06:00
snipe
ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today
...
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
2023-07-31 15:04:22 +01:00
Grant Le Roux
b1464e028c
Merge branch 'develop' into develop
2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco
0a841ddbb8
Change component validator to the correct asset id we're passing in the API call
2023-07-27 20:22:13 -06:00
Ivan Nieto Vivanco
c015264181
Adjust the license offset if it exceeds the total of license seats
2023-07-25 16:23:33 -06:00
snipe
a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page
...
Delete button on asset view page
2023-07-25 12:11:35 +01:00
Ivan Nieto Vivanco
cb4ed92639
Use Carbon date objects instead of casting using DB::raw()
2023-07-20 16:17:06 -06:00
Tobias Franzius
90a344af0b
Fixes #13341 Clean up correct seats on license delete
...
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.
This way, we ensure that we only alter seats belonging to the correct license.
2023-07-20 13:48:57 +02:00
snipe
a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets
...
Current value added to asset index page
2023-07-19 19:06:15 +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
18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478
...
Fixed the inability to load location select when editing profile
2023-07-18 13:26:30 +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
f51dd15893
Moved deleted scope down
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-14 07:44:19 +01:00
Marcus Moore
346ace9444
Allow users that have permission to edit their own location to see locations in select list
2023-07-13 17:37:46 -07:00
Ivan Nieto Vivanco
ecac4718fe
Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes
2023-07-13 16:02:47 -06: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
snipe
44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin
...
Fixed #13167 Default location not being set/updated upon check-in
2023-07-12 19:14:53 +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
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-10 19:44:21 +01:00
Ivan Nieto Vivanco
9591442f1e
Evaluate the radio input to update location only or default location too
2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco
743e852998
Add radio buttons to alter asset checkin location behavior
2023-07-06 10:38:48 -06:00
snipe
7937542dcb
Redirect if the license can’t be found
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 21:15:50 +01:00
snipe
fb9b3a5453
Switched from a colon to a hyphen to handle windows filesystems
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 20:32:20 +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
snipe
4c3a306a6e
More shuffling of scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-06-29 13:35:41 +01:00