Marcus Moore
ca677038b0
Remove unused methods
2023-03-16 15:39:02 -07:00
Marcus Moore
a50ddb4a5d
Improve actionlog factory and seeder
2023-03-16 15:25:23 -07:00
Marcus Moore
2f0f9586b1
Remove default category relationship from license factory
2023-03-16 13:46:30 -07:00
Marcus Moore
345946d6d4
Remove default department relationship from user factory
2023-03-16 13:25:02 -07:00
Marcus Moore
76861c0c30
Remove hard-coded manager_id in factory
2023-03-16 12:46:47 -07:00
Marcus Moore
7062b0acaa
Remove hard-coded supplier_id in factories
2023-03-16 12:41:34 -07:00
Marcus Moore
0ec885bf18
Remove hard-coded fieldset_id in factories
2023-03-15 18:49:21 -07:00
Marcus Moore
dfd6cf0d29
Improve factories for location relationships
2023-03-15 18:31:08 -07:00
Marcus Moore
b944945377
Remove hard-coded company_id in factories and update seeders
2023-03-15 14:12:34 -07:00
Marcus Moore
fb789eb048
Remove hard-coded depreciation_id in factories
2023-03-14 17:51:20 -07:00
Marcus Moore
f7577bff52
Merge branch 'develop' into fixes/purify-factories
2023-03-14 17:09:30 -07:00
snipe
c12d261fc8
Merge pull request #12673 from marcusmoore/fixes/fix-component-factory
...
Fixed Component factory
2023-03-14 17:05:38 -07:00
Marcus Moore
9cd8460e1e
Add proper date format to purchase date in the component factory
2023-03-14 17:02:45 -07:00
Marcus Moore
72a61783a3
Inline two relationships in asset maintenance factory
2023-03-14 14:59:34 -07:00
Marcus Moore
1ff094dd47
Remove hard-coded model_id in asset factory
2023-03-14 13:56:25 -07:00
Marcus Moore
ef8007a890
Remove hard-coded status_id in asset factory
2023-03-14 13:24:50 -07:00
Marcus Moore
a2efe3fa67
Remove hard-coded category_id in factories
2023-03-14 12:50:02 -07:00
Marcus Moore
4c4101fe64
Fix key name
2023-03-14 12:04:31 -07:00
Marcus Moore
7cf424b914
Remove hard-coded manufacturer_id in factories
2023-03-14 12:01:23 -07:00
Marcus Moore
e8ff7cc09c
Remove hard-coded user_id in factories
2023-03-14 11:34:58 -07:00
Ivan Nieto Vivanco
66bb897ac4
Fix format to purchase date
2023-03-14 02:55:20 -06:00
Marcus Moore
adba450b40
Remove some hard-coded ids in factories
2023-03-13 17:27:06 -07:00
Marcus Moore
099ec3f550
Remove creation of category within category factory state
2023-03-13 16:45:43 -07:00
Marcus Moore
d27fe7d4b9
Merge branch 'develop' into fix/test-suite
2023-03-06 17:04:00 -08:00
Marcus Moore
ef27c35d1d
Update array keys to set asset location properly
2023-03-06 16:33:40 -08:00
Marcus Moore
ad9eef6393
Update deprecated faker calls in Asset and Supplier factories
2023-03-02 13:41:52 -08:00
Marcus Moore
a7a26bb154
Fix License Factory
2023-02-28 15:55:28 -08:00
Marcus Moore
4197e613b2
Fix License Factory
2023-02-28 14:50:48 -08:00
Marcus Moore
589a5d0d8b
Merge branch 'develop' into fix/test-suite
2023-02-28 09:48:48 -08:00
Marcus Moore
bdac0f16ce
Set purchase date field to the correct format in asset factory
2023-02-23 13:39:05 -08:00
Marcus Moore
3fdf4dea1b
Use factories for relationships in asset factory
2023-02-07 16:17:05 -08:00
Marcus Moore
89eff23e44
Continue implementing tests
2023-02-02 17:41:32 -08:00
snipe
9aac1cbba4
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
snipe
1441cf9f4f
Ports #10494 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-12 21:04:57 +01:00
snipe
2b4ee4827f
Merge branch 'develop' into fixes/trying_to_get_property_id_of_nonobject
2022-03-02 14:35:35 -08:00
snipe
ba5b835933
Lock seeder to english
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 13:10:29 -08:00
Brad
81084fa717
Fixed #7824
...
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.
This commit allievates those pain points
- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
2022-01-10 14:03:28 -05:00
snipe
87f52cbfec
Seeder fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-24 10:47:06 -08:00
Ivan Nieto Vivanco
5bda4b79d2
Fixes the Asset Factory to assign example Suppliers and Locations to Assets
2021-12-11 21:36:54 -06:00
Ivan Nieto Vivanco
b43a0569b1
Fixes trying to get property 'id' of non-object in develop seeders
2021-12-11 17:26:41 -06:00
snipe
0e3bafd5b4
Fixed depreciation tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:19:42 -08:00
snipe
3a1e2a56d6
Use the proper ID for status ID factory
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 17:38:06 -08:00
snipe
390e8a6cc3
Fixed company unit test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:43:03 -08:00
snipe
35ba28bff9
Continuing to refactor tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:14:45 -08:00
snipe
37033fb2f7
Removed some defaul values to handle validation
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 15:02:11 -08:00
snipe
00b63fe7c7
Fixed category factory methods
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 13:40:16 -08:00
snipe
ed2797afdd
Small fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 23:33:20 -08:00
snipe
ad6d70b86f
Removed unused Str
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 23:30:48 -08:00
snipe
17bd6d71e7
Fixed location unit test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 22:45:39 -08:00
snipe
d96e95abd6
Small mods to configs, removed old faker, added new
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 13:46:21 -08:00
