diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index ccd83c8..2a7de01 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -724,6 +724,7 @@ class TenderController extends Controller $districts = District::where('code', $district_permohonan)->get(); $cities = City::where('code', $city_permohonan)->get(); $provinces = Province::where('code', $province_permohonan)->get(); + $user = auth::user(); $subject = 'Send Penawaran Email'; @@ -734,7 +735,8 @@ class TenderController extends Controller 'villages' => $villages, 'districts' => $districts, 'cities' => $cities, - 'provinces' => $provinces + 'provinces' => $provinces, + 'user' => $user, ])->render(); // Dispatch job untuk mengirim email @@ -745,7 +747,8 @@ class TenderController extends Controller $villages, $districts, $cities, - $provinces + $provinces, + $user ); try { diff --git a/app/Jobs/SendPenawaranTenderJob.php b/app/Jobs/SendPenawaranTenderJob.php index 6a37f6c..7c5c685 100644 --- a/app/Jobs/SendPenawaranTenderJob.php +++ b/app/Jobs/SendPenawaranTenderJob.php @@ -21,11 +21,12 @@ class SendPenawaranTenderJob implements ShouldQueue protected $districts; protected $cities; protected $provinces; + protected $user; // Tidak perlu array [0] lagi /** * Create a new job instance. */ - public function __construct($kjpps, $penawaran, $permohonan, $villages, $districts, $cities, $provinces) + public function __construct($kjpps, $penawaran, $permohonan, $villages, $districts, $cities, $provinces,$user) { $this->kjpps = $kjpps; $this->penawaran = $penawaran; @@ -34,6 +35,7 @@ class SendPenawaranTenderJob implements ShouldQueue $this->districts = $districts; $this->cities = $cities; $this->provinces = $provinces; + $this->user = $user; // Simpan user yang dikirim email ke properti } /** @@ -49,6 +51,7 @@ class SendPenawaranTenderJob implements ShouldQueue 'districts' => $this->districts, 'cities' => $this->cities, 'provinces' => $this->provinces, + 'user' => $this->user // Kirim user ke email ke properti sebagai additional data ]); Mail::to($this->kjpps)->send($email); diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index a4238b4..c6ff33d 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -165,10 +165,10 @@
Best Regards,
- {{ $permohonan->user->name }} + {{ $user->name }}

- {{ $permohonan->user->name }} + {{ $user->name }}