Commit Graph

110 Commits

Author SHA1 Message Date
snipe ca567eec8a Small adjustments for layout 2025-09-17 21:08:13 +01:00
snipe 6d0084f108 Nicer alert layout for expiring asset report 2025-09-12 17:37:27 +01:00
snipe 913b9f0c40 Reworks PR #15490 - adds location to inventory email
Signed-off-by: snipe <snipe@snipe.net>
2025-09-08 09:26:36 +01:00
snipe f340390fc8 Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold
Fixed issues around accessory acceptance
2025-09-08 09:09:26 +01:00
Marcus Moore d29e09a3ff Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
# Conflicts:
#	resources/views/account/accept/create.blade.php
#	resources/views/account/accept/index.blade.php
2025-09-03 12:26:43 -07:00
Marcus Moore 27022954b1 Inline icon 2025-09-03 10:44:19 -07:00
Marcus Moore db5bb1928e Merge branch 'develop' into fixes/existing-assets-report
# Conflicts:
#	resources/views/notifications/markdown/report-expiring-assets.blade.php
2025-09-02 15:07:23 -07:00
Marcus Moore 65b66beb07 Make icon more prominent 2025-09-02 14:55:46 -07:00
snipe 28abeab31d Fixed a few more display_name instances
Signed-off-by: snipe <snipe@snipe.net>
2025-08-29 10:06:58 +01:00
Marcus Moore 35b79e4d14 Remove old comments 2025-08-28 16:56:40 -07:00
Marcus Moore 751dad7f2e Inline days 2025-08-28 16:56:12 -07:00
Marcus Moore b08d86220a First pass at moving to table structure 2025-08-28 16:53:13 -07:00
Marcus Moore 3a27ecc475 Use display_name in place of name() 2025-08-28 16:22:24 -07:00
Marcus Moore 4298aad008 Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
# Conflicts:
#	app/Http/Controllers/Account/AcceptanceController.php
#	resources/views/notifications/markdown/asset-acceptance.blade.php
2025-08-26 11:39:52 -07:00
Marcus Moore 823c67400d Fix indent 2025-08-26 11:34:10 -07:00
snipe c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
snipe b6d397bcca Updated ->present()->fullName() to ->display_name
Signed-off-by: snipe <snipe@snipe.net>
2025-08-25 14:57:34 +01:00
Marcus Moore c22575812d Add qty to AcceptanceAssetAcceptedToUserNotification 2025-08-21 14:53:00 -07:00
snipe 15f97b6cb9 Merge pull request #17591 from Godmartinz/add-serial-to-expiring-asset-report
Adds #17440 serial number column to Expiring Assets Report
2025-08-21 11:14:45 +01:00
Godfrey M 9eb686fe08 changes translation to administrator 2025-08-19 10:23:15 -07:00
Godfrey M ed402e0122 adds serial underneath name 2025-08-19 10:10:20 -07:00
Godfrey M fe3d225cfa fix tests 2025-08-14 09:15:19 -07:00
Godfrey M dfe2a75d72 adds user that checked out item to acceptance emails 2025-08-12 15:34:46 -07:00
Godfrey M ba85af11aa adds serial to expiring assets report email 2025-08-12 14:59:20 -07:00
snipe b092779697 Fixed #17273 - switch to HTML table from markdown
Signed-off-by: snipe <snipe@snipe.net>
2025-07-07 14:37:38 +01:00
snipe f4decbf52e Fixed #15480 - adds location to acceptance email
Signed-off-by: snipe <snipe@snipe.net>
2025-06-14 23:08:37 +01:00
Marcus Moore 6c1adff5c8 Extract translation string 2025-06-09 15:33:39 -07:00
Marcus Moore 9293bdca06 Don't render link for Unknown User 2025-06-09 15:32:07 -07:00
Marcus Moore beeccbfb44 Handle unknown users gracefully 2025-06-09 15:30:03 -07:00
Marcus Moore 4d978e0fc6 Fix eol rate in upcoming audit notification 2025-03-12 16:04:16 -07:00
spencerrlongg d949a9689f fix all 2025-02-24 22:35:47 -06:00
spencerrlongg 1fd81d17a3 route model binding change 2025-02-24 17:53:41 -06:00
akemidx ca0f8ace99 fixed 2024-12-03 16:57:28 -05:00
akemidx 6252f0ac5e layout / added category id 2024-12-03 16:10:42 -05:00
NebelKreis 7618169d79 Feature: Added category to asset requested email 2024-11-20 11:22:19 +01:00
NebelKreis eb026248a8 Feature: Added category to asset acceptance/decline email 2024-11-20 10:59:59 +01:00
Godfrey M 285d6897cf added a coulple test adjustments and moved mail send logic to listener 2024-10-17 12:05:36 -07:00
Godfrey M 02bda3cd95 adds Checkout Consumable mailable and slackwebhook channel to notifs 2024-10-16 15:53:05 -07:00
Godfrey M 02ff646da4 adds checkin license mailable 2024-10-16 15:44:45 -07:00
Godfrey M 2584d60344 adds Licenses seat checkout Mailable 2024-10-16 15:38:49 -07:00
Godfrey M dcdf600b78 adds Checkin and Checkout mailables and listner logic 2024-10-16 15:27:34 -07:00
Godfrey M 9710436d54 adds Mailables for asset checkin and out 2024-10-16 13:12:07 -07:00
Godfrey M 3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07:00
snipe 65eba30038 Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:23:34 +01:00
Godfrey M 8af4126de1 removed indent from blades 2024-08-13 10:21:33 -07:00
Godfrey M eb6f330e67 adds status to check in and out 2024-07-30 09:38:39 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 05e278d08b Added qty to email
Signed-off-by: snipe <snipe@snipe.net>
2024-07-17 20:58:21 +01:00
snipe 5697370dfe Merge pull request #14722 from Godmartinz/unaccepted_reminder_command
Adds a command to resend acceptance emails
2024-07-11 20:37:04 +01:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 20:40:45 +01:00