Brady Wetherington
4fcf5ac7da
Add new indexes to locations and users for faster manager lookups
2024-11-06 21:19:41 +00:00
Tobias Regnery
1318dc6111
Add a backward compatibility setting for locations with companies
...
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
2024-11-04 10:03:38 +01:00
Tobias Regnery
1ccbf8942c
Add ability to tie locations to companies
...
Locations are the last big part of the application that can't be tied to companies.
This can be a problem with FullMultipleCompanySupport, because you can't restrict the visibility of locations to the company of the users.
In order to change this, add a company_id to the locations table and wire everything up in the views and controllers.
Aditionally add a new formatter to filter the locations to a specific company, like it is done for assets.
Locations are properly scoped to the users company if FullMultipleCompanySupport is enabled.
If a parent location of a location has a different company than the user, the location does not show up.
2024-11-04 10:03:37 +01:00
Godfrey M
ae3cb7b37b
adds migration to update new with old if blank and remove old barcod variables
2024-10-31 14:35:13 -07:00
Marcus Moore
54b4db86d2
Revert "Add soft deletes"
...
This reverts commit 0eadab49f1
.
2024-10-29 15:33:49 -07:00
Marcus Moore
0eadab49f1
Add soft deletes
2024-10-29 15:26:18 -07:00
Marcus Moore
45e98e0282
Merge branch 'develop' into saving_custom_report_template
2024-10-29 15:20:52 -07:00
snipe
e0ec6795b5
Use crucial for seeded data
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-24 01:27:50 +01:00
Marcus Moore
7238238d1f
Use created_by instead of user_id
2024-10-23 16:40:03 -07:00
Godfrey M
b16a978f1b
uses manufacturer factory for manufactuer_id
2024-10-23 16:25:51 -07:00
snipe
a9eea830e3
Added manufacturer and model number to component seeders
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 19:05:34 +01:00
snipe
3ee76be7e3
Added manufacturer and model_number to components
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 17:50:22 +01:00
spencerrlongg
48c812d345
bunch of cleanup, split cancel out
2024-10-22 20:48:27 -05:00
spencerrlongg
8a99cc1391
test working
2024-10-22 17:25:58 -05:00
akemidx
5cb940c2ee
Merge branch 'refs/heads/upstream/dev' into feature/sc-26415
2024-10-16 18:32:36 -04:00
Marcus Moore
5306e1cd15
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/reports/custom.blade.php
2024-10-15 12:32:01 -07:00
snipe
de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
...
Added tests for accessory api controller
2024-10-11 11:29:34 +01:00
Marcus Moore
bde05d6ed9
Use new() instead of times()
2024-10-03 13:15:49 -07:00
Marcus Moore
863c0a8b60
Fix import_type for accessory state
2024-10-03 11:43:02 -07:00
akemidx
5e74b109d9
front end changes/updates from gh
2024-10-02 18:15:52 -04:00
akemidx
700647c53f
setting created
2024-10-02 18:15:52 -04:00
Marcus Moore
fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories
2024-09-30 12:59:27 -07:00
bryanlopezinc
e807cfab86
Merge branch 'develop' into importTests
2024-09-30 12:47:52 +01:00
bryanlopezinc
0b3f458561
Added tests for Import feature
2024-09-30 12:42:41 +01:00
snipe
ab0c009c0d
Fixed seeder
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-20 19:45:10 +01:00
snipe
b68805cf83
Small fix for notifications checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-20 19:11:52 +01:00
snipe
f53b852dff
Make created_by equal one in the seeder
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-20 13:53:52 +01:00
Marcus Moore
2137890496
Remove dead code
2024-09-19 11:33:20 -07:00
Marcus Moore
9b22d6d493
Add tests for accessory checkouts endpoint
2024-09-19 11:24:01 -07:00
snipe
9adb2c24f3
Squashed commit of the following:
...
commit dddbf27d78
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184
Merge: 04bb3eec8
3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9
f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775
9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 16:06:36 +01:00
Marcus Moore
8bba11e1bb
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# app/Http/Controllers/ReportsController.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/status-select.blade.php
# resources/views/reports/custom.blade.php
2024-09-17 15:26:35 -07:00
snipe
1582d81e5b
Change user_id
to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-17 22:16:41 +01:00
Marcus Moore
7f40f55343
Add tests for delete supplier endpoint
2024-09-16 13:52:02 -07:00
Marcus Moore
b06e8d442d
Add tests for delete status label endpoint
2024-09-16 13:37:08 -07:00
Marcus Moore
c269184c60
Add tests for delete predefined kit endpoint
2024-09-16 13:29:41 -07:00
Marcus Moore
53c673dee2
Add tests for delete manufacturer endpoint
2024-09-16 13:13:12 -07:00
Marcus Moore
50730fc4fb
Add tests for delete location endpoint
2024-09-16 12:37:18 -07:00
Marcus Moore
79a4bb7316
Add tests for delete depreciation endpoint
2024-09-16 10:35:44 -07:00
Marcus Moore
38b9f4a438
Add tests for delete departments endpoint
2024-09-16 10:29:20 -07:00
Marcus Moore
3105f53aff
Add tests for delete custom fieldsets endpoint
2024-09-12 16:54:29 -07:00
Marcus Moore
2047cfed09
Add tests for delete custom fields endpoint
2024-09-12 16:20:32 -07:00
Marcus Moore
910f13c1f7
Add tests for delete companies endpoint
2024-09-12 15:38:30 -07:00
Marcus Moore
8ce2512f55
Add tests for delete category endpoint
2024-09-12 13:54:44 -07:00
Marcus Moore
2044570e95
Add tests for delete asset model endpoint
2024-09-12 13:39:36 -07:00
Marcus Moore
d4426e4686
Add simple tests for company creation via UI
2024-09-09 11:03:00 -07:00
Marcus Moore
fa765667f2
Merge branch 'develop' into livewire-importer-improvements
2024-08-19 14:41:58 -07:00
snipe
e8f1190628
Added missing migration from #15314
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 10:44:28 +01:00
Marcus Moore
94d8a547b8
Merge branch 'develop' into livewire-importer-improvements
2024-08-15 13:47:49 -07:00
snipe
4356cb7b9b
Added confetti option
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 11:32:42 +01:00
snipe
ce5be8ac24
Merge pull request #15100 from Godmartinz/depreciation_percentage
...
Added Depreciation Percentage as an option
2024-08-12 10:10:25 +01:00