From ab67c48352654b06da681e55a1a524fb33365ee9 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 2 Dec 2024 13:03:09 -0800 Subject: [PATCH] fix unaccepted assets report resend acceptance --- app/Http/Controllers/ReportsController.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 0d4bb936b2..303d608e15 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Helpers\Helper; +use App\Mail\CheckoutAssetMail; use App\Models\Accessory; use App\Models\Actionlog; use App\Models\Asset; @@ -18,6 +19,7 @@ use App\Notifications\CheckoutAssetNotification; use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Notification; use \Illuminate\Contracts\View\View; use League\Csv\Reader; @@ -1152,20 +1154,12 @@ class ReportsController extends Controller } // Only send notification if assigned - if ($assetItem->assignedTo) { + if ($assetItem->assignedTo->email) { + Mail::to($assetItem->assignedTo->email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $logItem->note, $acceptance))->locale($assetItem->assignedTo?->locale)); - if (!$assetItem->assignedTo->locale) { - Notification::locale(Setting::getSettings()->locale)->send( - $assetItem->assignedTo, - new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) - ); } else { - Notification::send( - $assetItem->assignedTo, - new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) - ); + Mail::to($assetItem->assignedTo->email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $logItem->note, $acceptance))); } - } if ($assetItem->assignedTo->email == ''){ return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));