A free open source IT asset/license management system
Allow admin to resend unaccepted assets
snipece5de8fe065e
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex 2a848ba5d7..96504bb7bc 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -9,8 +9,9 @@ use App\Http\Controllers\Controller;use App\Http\Requests\DeleteUserRequest;use App\Http\Requests\ImageUploadRequest;use App\Http\Requests\SaveUserRequest;+use App\Mail\UnacceptedAssetReminderMail;use App\Models\Actionlog;-use App\Models\Asset;+use App\Models\CheckoutAcceptance;use App\Models\Company;use App\Models\Group;use App\Models\Setting;@@ -22,6 +23,7 @@ use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Mail;use Illuminate\Support\Facades\Password;use Symfony\Component\HttpFoundation\StreamedResponse;@@ -700,6 +702,48 @@ class UsersController extends Controller}+ /**+ * Resend pending acceptance reminder email for a specific user.+ */+ public function resendAcceptanceReminder(User $user): RedirectResponse+ {+ $this->authorize('view', $user);++ if (empty($user->email)) {+ return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));+ }++ if ($user->activated == '0') {+ return redirect()->back()->with('error', trans('admin/users/message.not_activated'));+ }++ $pendingItems = $user->getAssignedItemsWithPendingAcceptance();++ if ($pendingItems->isEmpty()) {+ return redirect()->back()->with('warning', trans('admin/users/message.error.no_pending_acceptances'));+ }++ $firstAcceptance = CheckoutAcceptance::query()+ ->forUser($user)+ ->pending()+ ->with('assignedTo')+ ->first();++ if (! $firstAcceptance) {+ return redirect()->back()->with('warning', trans('admin/users/message.error.no_pending_acceptances'));+ }++ $mailable = new UnacceptedAssetReminderMail($firstAcceptance, $pendingItems->count());++ if (! empty($user->locale)) {+ $mailable->locale($user->locale);+ }++ Mail::to($user->email)->send($mailable);++ return redirect()->back()->with('success', trans_choice('admin/users/message.success.acceptance_reminder_sent', $pendingItems->count(), ['count' => $pendingItems->count()]));+ }+/*** Send individual password reset email*diff --git a/app/Models/User.php b/app/Models/User.phpindex 68c482ba71..12389cf079 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -742,6 +742,22 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo->orderBy('created_at', 'desc');}+ /**+ * Get all assigned items that still have a pending acceptance for this user.+ */+ public function getAssignedItemsWithPendingAcceptance(): Collection+ {+ return CheckoutAcceptance::query()+ ->forUser($this)+ ->pending()+ ->with('checkoutable')+ ->get()+ ->map(fn (CheckoutAcceptance $acceptance) => $acceptance->checkoutable)+ ->filter()+ ->unique(fn ($item) => $item::class.':'.$item->getKey())+ ->values();+ }+/*** Establishes the user -> eula relationship*diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.phpindex 4b1bed8cc8..99b73edbf3 100644--- a/resources/lang/en-US/admin/users/general.php+++ b/resources/lang/en-US/admin/users/general.php@@ -14,6 +14,8 @@ return ['filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.','history_user' => 'History for :name','info' => 'Info',+ 'send_acceptance_reminder' => 'Send Reminder',+ 'unaccepted_items' => ':count Unaccepted Items','restore_user' => 'Click here to restore them.','last_login' => 'Last Login','ldap_config_text' => 'The selected location will be set for ALL imported users. This will overwrite their existing location, and is an unusual use-case, so leaving this blank is typically best.',diff --git a/resources/lang/en-US/admin/users/message.php b/resources/lang/en-US/admin/users/message.phpindex af87924985..f9c92ba424 100644--- a/resources/lang/en-US/admin/users/message.php+++ b/resources/lang/en-US/admin/users/message.php@@ -15,6 +15,7 @@ return ['user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.','ldap_not_configured' => 'LDAP integration has not been configured for this installation.','password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',+ 'not_activated' => 'This user cannot login, so they cannot accept assets via email.','password_reset_sent' => 'A password reset link has been sent to :email!','user_has_no_email' => 'This user does not have an email address in their profile.','log_record_not_found' => 'A matching log record for this user could not be found.',@@ -30,6 +31,7 @@ return ['unsuspend' => 'User was successfully unsuspended.','restored' => 'User was successfully restored.','import' => 'Users imported successfully.',+ 'acceptance_reminder_sent' => 'Acceptance reminder sent for :count pending item.|Acceptance reminder sent for :count pending items.',],'error' => [@@ -54,6 +56,7 @@ return ['ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:','password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ','multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.',+ 'no_pending_acceptances' => 'This user has no pending acceptances to remind them about.',],'deletefile' => [diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.phpindex df9eb4cccd..09a732c680 100755--- a/resources/views/users/view.blade.php+++ b/resources/views/users/view.blade.php@@ -146,6 +146,20 @@<span class="text-warning"><x-icon type="warning"/> {{ trans('admin/users/general.individual_override') }}</span>@endif</x-data-row>++ @if (($user->email!='') && ($user->activated=='1') && ($user->getAssignedItemsWithPendingAcceptance()->count() > 0))++ <x-data-row :label="trans_choice('admin/users/general.unaccepted_items', $user->getAssignedItemsWithPendingAcceptance()->count())">+ <form action="{{ route('users.acceptance_reminder', $user) }}" method="POST" class="form-inline" style="display: inline;">+ {{ csrf_field() }}+ <button class="btn btn-warning btn-sm" type="submit">+ {{ trans('admin/users/general.send_acceptance_reminder') }}+ </button>+ </form>+ </x-data-row>+ @endif++</x-page-data><!-- ./ definition list column -->@@ -156,6 +170,34 @@<!-- begin side stats well column--><x-page-column class="col-md-4 col-sm-12">++ @if($user->getUserTotalCost()->total_user_cost > 0)+ <x-well class="well-sm">++ <div class="well-display">++ <x-data-row icon_type="asset" label="{{ trans('general.assets') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->asset_cost) }}+ </x-data-row>++ <x-data-row icon_type="licenses" label="{{ trans('general.licenses') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->license_cost)}}+ </x-data-row>++ <x-data-row icon_type="accessories" label="{{ trans('general.accessories') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->accessory_cost)}}+ </x-data-row>++ <x-data-row icon_type="cost" label=" {{ trans('admin/users/table.total_assets_cost') }}" align="right">+ {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost) }}+ </x-data-row>++ </div>++ </x-well>+ @endif++<x-well class="well-sm" style="padding-left: 15px;">@if($user->activated == '1')@@ -217,33 +259,6 @@</x-well>- @if($user->getUserTotalCost()->total_user_cost > 0)- <x-well class="well-sm">-- <div class="well-display">-- <x-data-row icon_type="asset" label="{{ trans('general.assets') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->asset_cost) }}- </x-data-row>-- <x-data-row icon_type="licenses" label="{{ trans('general.licenses') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->license_cost)}}- </x-data-row>-- <x-data-row icon_type="accessories" label="{{ trans('general.accessories') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->accessory_cost)}}- </x-data-row>-- <x-data-row icon_type="cost" label=" {{ trans('admin/users/table.total_assets_cost') }}" align="right">- {{ Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost) }}- </x-data-row>-- </div>-- </x-well>- @endif--@if ( ($user->activated == '1') && (auth()->user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))diff --git a/routes/web/users.php b/routes/web/users.phpindex cfe66aeb4b..3770bded5f 100644--- a/routes/web/users.php+++ b/routes/web/users.php@@ -11,67 +11,66 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {Route::get('ldap',[- Users\LDAPImportController::class,- 'create'+ Users\LDAPImportController::class,+ 'create',])->name('ldap/user')- ->breadcrumbs(fn (Trail $trail) =>- $trail->parent('users.index')+ ->breadcrumbs(fn (Trail $trail) => $trail->parent('users.index')->push(trans('general.ldap_user_sync'), route('ldap/user')));Route::post('ldap',[- Users\LDAPImportController::class,- 'store'+ Users\LDAPImportController::class,+ 'store',]);Route::get('export',[- Users\UsersController::class,- 'getExportUserCsv'+ Users\UsersController::class,+ 'getExportUserCsv',])->name('users.export');Route::get('{user}/clone',[- Users\UsersController::class,- 'getClone'+ Users\UsersController::class,+ 'getClone',])->name('users.clone.show')->withTrashed();Route::post('{user}/clone',[- Users\UsersController::class,- 'postCreate'+ Users\UsersController::class,+ 'postCreate',])->name('users.clone.store')->withTrashed();Route::post('{user}/restore',[- Users\UsersController::class,- 'getRestore'+ Users\UsersController::class,+ 'getRestore',])->name('users.restore.store')->withTrashed();Route::post('{userId}/password',[- Users\UsersController::class,- 'sendPasswordReset'+ Users\UsersController::class,+ 'sendPasswordReset',])->name('users.password');Route::get('{userId}/print',[- Users\UsersController::class,- 'printInventory'+ Users\UsersController::class,+ 'printInventory',])->name('users.print');@@ -79,48 +78,54 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {'{userId}/email',[Users\UsersController::class,- 'emailAssetList'+ 'emailAssetList',])->name('users.email');+ Route::post(+ '{user}/acceptance-reminder',+ [+ Users\UsersController::class,+ 'resendAcceptanceReminder',+ ]+ )->name('users.acceptance_reminder')->withTrashed();+Route::post('bulkedit',[- Users\BulkUsersController::class,- 'edit'+ Users\BulkUsersController::class,+ 'edit',])->name('users/bulkedit')- ->breadcrumbs(fn (Trail $trail) =>- $trail->parent('users.index')+ ->breadcrumbs(fn (Trail $trail) => $trail->parent('users.index')->push(trans('general.bulk_checkin_delete'), route('users.index')));Route::post('merge',[Users\BulkUsersController::class,- 'merge'+ 'merge',])->name('users.merge.save');-Route::post('bulksave',[- Users\BulkUsersController::class,- 'destroy'+ Users\BulkUsersController::class,+ 'destroy',])->name('users/bulksave');Route::post('bulkeditsave',[- Users\BulkUsersController::class,- 'update'+ Users\BulkUsersController::class,+ 'update',])->name('users/bulkeditsave');});Route::resource('users', Users\UsersController::class, [- 'middleware' => ['auth']+ 'middleware' => ['auth'],])->withTrashed();diff --git a/tests/Feature/Users/Ui/ResendAcceptanceReminderTest.php b/tests/Feature/Users/Ui/ResendAcceptanceReminderTest.phpnew file mode 100644index 0000000000..044f7a8d2a--- /dev/null+++ b/tests/Feature/Users/Ui/ResendAcceptanceReminderTest.php@@ -0,0 +1,67 @@+<?php++namespace Tests\Feature\Users\Ui;++use App\Mail\UnacceptedAssetReminderMail;+use App\Models\CheckoutAcceptance;+use App\Models\User;+use Illuminate\Support\Facades\Mail;+use Tests\TestCase;++class ResendAcceptanceReminderTest extends TestCase+{+ public function test_it_sends_acceptance_reminder_email_for_user_with_pending_acceptances(): void+ {+ Mail::fake();++ $viewer = User::factory()->viewUsers()->create();+ $targetUser = User::factory()->create(['email' => '[email protected]']);++ CheckoutAcceptance::factory()->pending()->count(2)->create([+ 'assigned_to_id' => $targetUser->id,+ ]);++ $this->actingAs($viewer)+ ->post(route('users.acceptance_reminder', $targetUser))+ ->assertRedirect()+ ->assertSessionHas('success');++ Mail::assertSent(UnacceptedAssetReminderMail::class, function (UnacceptedAssetReminderMail $mail) use ($targetUser) {+ return $mail->hasTo($targetUser->email);+ });+ }++ public function test_it_does_not_send_when_user_has_no_pending_acceptances(): void+ {+ Mail::fake();++ $viewer = User::factory()->viewUsers()->create();+ $targetUser = User::factory()->create(['email' => '[email protected]']);++ $this->actingAs($viewer)+ ->post(route('users.acceptance_reminder', $targetUser))+ ->assertRedirect()+ ->assertSessionHas('warning');++ Mail::assertNotSent(UnacceptedAssetReminderMail::class);+ }++ public function test_it_does_not_send_when_user_has_no_email(): void+ {+ Mail::fake();++ $viewer = User::factory()->viewUsers()->create();+ $targetUser = User::factory()->create(['email' => '']);++ CheckoutAcceptance::factory()->pending()->create([+ 'assigned_to_id' => $targetUser->id,+ ]);++ $this->actingAs($viewer)+ ->post(route('users.acceptance_reminder', $targetUser))+ ->assertRedirect()+ ->assertSessionHas('error');++ Mail::assertNotSent(UnacceptedAssetReminderMail::class);+ }+}diff --git a/tests/Unit/Models/UserPendingAcceptanceItemsTest.php b/tests/Unit/Models/UserPendingAcceptanceItemsTest.phpnew file mode 100644index 0000000000..e1aff510ba--- /dev/null+++ b/tests/Unit/Models/UserPendingAcceptanceItemsTest.php@@ -0,0 +1,72 @@+<?php++namespace Tests\Unit\Models;++use App\Models\Accessory;+use App\Models\Asset;+use App\Models\CheckoutAcceptance;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Tests\TestCase;++class UserPendingAcceptanceItemsTest extends TestCase+{+ use RefreshDatabase;++ public function test_it_returns_only_items_with_pending_acceptances_for_the_user(): void+ {+ $user = User::factory()->create();+ $otherUser = User::factory()->create();++ $pendingAssetAcceptance = CheckoutAcceptance::factory()+ ->pending()+ ->for($user, 'assignedTo')+ ->create();++ $pendingAccessoryAcceptance = CheckoutAcceptance::factory()+ ->forAccessory()+ ->pending()+ ->for($user, 'assignedTo')+ ->create();++ CheckoutAcceptance::factory()+ ->accepted()+ ->for($user, 'assignedTo')+ ->create();++ CheckoutAcceptance::factory()+ ->pending()+ ->for($otherUser, 'assignedTo')+ ->create();++ $items = $user->getAssignedItemsWithPendingAcceptance();++ $this->assertCount(2, $items);+ $this->assertTrue($items->contains(fn ($item) => $item instanceof Asset && $item->is($pendingAssetAcceptance->checkoutable)));+ $this->assertTrue($items->contains(fn ($item) => $item instanceof Accessory && $item->is($pendingAccessoryAcceptance->checkoutable)));+ }++ public function test_it_returns_unique_items_when_multiple_pending_acceptances_exist_for_the_same_item(): void+ {+ $user = User::factory()->create();+ $asset = Asset::factory()->create();++ CheckoutAcceptance::factory()+ ->pending()+ ->for($asset, 'checkoutable')+ ->for($user, 'assignedTo')+ ->create();++ CheckoutAcceptance::factory()+ ->pending()+ ->for($asset, 'checkoutable')+ ->for($user, 'assignedTo')+ ->create();++ $items = $user->getAssignedItemsWithPendingAcceptance();++ $this->assertCount(1, $items);+ $this->assertTrue($items->first() instanceof Asset);+ $this->assertTrue($items->first()->is($asset));+ }+}