Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-03-07 10:19:06 +00:00
commit 109c0f202a
2 changed files with 5 additions and 0 deletions

View file

@ -1178,6 +1178,10 @@ class ReportsController extends Controller
}
}
if ($assetItem->assignedTo->email == ''){
return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
}
return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
}

View file

@ -201,6 +201,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',