f463cd6c8d
Fixes for #759 - location heirarchy
2015-05-04 02:50:42 -07:00
a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
551b5c42d8
"Years" turn out to be 12 times longer than months, apparently
2015-04-08 16:36:06 -07:00
7d9c90f8dd
Only pull eula if set to use default in category
2015-04-01 08:51:40 +10:30
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
605d0ed8e1
Moved checkModel into model from controller
2015-03-27 13:45:37 -07:00
35bbea3052
Fixes #688 - show model if no asset name
2015-03-24 17:08:15 -07:00
4aa4e7c9fc
Fix error if user is not in throttle table
2015-03-18 17:11:34 +10:30
61e6d55bcf
Merge pull request #669 from madd15/patch-1
...
Fix scopeGetDeleted - Missing withTrashed()
2015-03-17 15:36:51 -07:00
c00086c740
Fix eager loading for user throttle
2015-03-17 15:36:11 -07:00
e01b1b3935
Fix scopeGetDeleted - Missing withTrashed()
2015-03-18 09:04:51 +10:30
46c1f2a28b
Server side datatables for user view - needs fix for deleted users
2015-03-16 17:33:41 -07:00
4243710378
Added location to new assets view
2015-03-14 01:30:12 -07:00
2244c60499
Added category to output
2015-03-13 20:32:47 -07:00
b2af86230a
Added fields
2015-03-12 19:52:03 -07:00
f27fb90457
Allow override of checkin/checkout date
...
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -08:00
61b04d6e40
Fixes #579 - user cannot accept more than once
2015-03-01 16:35:32 -08:00
1273c4ca87
EULA/req improvements
2015-02-26 18:20:52 -08:00
04735f1aff
Fixed assetlog display
2015-02-26 17:04:21 -08:00
231e465898
Added category types to view
2015-02-26 16:00:52 -08:00
afe2eb736c
Added category type
2015-02-26 15:48:44 -08:00
c0c563b1c7
Fixes accessory relationshop for pivot
2015-02-26 15:25:08 -08:00
430b8233ed
Fixed user relationship
2015-02-26 15:24:51 -08:00
4ef2dd0c7e
Remove unused trashedAssets()
2015-02-27 08:42:53 +10:30
5010720a97
Fixed accessory relationship
2015-02-26 14:07:52 -08:00
efaf067b94
Fixed user relationship
2015-02-26 14:07:39 -08:00
6efd268004
Disable checkouts if there are none left
2015-02-26 13:28:08 -08:00
ad30aebcbc
Methods to extend the category EULA to the accessory
2015-02-26 11:41:47 -08:00
97d97fc4df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
9f3edd701b
Fixes #565 - Soft Delete Models and Allow Restore
...
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
2015-02-26 22:35:57 +10:30
54bad2e4f6
More accessory relationships
2015-02-26 03:19:45 -08:00
e41621def0
Fixed relation between accessory and category
2015-02-26 03:08:27 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
525a9225c8
Dashboard
2015-02-25 16:30:59 -08:00
ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
cb51dc45b6
Extend report to 60 days
2015-02-24 03:49:22 -08:00
e04ac89c5a
Added expiring warrantee alerts
2015-02-24 02:07:33 -08:00
70ae59ed62
Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
2015-02-19 12:52:27 -05:00
ae104293da
#539 - Allow checked out asset in requestable
2015-02-19 08:20:27 +10:30
063e5c407c
Fixed the depreciation report, fixes to calculate current depreciated
...
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
2015-02-17 18:51:13 -08:00
3ba02b65fb
Oops - Assets get their Depreciation from their *model* - wheras
...
Licenses have a Depreciation directly associated with them. So I
pulled the Depreciation relationship out of Depreciable so that both
Assets and Licenses could pull their depreciations in their associated
ways. I could've done this with an inheritance call, but that seems
a bit much (and unnecessarily confusing).
2015-02-17 17:56:59 -08:00
88dc0700f0
Make date functions work; create negative intervals for depreciation,
...
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
2015-02-17 17:40:16 -08:00
899e2bc9b6
Not convinved this filename is right or anything, but the shared depreciation code is here
2015-02-17 17:40:16 -08:00
1e4071b51d
First stab at cleaning up Depreciation
...
Conflicts:
app/models/Asset.php
It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
2015-02-17 17:39:39 -08:00
ea6a6d098a
Fixes #440 - removed unique constraint on serial
2015-02-17 14:15:22 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
ec1ab6913e
Merged layout blades for unified nav
2015-02-16 12:55:32 -08:00
f40bb7b8b3
Fixes #520 postal code requirement
2015-02-13 11:40:28 -08:00
17258b73a1
Fixes #520 - state no longer required
2015-02-13 11:37:47 -08:00
snipe