Merge branch 'staging' into feature/senior-officer

app/Emails/SendPenawaranKJPPEmail.php

@@ -19,11 +19,12 @@ class SendPenawaranKJPPEmail extends Mailable
     public $districts;
     public $cities;
     public $provinces;
+    public $user; // Tambahkan user ke data yang dikirimkan ke view, sebagai cc dan bcc
 
     /**
      * Create a new message instance.
      */
-    public function __construct($dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces)
+    public function __construct($dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces, $user)
     {
         // Assign data yang diterima ke properti
         $this->dp1 = $dp1;
@@ -33,6 +34,7 @@ class SendPenawaranKJPPEmail extends Mailable
         $this->districts = $districts;
         $this->cities = $cities;
         $this->provinces = $provinces;
+        $this->user = $user; // Tambahkan user ke data yang dikirimkan ke view, sebagai cc dan bcc
     }
 
     /**
@@ -50,6 +52,7 @@ class SendPenawaranKJPPEmail extends Mailable
                 'districts' => $this->districts,
                 'cities' => $this->cities,
                 'provinces' => $this->provinces,
+                'user' => $this->user // Tambahkan user ke data yang dikirimkan ke view, sebagai cc dan bcc
             ]);
     }
 }

app/Http/Controllers/DokumenJaminanController.php

@@ -527,6 +527,11 @@
 
             foreach ($newLegalitasJaminan as $legalitas) {
                 if (!Collection::make($existingLegalitas)->contains('jenis_legalitas_jaminan_id', $legalitas->id)) {
+                    $customFields = [];
+                    if($legalitas->custom_fields) {
+                        $customFields = CustomField::whereIn('id', $legalitas->custom_fields)->get();
+                    }
+
                     $newLegalitas[] = [
                         'id'                         => null,
                         'jenis_legalitas_jaminan_id' => $legalitas->id,
@@ -535,6 +540,7 @@
                         'dokumen_nomor'              => null,
                         'custom_field'               => $legalitas->custom_field,
                         'custom_field_type'          => $legalitas->custom_field_type,
+                        'custom_fields'               => $customFields,
                         'details'                    => null,
                         'keterangan'                 => null,
                         'is_existing'                => false,

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 {
@@ -918,6 +921,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 K J P P Email';
 
@@ -929,7 +933,8 @@ class TenderController extends Controller
             'villages' => $villages,
             'districts' => $districts,
             'cities' => $cities,
-            'provinces' => $provinces
+            'provinces' => $provinces,
+            'user' => $user,
         ])->render();
 
         SendPenawaranKJPPTenderJob::dispatch(
@@ -940,7 +945,8 @@ class TenderController extends Controller
             $villages,
             $districts,
             $cities,
-            $provinces
+            $provinces,
+            $user
         );
 
         try {

app/Jobs/SendPenawaranKJPPTenderJob.php

@@ -22,11 +22,12 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
     protected $districts;
     protected $cities;
     protected $provinces;
+    protected $user;
 
     /**
      * Create a new job instance.
      */
-    public function __construct($kjpps, $dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces)
+    public function __construct($kjpps, $dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces, $user)
     {
         $this->kjpps = $kjpps;
         $this->dp1 = $dp1; // Simpan keseluruhan array dp1, bukan dp1[0]
@@ -36,6 +37,7 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
         $this->districts = $districts;
         $this->cities = $cities;
         $this->provinces = $provinces;
+        $this->user = $user;
     }
 
     /**
@@ -50,7 +52,8 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
             $this->villages,
             $this->districts,
             $this->cities,
-            $this->provinces
+            $this->provinces,
+            $this->user // Kirim user ke email sebagai cc dan bcc
         );
 
         $email->with([
@@ -61,6 +64,7 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
             'districts' => $this->districts,
             'cities' => $this->cities,
             'provinces' => $this->provinces,
+            'user' => $this->user // Kirim user ke email sebagai cc dan bcc
         ]);
 
         $send = Mail::to($this->kjpps)->send($email);

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);

resources/views/penawaran/kirimEmail.blade.php

@@ -165,10 +165,10 @@
 
     <div class="signature">
         Best Regards,<br/>
-        <img src="{{ asset('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
-             alt="{{ $permohonan->user->name }}" width="200">
+        <img src="{{ asset('storage/signatures/' . $user->id . '/' . $user->sign) }}"
+             alt="{{ $user->name }}" width="200">
         <p>
-            {{ $permohonan->user->name }}
+            {{ $user->name }}
         </p>
     </div>
 

resources/views/penawaran/kirimEmailKJPP.blade.php

@@ -165,10 +165,10 @@
 
         <div class="signature">
             Best Regards,<br />
-            <img src="{{ asset('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
-                alt="{{ $permohonan->user->name }}" width="200">
+            <img src="{{ asset('storage/signatures/' . $user->id . '/' . $user->sign) }}"
+                alt="{{ $user->name }}" width="200">
             <p>
-                {{ $permohonan->user->name }}
+                {{ $user->name }}
             </p>
         </div>