3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-08 12:05:44 +00:00
Commit Graph

72 Commits

Author SHA1 Message Date
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
f518af6d61 fix class name 2025-08-27 13:09:05 -07:00
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
128bdf500a sends an email for to locale and cc locale 2025-08-25 12:02:23 -07:00
7c58bfa282 Add qty to AcceptanceAssetDeclinedNotification 2025-08-21 14:56:24 -07:00
c22575812d Add qty to AcceptanceAssetAcceptedToUserNotification 2025-08-21 14:53:00 -07:00
27f02014ca Add failing test 2025-08-20 12:26:55 -07:00
39d5ffeceb Implement fix 2025-08-20 12:05:58 -07:00
dfe2a75d72 adds user that checked out item to acceptance emails 2025-08-12 15:34:46 -07:00
0fdbdfd5c2 Improve log error handling regarding notification sending for issue #17491
* when an error is generated when denying checkouts, there are not enough logs
to determine the problem from the email provider
* missing handling of log test mail config, there is none of logs cos there
is no log handling on test email, becouse all the results are just sent to
the http response and no log were writen.
2025-08-08 12:18:04 -04:00
8e38b3898e Fixes #14295 - allow user to receive an email PDF upon signing
Signed-off-by: snipe <snipe@snipe.net>
2025-07-07 15:38:36 +01:00
95027e329c Formatting 2025-06-12 12:44:29 -07:00
628d2a0a0a Flesh out mail contents 2025-06-12 12:12:38 -07:00
cc0ff1ec1f Handle missing recipient 2025-06-12 11:53:30 -07:00
7424a5987b Add subject 2025-06-05 17:22:31 -07:00
bec80b443c WIP: begin to send email 2025-06-05 15:15:22 -07:00
15917d5f99 Use new logo
Signed-off-by: snipe <snipe@snipe.net>
2025-04-02 12:10:14 +01:00
3ab2521cb0 email comes through, no picture and html markup appear though. 2024-10-16 12:21:33 -07:00
8232618a9f change the other one too 2024-10-01 14:26:32 -05:00
d446773fdd catch exceptions on notification 2024-09-19 14:05:48 -05:00
854903805b one more spot 2024-07-31 12:16:41 -07:00
b6cac4baae corrects ? usage 2024-07-31 12:03:36 -07:00
99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
96d1aea54a More cleanup
Signed-off-by: snipe <snipe@snipe.net>
2024-07-05 00:54:50 +01:00
e98284fff5 Modernized helpers and use statements
Signed-off-by: snipe <snipe@snipe.net>
2024-07-04 20:48:35 +01:00
df1cef59d5 Fixes path for redirect response
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 18:01:40 +01:00
fb233c0aa4 Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
08f9aae8ae adds note to log listener and checkout accept notif 2024-04-03 11:59:47 -07:00
ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
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
8da2a8a79c Allows to save signature for declined items 2023-08-14 14:58:10 -06:00
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
d70e14de61 Merge pull request #12972 from marcusmoore/bug/sc-23177
Fixes user name missing in accessory acceptance notifications
2023-05-08 13:04:37 -07:00
96c6d8896f Add additional information to acceptance notifications for assets, accessories, and consumables 2023-05-03 17:04:01 -07:00
4a0b3efd1f Include user's name in Acceptance result notifications for accessories 2023-05-03 14:22:05 -07:00
6936d76661 Prevent hard fail when retrieving acceptance data 2023-05-01 16:50:18 -06:00
ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
a33ca39237 Figure out declined notifications 2022-08-11 16:00:21 -05:00
267997f0a6 Customize the notifications with the needed data 2022-08-11 14:01:11 -05:00
be8869978d Added import for Setting model 2022-07-04 07:29:01 -05:00
45c616639c Replicates #11444
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 11:21:02 -07:00
4e547a3639 Fixed typos :(
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:06:36 -07:00
b910db0617 Fixed #11393 - reject acceptance if no file is present
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:01:58 -07:00
b0897a1fc9 adds acceptance for consumables and components 2022-06-23 11:52:35 -07:00
d00b469001 fixed the search for the license 2022-06-23 11:33:36 -07:00
df76e6eacf adds eula blade for licenses and fixes assigned_to for dom_pdf 2022-06-23 11:15:15 -07:00