3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-02 06:18:50 +00:00
Commit Graph

36 Commits

Author SHA1 Message Date
be4ace293e Use trans_choice for user acceptance 2025-09-18 13:51:57 +01:00
764b363bbc A few small tweaks to acceptance screen design 2025-09-18 13:38:37 +01:00
8ea339f0ef More small tweaks 2025-09-17 22:00:49 +01:00
1d3dfa1fa4 Pull the acceptance stuff into the model 2025-09-17 21:43:17 +01:00
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
95be847d87 renamed attribute 2025-08-27 14:10:51 -07:00
648c25a0a7 adds item type to Accept asset index 2025-08-27 14:06:10 -07:00
18c2508d2f Scaffold command for cleaning accessory_checkout 2025-08-20 13:49:19 -07:00
9caa240fdb Revert "Remove total qty of accessory checkouts"
This reverts commit 3ffb73a516.
2025-08-19 17:17:46 -07:00
3ffb73a516 Remove total qty of accessory checkouts 2025-08-19 17:04:13 -07:00
95f867b267 Code formatting fixes
Signed-off-by: snipe <snipe@snipe.net>
2025-07-09 21:48:53 +01:00
360f5b7538 Add alert_on_response_id to CheckoutAcceptance 2025-06-05 13:10:18 -07:00
97b765b5cc improved reports query, could be further optimized 2025-01-07 15:06:09 -08:00
e12c7473f8 tinkering with the polymorphic eager load 2025-01-07 09:08:36 -08:00
8650923b01 new branch cuz test merge 2024-07-08 12:55:59 -05: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
4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
f96d8fe674 Add CheckoutAcceptance factory 2023-05-03 14:21:13 -07:00
b4e578c95e Convert the alert_email setting from string to array 2023-02-27 17:34:29 -06:00
a45ce468cc Update return type for routing mail notifications 2023-02-01 11:44:56 -08:00
3580bdae86 Use object accessor instead of array accessor 2023-02-01 11:44:35 -08:00
39289dd18e Use user provided alert email for checkout acceptances 2023-01-26 13:18:18 -08:00
c082d8b90e Return empty string if no MAIL_REPLYTO_ADDR var set 2022-11-23 18:22:31 -06:00
98bcd82108 Add the mail recipient from configuration in the CheckoutAcceptance model 2022-08-11 15:33:18 -05:00
0172fe6403 Add Notifiable trait to the CheckoutAcceptance Model 2022-08-11 13:02:25 -05:00
75acb0f28a Added sig and eula pdf to checkout_acceptance
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
9f43ce97e9 Convert deprecated $dates property to $casts 2021-06-10 20:17:18 +00:00
934afa036f Adopt Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
0544164015 Fixed Eloquent Builder path in docblock 2019-08-20 18:10:36 -07:00
b6a188a87b Removed erroneous linebreak 2019-08-20 18:10:21 -07:00
e3e0d57f56 Minor code cleanup bits and bobs (#6805)
* Add IDE Helper files

* Cleanup imports

- Alphabetises imports
- Removes unused imports

* Add Platform requirements

* Move filling asset into block where asset exists

* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
62195a805a Adding some comments 2018-08-06 14:47:26 +02:00
1bdf71b584 Handle side effects of accepting/declining
When declining an asset, it gets checked in.
2018-08-06 14:47:26 +02:00
8648d53d25 Adds checkout acceptances
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
2018-08-06 14:47:26 +02:00