gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small unaccepted items report fixes

Browse Source
This commit is contained in:
snipe
2025-11-11 13:17:56 +00:00
parent 9365d1adc6
commit a5c7b8f609
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/SendAcceptanceReminder.php
View File

@@ -31,7 +31,7 @@ class SendAcceptanceReminder extends Command
*
* @var string
*/
protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
protected $description = 'This will resend users with unaccepted items a reminder to accept or decline them.';
/**
* Create a new command instance.

2
app/Http/Controllers/ReportsController.php
View File

@@ -1180,7 +1180,7 @@ class ReportsController extends Controller
$acceptance = $query->find($id);
if (!$acceptance) {
Log::debug('No pending acceptances');
// Redirect to the unaccepted assets report page with error
// Redirect to the unaccepted items report page with error
return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
}
$item = $acceptance->checkoutable;

2
app/Models/Checkoutable.php
View File

@@ -26,7 +26,7 @@ class Checkoutable
$acceptance = $unaccepted;
$assignee = $acceptance->assignedTo;
$company = optional($unaccepted_row->company)->present()?->nameUrl() ?? '';
$company = $unaccepted_row->company ? optional($unaccepted_row->company)->present()->nameUrl() : '';
$category = $model = $name = $tag = '';
$type = $acceptance->checkoutable_item_type ?? '';

2
resources/lang/en-US/general.php
View File

@@ -327,7 +327,7 @@ return [
'declined' => 'declined',
'declined_note' => 'Declined Notes',
'unassigned' => 'Unassigned',
'unaccepted_asset_report' => 'Unaccepted Assets',
'unaccepted_asset_report' => 'Unaccepted Items',
'users' => 'Users',
'viewall' => 'View All',
'viewassets' => 'View Assigned Items',

2
resources/lang/en-US/mail.php
View File

@@ -104,7 +104,7 @@ return [
'upcoming-audits_click' => 'This email may not contain the full list so as not to exceed email size limits. Click on the button below to view all assets due for audit.',
'user' => 'User',
'username' => 'Username',
'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Items',
'welcome' => 'Welcome :name',
'welcome_to' => 'Welcome to :web!',
'your_assets' => 'View Your Assets',

2
tests/Unit/Mail/CheckoutAssetMailTest.php
View File

@@ -45,7 +45,7 @@ class CheckoutAssetMailTest extends TestCase
'asset' => Asset::factory()->requiresAcceptance()->create(),
'acceptance' => CheckoutAcceptance::factory()->create(),
'first_time_sending' => false,
'expected_subject' => 'Reminder: You have Unaccepted Assets.',
'expected_subject' => 'Reminder: You have Unaccepted Items',
'expected_opening' => 'An item was recently checked out under your name that requires acceptance, details are below.'
];
}