Merge branch 'staging' into feature/senior-officer

app/Helpers/Lpj.php

@@ -75,7 +75,16 @@ function checkKelengkapanDetailKJPP($id)
     // detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap?
     $query = PenawaranDetailTender::select('id')
         ->where('penawaran_id', '=', $id)
+        ->where('status','=',1)
         ->where(function ($query) {
+            // no_proposal
+            $query->orWhere('no_proposal', '', "");
+            $query->orWhereNull('no_proposal');
+            
+            // tgl_proposal
+            $query->orWhere('tgl_proposal', '', "");
+            $query->orWhereNull('tgl_proposal');
+            
             $query->orWhere('biaya_penawaran', '', "");
             $query->orWhereNull('biaya_penawaran');
 

app/Http/Controllers/DokumenJaminanController.php

@@ -4,6 +4,8 @@
 
     use App\Http\Controllers\Controller;
     use Exception;
+    use Illuminate\Http\JsonResponse;
+    use Illuminate\Support\Collection;
     use Illuminate\Support\Facades\DB;
     use Illuminate\Support\Facades\Storage;
     use Modules\Location\Models\City;
@@ -18,8 +20,6 @@
     use Modules\Lpj\Models\JenisJaminan;
     use Modules\Lpj\Models\JenisLegalitasJaminan;
     use Modules\Lpj\Models\PemilikJaminan;
-    use Illuminate\Http\JsonResponse;
-    use Illuminate\Support\Collection;
     use ZipArchive;
 
     class DokumenJaminanController extends Controller
@@ -72,45 +72,42 @@
 
                     $document = DokumenJaminan::create($validate);
 
-                    try {
+                    if ($request->jenis_legalitas_jaminan_id) {
-                        foreach ($request->dokumen_jaminan as $key => $value) {
+                        foreach ($request->jenis_legalitas_jaminan_id as $key => $value) {
-                            $file_name = $value->getClientOriginalName();
+                            $detailData = [
+                                'dokumen_jaminan_id'         => $document->id,
+                                'jenis_legalitas_jaminan_id' => $value,
+                                'name'                       => $request->name[$key],
+                                'keterangan'                 => $request->keterangan[$key],
+                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
+                            ];
 
-                            if ($file_name) {
+                            $dokumenJaminan = [];
-                                try {
+                            $dokumenNomor   = [];
-                                    $file_name = $value->getClientOriginalName();
+                            if (isset($request->dokumen_jaminan[$key]) && is_array($request->dokumen_jaminan[$key])) {
-                                    $value->storeAs(
+                                foreach ($request->dokumen_jaminan[$key] as $index => $file) {
+                                    if ($file) {
+                                        $file_name = $file->getClientOriginalName();
+                                        $file->storeAs(
                                             'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
                                             $file_name,
                                         );
+                                        $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
+                                    }
+                                }
+                            }
 
-                                    $detail = [
+                            if (!empty($dokumenJaminan)) {
-                                        'dokumen_jaminan_id'         => $document->id,
+                                $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
-                                        'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key],
+                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
-                                        'dokumen_jaminan'            => 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name,
+                            }
-                                        'name'                       => $request->name[$key],
+
-                                        'keterangan'                 => $request->keterangan[$key],
+                            DetailDokumenJaminan::create($detailData);
-                                        'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : '',
-                                    ];
-                                    DetailDokumenJaminan::create($detail);
-                                } catch (Exception $e) {
-                                    DB::rollBack();
-                                    return redirect()->route('debitur.jaminan.index', $id)->with(
-                                        'error',
-                                        'Gagal upload file dokumen jaminan ' . $key . ': ' . $e->getMessage(),
-                                    );
-                                }
                         }
                     }
+
                     DB::commit();
-                    } catch (Exception $e) {
-                        DB::rollBack();
-                        return redirect()->route('debitur.jaminan.index', $id)->with(
-                            'error',
-                            'gg' . $e->getMessage(),
-                        );
-                    }
-
                     return redirect()->route('debitur.jaminan.index', $id)->with(
                         'success',
                         'Dokumen Jaminan berhasil ditambahkan',
@@ -149,6 +146,7 @@
             $debitur = Debiture::find($id);
 
             $validate = $request->validated();
+
             if ($validate) {
                 try {
                     DB::beginTransaction();
@@ -226,7 +224,9 @@
                     $document->update($validate);
 
                     // Get existing detail documents
-                    $existingDetails = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get()->keyBy('id');
+                    $existingDetails = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get()->keyBy(
+                        'id',
+                    );
 
                     if ($request->jenis_legalitas_jaminan_id) {
                         foreach ($request->jenis_legalitas_jaminan_id as $key => $value) {
@@ -235,24 +235,29 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
+                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
                             ];
 
                             $dokumenJaminan = [];
+                            $dokumenNomor=[];
+
                             if (isset($request->dokumen_jaminan[$key]) && is_array($request->dokumen_jaminan[$key])) {
-                                foreach($request->dokumen_jaminan[$key] as $file) {
+                                foreach ($request->dokumen_jaminan[$key] as $index => $file) {
                                     if ($file) {
                                         $file_name = $file->getClientOriginalName();
                                         $file->storeAs(
                                             'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
-                                            $file_name
+                                            $file_name,
                                         );
                                         $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
                                     }
                                 }
                             }
 
                             if (!empty($dokumenJaminan)) {
                                 $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
+                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
                             }
 
                             if (isset($request->detail_dokumen_jaminan_id[$key])) {
@@ -261,9 +266,18 @@
                                 if ($detailDocument) {
                                     // Merge new files with existing ones
                                     if (!empty($dokumenJaminan)) {
-                                        $existingFiles = json_decode($detailDocument->dokumen_jaminan, true) ?: [];
+                                        $existingFiles                 = json_decode(
+                                            $detailDocument->dokumen_jaminan,
+                                            true,
+                                        ) ?: [];
+                                        $existingNomor                 = json_decode(
+                                            $detailDocument->dokumen_nomor,
+                                            true,
+                                        ) ?: [];
                                         $mergedFiles                   = array_merge($existingFiles, $dokumenJaminan);
+                                        $mergedNomor                   = array_merge($existingNomor, $dokumenNomor);
                                         $detailData['dokumen_jaminan'] = json_encode($mergedFiles);
+                                        $detailData['dokumen_nomor']   = json_encode($mergedNomor);
                                     }
                                     $detailDocument->update($detailData);
                                     $existingDetails->forget($detailId);
@@ -315,8 +329,10 @@
             $_jenisJaminan    = JenisJaminan::find($document->jenis_jaminan_id);
             $legalitasJaminan = json_decode($_jenisJaminan->jenis_legalitas_jaminan_id, true);
 
-            $currentLegalitasJaminan = JenisLegalitasJaminan::whereIn('id',$document->detail->pluck('jenis_legalitas_jaminan_id')->toArray())->get();
+            $currentLegalitasJaminan = JenisLegalitasJaminan::whereIn(
-
+                'id',
+                $document->detail->pluck('jenis_legalitas_jaminan_id')->toArray(),
+            )->get();
 
 
             // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan
@@ -341,7 +357,7 @@
                     'villages',
                     'pemilikJaminan',
                     'hubunganPemilik',
-                    'legalitas'
+                    'legalitas',
                 ),
             );
         }
@@ -378,7 +394,13 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
-                    $filePath = storage_path('app/public/' . $document->dokumen_jaminan);
+                    if($document->dokumen_jaminan) {
+                        $files = is_array(json_decode($document->dokumen_jaminan)) ? json_decode(
+                            $document->dokumen_jaminan,
+                        ) : [$document->dokumen_jaminan];
+
+                        foreach ($files as $file) {
+                            $filePath = storage_path('app/public/' . $file);
                             if (file_exists($filePath)) {
                                 $zip->addFile($filePath, basename($filePath));
                             } else {
@@ -386,6 +408,8 @@
                                 return redirect()->back()->with('error', 'File not found: ' . $filePath);
                             }
                         }
+                    }
+                }
                 $zip->close();
 
                 if (!file_exists($zipFilePath)) {
@@ -407,7 +431,9 @@
         {
             $dokumen  = request()->get('dokumen');
             $document = DetailDokumenJaminan::find($dokumen);
-            $file = is_array(json_decode($document->dokumen_jaminan)) ? json_decode($document->dokumen_jaminan) : [$document->dokumen_jaminan];
+            $file     = is_array(json_decode($document->dokumen_jaminan)) ? json_decode(
+                $document->dokumen_jaminan,
+            ) : [$document->dokumen_jaminan];
             return response()->download(storage_path('app/public/' . $file[request()->get('index')]));
         }
 
@@ -421,9 +447,8 @@
         }
 
 
-        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1) : JsonResponse
+        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1)
-        {
+        : JsonResponse {
-
             $jenisJaminan        = JenisJaminan::findOrFail($jenisJaminanId);
             $legalitasJaminan    = $jenisJaminan->jenis_legalitas_jaminan_id;
             $newLegalitasJaminan = JenisLegalitasJaminan::whereIn('code', json_decode($legalitasJaminan, true))->get();
@@ -444,12 +469,17 @@
                                 'id'                         => $detail->id,
                                 'jenis_legalitas_jaminan_id' => $detail->jenis_legalitas_jaminan_id,
                                 'name'                       => $detail->jenisLegalitasJaminan->name,
-                                'dokumen_jaminan'            => json_decode($detail->dokumen_jaminan) ?? $detail->dokumen_jaminan,
+                                'dokumen_jaminan'            => json_decode(
+                                        $detail->dokumen_jaminan,
+                                    ) ?? $detail->dokumen_jaminan,
+                                'dokumen_nomor'            => json_decode(
+                                        $detail->dokumen_nomor,
+                                    ) ?? $detail->dokumen_nomor,
                                 'custom_field'               => $detail->jenisLegalitasJaminan->custom_field,
                                 'custom_field_type'          => $detail->jenisLegalitasJaminan->custom_field_type,
                                 'details'                    => $detail->details,
                                 'keterangan'                 => $detail->keterangan,
-                                'is_existing'                => true
+                                'is_existing'                => true,
                             ];
                         }
                     }
@@ -463,11 +493,12 @@
                         'jenis_legalitas_jaminan_id' => $legalitas->id,
                         'name'                       => $legalitas->name,
                         'dokumen_jaminan'            => null,
+                        'dokumen_nomor'            => null,
                         'custom_field'               => $legalitas->custom_field,
                         'custom_field_type'          => $legalitas->custom_field_type,
                         'details'                    => null,
                         'keterangan'                 => null,
-                        'is_existing' => false
+                        'is_existing'                => false,
                     ];
                 }
             }

app/Http/Controllers/KJPPController.php

@@ -5,8 +5,6 @@ namespace Modules\Lpj\Http\Controllers;
 use Throwable;
 use Illuminate\Http\Request;
 use Modules\Lpj\Models\KJPP;
-use Illuminate\Http\Response;
-use Modules\Lpj\Models\Branch;
 use Modules\Location\Models\City;
 use Modules\Lpj\Models\IjinUsaha;
 use Modules\Lpj\Exports\KJPPExport;
@@ -57,7 +55,101 @@ class KJPPController extends Controller
     {
         $validated = $request->validated();
 
+
         if ($validated) {
+            $detailEmailKantor = [];
+            $detailNamaPimpinan = [];
+            $detailNomorPicPimpinan = [];
+            $detailNamaPicReviewer = [];
+            $detailNomorHpPicReviewer = [];
+            $detailNamaPicAdmin = [];
+            $detailNomorHpPicAdmin = [];
+            $detailNamaPicMarketing = [];
+            $detailNomorHpPicMarketing = [];
+
+            $emailKantor = $request->input('detail_email_kantor.email_kantor', []);
+            $namaPimpinan = $request->input('detail_nama_pimpinan.nama_pimpinan', []);
+            $nomorHpPimpinan = $request->input('detail_nomor_hp_pimpinan.nomor_hp_pimpinan', []);
+            $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []);
+            $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []);
+            $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []);
+            $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []);
+            $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []);
+            $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []);
+
+            foreach ($emailKantor as $value) {
+                $detailEmailKantor[] = [
+                    'email_kantor' => $value
+                ];
+            }
+            // Encode to JSON and store
+            $detailEmailKantorJson = json_encode($detailEmailKantor);
+
+            // Process detail_nama_pimpinan
+            foreach ($namaPimpinan as $value) {
+                $detailNamaPimpinan[] = [
+                    'nama_pimpinan' => $value
+                ];
+            }
+            $detailNamaPimpinanJson = json_encode($detailNamaPimpinan);
+
+            // Process detail_nomor_pic_pimpinan
+            foreach ($nomorHpPimpinan as $value) {
+                $detailNomorPicPimpinan[] = [
+                    'nomor_hp_pimpinan' => $value
+                ];
+            }
+            $detailNomorPicPimpinanJson = json_encode($detailNomorPicPimpinan);
+
+            // Process detail_nama_pic_reviewer
+            foreach ($namaPicReviewer as $value) {
+                $detailNamaPicReviewer[] = [
+                    'nama_pic_reviewer' => $value
+                ];
+            }
+            $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer);
+
+            // Process detail_nomor_hp_pic_reviewer
+            foreach ($nomorHpPicReviewer as $value) {
+                $detailNomorHpPicReviewer[] = [
+                    'nomor_hp_pic_reviewer' => $value
+                ];
+            }
+            $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer);
+
+            // Process detail_nama_pic_admin
+            foreach ($namaPicAdmin as $value) {
+                $detailNamaPicAdmin[] = [
+                    'nama_pic_admin' => $value
+                ];
+            }
+            $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin);
+
+            // Process detail_nomor_hp_pic_admin
+            foreach ($nomorHpPicAdmin as $value) {
+                $detailNomorHpPicAdmin[] = [
+                    'nomor_hp_pic_admin' => $value
+                ];
+            }
+            $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin);
+
+            // Process detail_nama_pic_marketing
+            foreach ($namaPicMarketing as $value) {
+                $detailNamaPicMarketing[] = [
+                    'nama_pic_marketing' => $value
+                ];
+            }
+            $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing);
+
+            // Process detail_nomor_hp_pic_marketing
+            foreach ($nomorHpPicMarketing as $value) {
+                $detailNomorHpPicMarketing[] = [
+                    'nomor_hp_pic_marketing' => $value
+                ];
+            }
+            $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing);
+
+
             $file = $request->file('attachment');
             $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : 'default.pdf';
 
@@ -69,12 +161,22 @@ class KJPPController extends Controller
                 Storage::copy('public/test/default.pdf', 'public/uploads_pdf/' . $filename);
             }
 
-            $validated['ijin_usaha_id'] = json_encode($request->input('ijin_usaha_id'));
+            $validated['detail_email_kantor'] = $detailEmailKantorJson;
-            $validated['jenis_aset_id'] = json_encode($request->input('jenis_aset_id'));
+            $validated['detail_nama_pimpinan'] = $detailNamaPimpinanJson;
-
+            $validated['detail_nomor_hp_pimpinan'] = $detailNomorPicPimpinanJson;
+            $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson;
+            $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson;
+            $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson;
+            $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson;
+            $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
+            $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
+            $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
+            $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
             // Tambahkan nama file ke data yang divalidasi
             $validated['attachment'] = $filename;
 
+            // dd($validated);
+
             // Simpan data ke database
             KJPP::create($validated);
 
@@ -101,8 +203,46 @@ class KJPPController extends Controller
         $cities = City::where('code', $kjpp->city_code)->get();
         $districts = District::where('code', $kjpp->district_code)->get();
         $villages  = Village::where('code', $kjpp->village_code)->get();
-        // dd($branches);
+        $detailEmailKantor = json_decode($kjpp->detail_email_kantor);
-        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
+        $detailNamaPimpinan = json_decode($kjpp->detail_nama_pimpinan);
+        $detailNomorHpPimpinan = json_decode($kjpp->detail_nomor_hp_pimpinan);
+        $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer);
+        $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer);
+        $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin);
+        $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin);
+        $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
+        $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
+
+        $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pimpinan' => $nama->nama_pimpinan,
+                'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan
+            ];
+        }, $detailNamaPimpinan, $detailNomorHpPimpinan));
+
+
+        $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_reviewer' => $nama->nama_pic_reviewer,
+                'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer
+            ];
+        }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
+
+        $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_admin' => $nama->nama_pic_admin,
+                'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin
+            ];
+        }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
+
+        $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_marketing' => $nama->nama_pic_marketing,
+                'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing
+            ];
+        }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));
+
+        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages', 'detailEmailKantor', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing', 'detailJoinPimpinan'));
     }
 
     /**
@@ -117,8 +257,49 @@ class KJPPController extends Controller
         $cities = City::where('province_code', $kjpp->province_code)->get();
         $districts = District::where('city_code', $kjpp->city_code)->get();
         $villages  = Village::where('district_code', $kjpp->district_code)->get();
+        $detailEmailKantor = json_decode($kjpp->detail_email_kantor);
+        $detailNamaPimpinan = json_decode($kjpp->detail_nama_pimpinan);
+        $detailNomorHpPimpinan = json_decode($kjpp->detail_nomor_hp_pimpinan);
+        $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer);
+        $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer);
+        $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin);
+        $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin);
+        $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
+        $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
 
-        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
+        // dd($detailNamaPimpinan);
+
+        $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pimpinan' => $nama->nama_pimpinan,
+                'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan
+            ];
+        }, $detailNamaPimpinan, $detailNomorHpPimpinan));
+
+        // dd($detailJoinPimpinan);
+
+        $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_reviewer' => $nama->nama_pic_reviewer,
+                'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer
+            ];
+        }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
+
+        $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_admin' => $nama->nama_pic_admin,
+                'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin
+            ];
+        }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
+
+        $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_marketing' => $nama->nama_pic_marketing,
+                'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing
+            ];
+        }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));
+
+        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing', 'detailEmailKantor', 'detailJoinPimpinan'));
     }
 
     /**
@@ -128,7 +309,102 @@ class KJPPController extends Controller
     {
         $validated = $request->validated();
 
+        // dd($validated);
+
         if ($validated) {
+            $detailEmailKantor = [];
+            $detailNamaPimpinan = [];
+            $detailNomorHpPimpinan = [];
+            $detailNamaPicReviewer = [];
+            $detailNomorHpPicReviewer = [];
+            $detailNamaPicAdmin = [];
+            $detailNomorHpPicAdmin = [];
+            $detailNamaPicMarketing = [];
+            $detailNomorHpPicMarketing = [];
+
+            $emailKantor = $request->input('detail_email_kantor.email_kantor', []);
+            $namaPimpinan = $request->input('detail_nama_pimpinan.nama_pimpinan', []);
+            $nomorHpPimpinan = $request->input('detail_nomor_hp_pimpinan.nomor_hp_pimpinan', []);
+            $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []);
+            $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []);
+            $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []);
+            $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []);
+            $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []);
+            $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []);
+
+            foreach ($emailKantor as $value) {
+                $detailEmailKantor[] = [
+                    'email_kantor' => $value
+                ];
+            }
+            // Encode to JSON and store
+            $detailEmailKantorJson = json_encode($detailEmailKantor);
+
+            // Process detail_nama_pimpinan
+            foreach ($namaPimpinan as $value) {
+                $detailNamaPimpinan[] = [
+                    'nama_pimpinan' => $value
+                ];
+            }
+            $detailNamaPimpinanJson = json_encode($detailNamaPimpinan);
+
+            // Process detail_nomor_hp_pimpinan
+            foreach ($nomorHpPimpinan as $value) {
+                $detailNomorHpPimpinan[] = [
+                    'nomor_hp_pimpinan' => $value
+                ];
+            }
+            $detailNomorHpPimpinanJson = json_encode($detailNomorHpPimpinan);
+
+            // Process detail_nama_pic_reviewer
+            foreach ($namaPicReviewer as $value) {
+                $detailNamaPicReviewer[] = [
+                    'nama_pic_reviewer' => $value
+                ];
+            }
+            $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer);
+
+            // Process detail_nomor_hp_pic_reviewer
+            foreach ($nomorHpPicReviewer as $value) {
+                $detailNomorHpPicReviewer[] = [
+                    'nomor_hp_pic_reviewer' => $value
+                ];
+            }
+            $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer);
+
+            // Process detail_nama_pic_admin
+            foreach ($namaPicAdmin as $value) {
+                $detailNamaPicAdmin[] = [
+                    'nama_pic_admin' => $value
+                ];
+            }
+            $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin);
+
+            // Process detail_nomor_hp_pic_admin
+            foreach ($nomorHpPicAdmin as $value) {
+                $detailNomorHpPicAdmin[] = [
+                    'nomor_hp_pic_admin' => $value
+                ];
+            }
+            $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin);
+
+            // Process detail_nama_pic_marketing
+            foreach ($namaPicMarketing as $value) {
+                $detailNamaPicMarketing[] = [
+                    'nama_pic_marketing' => $value
+                ];
+            }
+            $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing);
+
+            // Process detail_nomor_hp_pic_marketing
+            foreach ($nomorHpPicMarketing as $value) {
+                $detailNomorHpPicMarketing[] = [
+                    'nomor_hp_pic_marketing' => $value
+                ];
+            }
+            $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing);
+
+
             $file = $request->file('attachment');
             $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : null;
 
@@ -148,6 +424,18 @@ class KJPPController extends Controller
                 $validated['attachment'] = $kjpp->attachment ?? 'default.pdf';
             }
 
+            $validated['detail_email_kantor'] = $detailEmailKantorJson;
+            $validated['detail_nama_pimpinan'] = $detailNamaPimpinanJson;
+            $validated['detail_nomor_hp_pimpinan'] = $detailNomorHpPimpinanJson;
+            $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson;
+            $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson;
+            $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson;
+            $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson;
+            $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
+            $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
+            $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
+            $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
+
             // Perbarui data di database
             KJPP::where('id', $id)->update($validated);
 
@@ -189,8 +477,8 @@ class KJPPController extends Controller
             //abort(403, 'Sorry! You are not allowed to view users.');
         }
 
-        // Retrieve data from the database
+        // Retrieve data from the database order by code ascending
-        $query = KJPP::query();
+        $query = KJPP::query()->orderBy('code', 'asc');
 
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {

app/Http/Controllers/PermohonanController.php

@@ -21,10 +21,17 @@
     use Modules\Lpj\Models\Permohonan;
     use Modules\Lpj\Models\StatusPermohonan;
     use Modules\Lpj\Models\TujuanPenilaian;
+    use Modules\Lpj\Services\PermohonanHistoryService;
 
     class PermohonanController extends Controller
     {
         public $user;
+        protected $historyService;
+
+        public function __construct(PermohonanHistoryService $historyService)
+        {
+            $this->historyService = $historyService;
+        }
 
         public function index()
         {
@@ -36,8 +43,30 @@
             $validate = $request->validated();
             if ($validate) {
                 try {
+                    // Process file upload
+                    $filePath = null;
+                    if ($request->hasFile('attachment')) {
+                        $file = $request->file('attachment');
+                        $fileName = time() . '_' . $file->getClientOriginalName();
+                        $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+                    }
+
+                    // Get keterangan if provided
+                    $keterangan = $request->input('keterangan') ?? null;
+
+
                     // Save to database
-                    Permohonan::create($validate);
+                    $permohonan = Permohonan::create($validate);
+
+                    // Create history
+                    $this->historyService->createHistory(
+                        $permohonan,
+                        $validate['status'],
+                        $keterangan,
+                        [],  // beforeRequest is empty for new permohonan
+                        $permohonan->toArray(),
+                        $filePath
+                    );
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan created successfully');
                 } catch (Exception $e) {
@@ -107,16 +136,41 @@
 
         public function update(PermohonanRequest $request, $id)
         {
-            $validate = $request->validated();
+            $permohonan = Permohonan::findOrFail($id);
+            $beforeRequest = $permohonan->toArray();
 
+            $validate = $request->validated();
             if ($validate) {
                 try {
                     // Update in database
-                    $permohonan = Permohonan::find($id);
+
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
+
                     $permohonan->update($validate);
+
+                    $afterRequest = $permohonan->fresh()->toArray();
+                    // Process file upload
+                    $file = null;
+                    if ($request->hasFile('attachment')) {
+                        $file = $request->file('attachment');
+                    }
+
+                    // Get keterangan if provided
+                    $keterangan = $request->input('keterangan') ?? null;
+
+                    $status =$validate['status'] ?? $permohonan->status;
+
+                    $this->historyService->createHistory(
+                        $permohonan,
+                        $status,
+                        $keterangan,
+                        $beforeRequest,
+                        $afterRequest,
+                        $file
+                    );
+
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
                 } catch (Exception $e) {

app/Http/Controllers/ProsesPenawaranController.php

@@ -5,6 +5,7 @@ namespace Modules\Lpj\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
+use Carbon\Carbon;
 use Exception;
 use Maatwebsite\Excel\Facades\Excel;
 use Illuminate\Http\JsonResponse;
@@ -14,6 +15,7 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\DB;
 use Modules\Lpj\Models\KJPP;
 use Modules\Lpj\Models\PenawaranDetailTender;
+use Modules\Lpj\Models\PenawaranDetailTenderLog;
 use Modules\Lpj\Models\PenawaranTender;
 
 use Modules\Lpj\Models\Permohonan;
@@ -38,7 +40,7 @@ class ProsesPenawaranController extends Controller
         }
 
         // Retrieve data from the database
-        $query = PenawaranTender::query()->where('status', '=', 'tender')->withCount('penawarandetails');
+        $query = PenawaranTender::query()->whereIn('status', ['tender', 'proposal-tender'])->withCount('penawarandetails');
 
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
@@ -75,7 +77,7 @@ class ProsesPenawaranController extends Controller
 
         // Get the data for the current page
         //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-        $data = $query->with(['tujuanPenilaianKJPP','permohonan','permohonan.debiture'])->get();
+        $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -116,7 +118,6 @@ class ProsesPenawaranController extends Controller
                                 ->get();
 
             if ($penawaran) {
-
                 $i=0;
                 foreach($penawrandetails as $obj)
                 {
@@ -127,7 +128,18 @@ class ProsesPenawaranController extends Controller
                     }
                     $i++;
                 }
-
+                DB::enableQueryLog();
+                $kjpps = KJPP::whereNotIn('id', function($query) use ($id) {
+                                $query->select('kjpp_rekanan_id')
+                                    ->from('detail_penawaran')
+                                    ->where('penawaran_id', '=', $id)
+                                    ->where('status','=',1); // status=1 (masih aktif)
+                            })
+                            ->select('id', 'name', 'code')  // Pilih beberapa kolom sekaligus
+                            ->get();
+                $sql=DB::getQueryLog();
+                $data['sql'] = $sql;            
+                $data['kjpps'] = $kjpps;            
                 $data['penawaran'] = $penawaran;
                 $data['penawrandetails'] = $penawrandetails;
                 $data['status'] = 'success';
@@ -155,18 +167,13 @@ class ProsesPenawaranController extends Controller
         $data = array();
         $dataPenawaranDetail = array();
         if (request()->ajax()) {
-            $validator = ProsesPenawaranController::rulesEditnya($request, $id);
             
-            if ($validator['fails']) {
-                $data['message'] = $validator['errors'];
-                $data['status'] = 'error';
-            }
-            else
-            {
             try {
 
                 $dataPenawaranDetail = ['updated_by' => Auth::id(),
                             'updated_at' => now(),
+                            'no_proposal' => $request->no_proposal,
+                            'tgl_proposal' => $request->tgl_proposal,
                             'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
                         ];
 
@@ -187,13 +194,6 @@ class ProsesPenawaranController extends Controller
                         $newFileNameWithPath = $folderPath . $newFileName;
                         $dataPenawaranDetail['attachment'] = $myFile;
                         $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath;
-
-                            $penawarandetail = PenawaranDetailTender::findOrFail($id);
-                            $penawarandetail->update($dataPenawaranDetail);
-
-                            $data['detailpenawaran_id'] = $id;
-                            $data['status'] = 'success';
-                            $data['message'] ['message_success'] = array('Proses Penawarn KJPP successfully');
                     }
                     else
                     {
@@ -201,19 +201,18 @@ class ProsesPenawaranController extends Controller
                         $data['message'] ['check_file_jenis'] = array("Silahkan upload file pdf");
                     }
                 }
-                    else
-                    {
-                        $data['status'] = 'error';
-                        $data['message'] ['check_file'] = array("Silahkan upload file");
 
-                    }
+                $penawarandetail = PenawaranDetailTender::findOrFail($id);
+                $penawarandetail->update($dataPenawaranDetail);
 
+                $data['detailpenawaran_id'] = $id;
+                $data['status'] = 'success';
+                $data['message'] ['message_success'] = array('Proses Penawarn KJPP successfully');
             } catch (Exception $e) {
 
                 $data['status'] = 'error';
                 $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.');
             }            
-            }
 
         } else {
             $data['status'] = 'error';
@@ -339,4 +338,492 @@ class ProsesPenawaranController extends Controller
         $prosespenawaran  = PenawaranTender::find($id);
         return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
     }
+
+    public function updateDraft(Request $request, $id): JsonResponse
+    {
+        // $id = penawaran.id
+        // init
+        $data = array();
+        $dataPenawaranDetail = array();
+        $failed = 0;
+        
+        DB::beginTransaction();
+        try 
+        {
+            // update detail_penawaran 
+            $detail_penawaran_ids = $request->input('prosespenawaran_penawarandetail_id', []);
+            $no_proposals = $request->input('prosespenawaran_no_proposal', []);
+            $tgl_proposals = $request->input('prosespenawaran_tgl_proposal', []);
+            $biaya_penawarans = $request->input('prosespenawaran_biayaPenawaran', []);
+            $dokumen_penawarans = $request->file('prosespenawaran_dokumenPersetujuan');
+
+            $tot_kjpp = sizeof($detail_penawaran_ids);
+            if($tot_kjpp>0)
+            {
+                // loop
+                for($i=0;$i<$tot_kjpp;$i++)
+                {
+                    $detail_penawaran_id= $detail_penawaran_ids[$i]; 
+                    $dataPenawaranDetail  = [
+                        'no_proposal' => $no_proposals[$i],
+                        'tgl_proposal' => $tgl_proposals[$i], 
+                        'biaya_penawaran' => str_replace(".","",$biaya_penawarans[$i]), // 'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
+                        'updated_by' => Auth::id(),
+                        'updated_at' => now(),
+                    ];
+                    
+                    $penawarandetail = PenawaranDetailTender::find($detail_penawaran_id);
+                    if ($dokumen_penawarans) 
+                    {
+                        if (is_array($dokumen_penawarans) && array_key_exists($i, $dokumen_penawarans)) 
+                        {
+                            $file_tmp = $dokumen_penawarans[$i];
+                            if($file_tmp->isValid())
+                            { 
+                                $folderPath = 'uploads/penawaran/';
+
+                                $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
+                                $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
+
+                                $extension = $file_tmp->getClientOriginalExtension();
+                                // kjppID_penawaranID_namaFile_userID_time
+                                $newFileName = $penawarandetail->kjpp_rekanan_id.'_'.$penawarandetail->penawaran_id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
+                                Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
+
+                                $newFileNameWithPath = $folderPath . $newFileName;
+                                $dataPenawaranDetail['attachment'] = $myFile;
+                                $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath;
+                            }
+                           
+                        }
+                        
+                    }
+                    
+                    $checkStatus = $penawarandetail->update($dataPenawaranDetail); 
+                    if(!$checkStatus)
+                        $failed++;
+                }
+                
+                if($failed>0)
+                {
+                    DB::rollBack();
+                    $data['status'] = 'error';
+                    $data['message'] ['message_error'] = array('Proses Draft Penawaran KJPP failed');
+                }
+                else
+                {
+                    DB::commit();
+                    $data['status'] = 'success';
+                    $data['message'] ['message_success'] = array('Proses Draft Penawaran KJPP successfully');
+                }
+                
+            }
+            else
+            {
+                $data['status'] = 'error';
+                $data['message'] ['message_error'] = array('Data inti tidak ada.');
+            }
+         
+        } 
+        catch (Exception $e) 
+        {
+            // dd($e);
+            DB::rollBack();
+            $data['status'] = 'error';
+            $data['message'] ['message_error_try_catch'] = array('Proses Draft Penawaran KJPP failed.');
+        }
+
+        return response()->json($data);
+    }
+
+    public function store(Request $request): JsonResponse
+    {
+        // init
+        $data = array();
+        // $data['request']=$request->all();
+        $dataPenawaranDetail = array();
+        try 
+        {
+            $dataPenawaranDetail  = [
+                'penawaran_id' => $request->penawaran_id,
+                'kjpp_rekanan_id' => $request->kjpp_id,
+                'created_by' => Auth::id(),
+                'created_at' => Carbon::now()
+            ];
+
+            PenawaranDetailTender::create($dataPenawaranDetail);
+            
+            $data['status'] = 'success';
+            $data['message'] ['message_success'] = array('Proses Tambah KJPP successfully');
+        }
+        catch (Exception $e) 
+        {
+            // dd($e);
+            $data['status'] = 'error';
+            $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP failed.');
+        }           
+
+        return response()->json($data);
+    }
+
+    public function editulang($id)
+    {
+        // id ==> penawaran.id
+        return view('lpj::prosespenawaran.editulang', compact('id'));
+    }
+
+    public function setDataUlang(Request $request): JsonResponse
+    {
+        $data = array();
+        $penawaran = array();
+        $penawrandetails = array();
+
+        if (request()->ajax()) {
+            $id = $request->id;
+            $penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id);
+
+            if ($penawaran) {
+                $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)
+                                ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
+                                ->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
+                                ->where('detail_penawaran.status','=',1)
+                                ->get();
+
+                $i=0;
+                foreach($penawrandetails as $obj)
+                {
+                    if($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan))
+                    {
+                        $penawrandetails_path = Storage::url($obj->dokumen_persetujuan);
+                        $penawrandetails[$i]['dokumen_persetujuan']=$penawrandetails_path;
+                    }
+                    $i++;
+                }
+
+                $penawaranString = "";
+                if($penawaran->status)
+                {
+                    $penawaranString = convertSlug($penawaran->status);
+                    $penawaran->status = $penawaranString;
+                }
+
+                $kjpps = KJPP::whereNotIn('id', function($query) use ($id) {
+                            $query->select('kjpp_rekanan_id')
+                                ->from('detail_penawaran')
+                                ->where('penawaran_id', '=', $id)
+                                ->where('status','=',1); // status=1 (masih aktif)
+                        })
+                        ->select('id', 'name', 'code')  // Pilih beberapa kolom sekaligus
+                        ->get();
+                                    
+                $data['kjpps'] = $kjpps;
+                $data['penawaran'] = $penawaran;
+                $data['penawrandetails'] = $penawrandetails;
+                $data['status'] = 'success';
+                $data['message']['message_success'] = array("data successfully found");
+            } else {
+                $data['status'] = 'error';
+                $data['penawaran'] = null;
+                $data['penawrandetails'] = null;
+                $data['message']['message_data'] = array("data not found");
+            }
+        } else {
+            $data['status'] = 'error';
+            $data['message']['message_ajax'] = array("no ajax request");
+        }
+
+        return response()->json($data);
+    }
+
+    public function updateKJPPStatusUlang(Request $request, $id): JsonResponse
+    {
+        // message menggunakan SweetAlert2
+        // init
+        $data = array();
+        $dataDetailPenawaran = array();
+        // cek masa aktif penawaran
+        $detailpenawaran  = PenawaranDetailTender::find($id);
+        $checkActiveDateRange = checkActiveDateRangePenawaran($detailpenawaran->penawaran_id);
+        // cek masa aktif penawaran
+
+        // cek apakah blm di approve (penawaran.status = proposal-tender)
+        $penawaran = PenawaranTender::find($detailpenawaran->penawaran_id);
+        // cek apakah blm di approve (penawaran.status = proposal-tender)
+        if($checkActiveDateRange && ('proposal-tender'==$penawaran->status))
+        {
+            try {
+                
+                $data['id']=$id;
+
+                $dataDetailPenawaran = ['status' => '0',
+                    'updated_by' => Auth::id(),
+                    'updated_at' => now()
+                ];
+
+                $detailpenawaran->update($dataDetailPenawaran);
+
+                $data['status'] = 'success';
+                $data['message'] ['message_success'] = array('Sukses delete Penawaran KJPP '.$request->kjppName);
+            } catch (Exception $e) {
+
+                $data['status'] = 'error';
+                $data['message'] ['message_error_try_catch'] = array("Gagal delete Penawaran KJPP ".$request->kjppName);
+                // $data['message']['message_error'] = array("Gagal delete Penawaran KJPP ".$request->kjppName);
+            }
+        }
+        else
+        {
+            $data['status'] = 'error';
+            $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
+            // $data['message']['message_error'] = array("Penawaran sudah di tutup");
+        }    
+
+        return response()->json($data);
+    }
+
+    public function updateulang(Request $request, $id): JsonResponse
+    {
+        // id ==> detail_penawaran.id
+        // init
+        $data = array();
+        $dataDetailPenawaranLog = array();
+        $dataDetailPenawaran = array();
+        $pleaseCommit= true;
+        if (request()->ajax()) {
+           
+            $validator = ProsesPenawaranController::rulesEditUlangnya($request, $id);
+
+            if ($validator['fails']) {
+                $data['message'] = $validator['errors'];
+                $data['status'] = 'error';
+            }
+            else
+            {
+                // cek masa aktif penawaran
+                $detailpenawaran  = PenawaranDetailTender::find($id);
+                $checkActiveDateRange = checkActiveDateRangePenawaran($detailpenawaran->penawaran_id);
+                // cek masa aktif penawaran
+
+                // cek apakah blm di approve (penawaran.status = proposal-tender)
+                $penawaran = PenawaranTender::find($detailpenawaran->penawaran_id);
+                // cek apakah blm di approve (penawaran.status = proposal-tender)
+                if($checkActiveDateRange && ('proposal-tender'==$penawaran->status))
+                {
+                    DB::beginTransaction();
+                    try {
+
+                        $dataDetailPenawaranLog = [
+                            'detail_penawaran_id' =>$detailpenawaran->id,
+                            'kjpp_rekanan_id'     =>$detailpenawaran->kjpp_rekanan_id,
+                            'penawaran_id'        =>$detailpenawaran->penawaran_id,
+                            'biaya_penawaran'     =>$detailpenawaran->biaya_penawaran,
+                            'no_proposal'         =>$detailpenawaran->no_proposal,
+                            'tgl_proposal'        =>$detailpenawaran->tgl_proposal,
+                            'attachment'          =>$detailpenawaran->attachment,
+                            'dokumen_persetujuan' =>$detailpenawaran->dokumen_persetujuan,
+                            'status'              =>$detailpenawaran->status,
+                            'authorized_status'   =>$detailpenawaran->authorized_status,
+                            'authorized_at'       =>$detailpenawaran->authorized_at,
+                            'authorized_at'       =>$detailpenawaran->authorized_at,
+                            'created_at'          =>$detailpenawaran->created_at,
+                            'updated_at'          =>$detailpenawaran->updated_at,
+                            'deleted_at'          =>$detailpenawaran->deleted_at,
+                            'created_by'          =>$detailpenawaran->created_by,
+                            'updated_by'          =>$detailpenawaran->updated_by,
+                            'deleted_by'          =>$detailpenawaran->deleted_by
+
+                        ];
+
+                        PenawaranDetailTenderLog::create($dataDetailPenawaranLog);
+
+                        $biaya_penawaran="";
+                        if($request->biaya_penawaran)
+                            $biaya_penawaran= str_replace(".","",$request->biaya_penawaran);
+                        $dataDetailPenawaran = ['updated_by' => Auth::id(),
+                                                'updated_at' => now(),
+                                                'no_proposal' => $request->no_proposal,
+                                                'tgl_proposal' => $request->tgl_proposal,
+                                                'biaya_penawaran' => $biaya_penawaran
+                                            ];
+
+                        if ($request->hasFile('dokumen_persetujuan'))
+                        {
+                            $file_tmp = $request->file('dokumen_persetujuan');
+                            $folderPath = 'uploads/penawaran/';
+                            if ($file_tmp->isValid())
+                            {
+                                $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
+                                $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
+
+                                $extension = $file_tmp->getClientOriginalExtension();
+                                // kjppID_penawaranID_namaFile_userID_time
+                                $newFileName = $request->kjpp_rekanan_id.'_'.$id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
+                                Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
+
+                                $newFileNameWithPath = $folderPath . $newFileName;
+                                $dataDetailPenawaran['attachment'] = $myFile;
+                                $dataDetailPenawaran['dokumen_persetujuan'] = $newFileNameWithPath;
+                            }
+                            else
+                            {
+                                $pleaseCommit=false;
+                                $data['status'] = 'error';
+                                $data['message']['check_file_jenis'] = array("Silahkan upload file pdf");
+                            }
+                        }
+                        else
+                        {
+                            $data['status'] = 'error';
+                            $data['message']['check_file'] = array("Silahkan upload file");
+
+                        }
+
+                        $detailpenawaran->update($dataDetailPenawaran);
+
+                        if($pleaseCommit)
+                        {
+                            DB::commit();
+
+                            $data['id'] = $id;
+                            $data['detailpenawaran'] = $detailpenawaran;
+                            $data['status'] = 'success';
+                            $data['message']['message_success'] = array('Proses Penawarn KJPP Ulang successfully');
+                        }
+                        else
+                        {
+                            DB::rollBack();
+                            $data['status'] = 'error';
+                            $data['message']['message_error'] = array("Proses Penawarn KJPP Ulang failed..");
+                        }
+
+                    } catch (Exception $e) {
+                        DB::rollBack();
+                        $data['status'] = 'error';
+                        $data['message']['message_error_try_catch'] = array('Proses Penawarn KJPP Ulang failed.');
+                    }
+                }
+                else
+                {
+                    $data['status'] = 'error';
+                    $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
+                }
+
+            }
+
+        } else {
+            $data['status'] = 'error';
+            $data['message']['message_ajax'] = array("no ajax request");
+        }
+
+        return response()->json($data);
+    }
+
+    public function rulesEditUlangnya($request, $id)
+    {
+        $validateIt = [
+            // 'name' diambil dari definisi parameter yang di kirim pada POST Data
+            'no_proposal' => 'required',
+            'tgl_proposal' => 'required',
+            'biaya_penawaran' => 'required',
+            'dokumen_persetujuan' => 'required|file|mimes:pdf'
+        ];
+
+        $messageIt = [
+            'no_proposal.required' => 'Silahkan isi No Proposal',
+            'tgl_proposal.required' => 'Silahkan isi Tanggal Penawaran',
+            'biaya_penawaran.required' => 'Silahkan isi Biaya Penawaran',
+            'dokumen_persetujuan.required' => 'Silahkan isi dokumen',
+            'dokumen_persetujuan.file' => 'Silahkan isi file',
+            'dokumen_persetujuan.mimes' => 'Silahkan upload pdf'
+        ];
+
+        $validator = Validator::make($request->all(), $validateIt, $messageIt);
+
+        $data['fails'] = $validator->fails();
+        $data['errors'] = $validator->errors();
+
+        return $data;
+    }
+
+    public function storeUlang(Request $request): JsonResponse
+    {
+        // init
+        $data = array();
+        // $data['request']=$request->all();
+        $dataDetailPenawaran = array();
+        // cek masa aktif penawaran
+        $checkActiveDateRange = checkActiveDateRangePenawaran($request->penawaran_id);
+        // cek masa aktif penawaran
+
+        // cek apakah blm di approve (penawaran.status = proposal-tender)
+        $penawaran = PenawaranTender::find($request->penawaran_id);
+        // cek apakah blm di approve (penawaran.status = proposal-tender)
+        if($checkActiveDateRange && ('proposal-tender'==$penawaran->status))
+        {
+            try 
+            {
+                $biaya_penawaran="";
+                if($request->biaya_penawaran)
+                    $biaya_penawaran= str_replace(".","",$request->biaya_penawaran);
+                $dataDetailPenawaran  = [
+                    'kjpp_rekanan_id' => $request->kjpp_rekanan_id,
+                    'no_proposal' => $request->no_proposal,
+                    'tgl_proposal' => $request->tgl_proposal,
+                    'biaya_penawaran' => $biaya_penawaran,
+                    'penawaran_id' => $request->penawaran_id,
+                    'created_by' => Auth::id(),
+                    'created_at' => Carbon::now()
+                ];
+
+                if ($request->hasFile('dokumen_persetujuan'))
+                {
+                    $file_tmp = $request->file('dokumen_persetujuan');
+                    $folderPath = 'uploads/penawaran/';
+                    if ($file_tmp->isValid())
+                    {
+                        $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
+                        $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
+
+                        $extension = $file_tmp->getClientOriginalExtension();
+                        // kjppID_penawaranID_namaFile_userID_time
+                        $newFileName = $request->kjpp_rekanan_id.'_'.$request->penawaran_id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
+                        Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
+
+                        $newFileNameWithPath = $folderPath . $newFileName;
+                        $dataDetailPenawaran['attachment'] = $myFile;
+                        $dataDetailPenawaran['dokumen_persetujuan'] = $newFileNameWithPath;
+                    }
+                    else
+                    {
+                        $pleaseCommit=false;
+                        $data['status'] = 'error';
+                        $data['message']['check_file_jenis'] = array("Silahkan upload file pdf");
+                    }
+                }
+                else
+                {
+                    $data['status'] = 'error';
+                    $data['message']['check_file'] = array("Silahkan upload file");
+
+                }
+                PenawaranDetailTender::create($dataDetailPenawaran);
+                
+                $data['status'] = 'success';
+                $data['message'] ['message_success'] = array('Proses Tambah KJPP Ulang successfully');
+            }
+            catch (Exception $e) 
+            {
+                dd($e);
+                $data['status'] = 'error';
+                $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP Ulang failed.');
+            }           
+        }
+        else
+        {
+            $data['status'] = 'error';
+            $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
+        }
+
+        return response()->json($data);
+    }
 }

app/Http/Controllers/RegistrasiController.php

@@ -167,6 +167,8 @@
                             $dataku['jenis_penilaian_id'] =$request->jenis_penilaian;
                             $dataku['region_id'] =$request->region;
                             $dataku['status'] = 'registered';
+                            if($request->catatan2)
+                                $dataku['registrasi_catatan'] =$request->catatan2;
                         }
                         else
                         {

app/Http/Controllers/RegistrasiFinalController.php

@@ -5,8 +5,17 @@
     use App\Http\Controllers\Controller;
     use Carbon\Carbon;
     use Exception;
+    use Illuminate\Http\JsonResponse;
     use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    use Illuminate\Support\Facades\Storage;
+    use Illuminate\Support\Facades\Validator;
     use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Models\PenawaranTender;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\Regions;
+
     // use Modules\Location\Models\City;
     // use Modules\Location\Models\District;
     // use Modules\Location\Models\Province;
@@ -20,15 +29,6 @@ use Exception;
     // use Modules\Lpj\Models\JenisJaminan;
     // use Modules\Lpj\Models\JenisLegalitasJaminan;
     // use Modules\Lpj\Models\PemilikJaminan;
-    use Modules\Lpj\Models\Permohonan;
-    use Modules\Lpj\Models\JenisPenilaian;
-    use Modules\Lpj\Models\Regions;
-    use Illuminate\Http\JsonResponse;
-    use Illuminate\Support\Facades\Validator;
-    use Illuminate\Support\Facades\Auth;
-    use Illuminate\Support\Facades\DB;
-    
-use Modules\Lpj\Models\PenawaranTender;
 
     class RegistrasiFinalController extends Controller
     {
@@ -46,11 +46,12 @@ use Modules\Lpj\Models\PenawaranTender;
             }
 
             // Retrieve data from the database
-            $query =PenawaranTender::query()
+            $query = PenawaranTender::with(['permohonan', 'tujuanPenilaianKjpp'])->whereHas(
-                            ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                    'permohonan',
-                            ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                    function ($q) {
-                            ->where('penawaran.status','=','spk')
+                        $q->where('status', '=', 'spk');
-                            ->withCount('penawarandetails'); 
+                    },
+                )->withCount('penawarandetails');
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
@@ -87,27 +88,25 @@ use Modules\Lpj\Models\PenawaranTender;
 
             // Get the data for the current page
             //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-            $data = $query->get();
+            $data = $query->with(['permohonan'])->get();
             // dd($data);
             $i = 0;
-            foreach($data as $obj)
+            foreach ($data as $obj) {
-            {
+                if ($obj->tanggal_penilaian_sebelumnya) {
-                if($obj->tanggal_penilaian_sebelumnya)
+                    $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format(
-                {
+                        'd F Y H:i:s',
-                    $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
+                    );
                 }
 
-                if($obj->biaya_kjpp_sebelumnya)
+                if ($obj->biaya_kjpp_sebelumnya) {
-                {
                     $data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya);
-                    
                 }
 
                 // date_range
-                if($obj->start_date && $obj->end_date)
+                if ($obj->start_date && $obj->end_date) {
-                {
+                    $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . Carbon::parse(
-                    $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y');
+                            $obj->end_date,
-                    
+                        )->format('d M Y');
                 }
 
                 $i++;
@@ -128,13 +127,19 @@ use Modules\Lpj\Models\PenawaranTender;
                 'pageCount'       => $pageCount,
                 'page'            => $currentPage,
                 'totalCount'      => $totalRecords,
-                'data'            => $data
+                'data'            => $data,
             ]);
         }
 
         public function show($id)
         {
             $permohonan = Permohonan::find($id);
+            if ($permohonan->dokumen) {
+                $pdfSPK_path         = Storage::url($permohonan->dokumen);
+                $permohonan->dokumen = $pdfSPK_path;
+                $permohonan->dokumen = '| <a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>';
+            }
+
             return view('lpj::registrasifinal.show', compact('id', 'permohonan'));
         }
 
@@ -143,10 +148,10 @@ use Modules\Lpj\Models\PenawaranTender;
             return view('lpj::registrasifinal.edit', compact('id'));
         }
 
-        public function setData(Request $request): JsonResponse
+        public function setData(Request $request)
-        {
+        : JsonResponse {
-            $data = array();
+            $data  = [];
-            $datas = array();
+            $datas = [];
 
             if (request()->ajax()) {
                 $id    = $request->id;
@@ -159,36 +164,40 @@ use Modules\Lpj\Models\PenawaranTender;
                     $penawaran = PenawaranTender::where('nomor_registrasi', '=', $datas->nomor_registrasi)->first();
 
                     $penawaranString = "";
-                    if($penawaran->status)
+                    if ($penawaran->status) {
-                    {
                         $penawaranString   = convertSlug($penawaran->status);
                         $penawaran->status = $penawaranString;
                     }
 
+                    if ($datas->dokumen) {
+                        $pdfSPK_path    = Storage::url($datas->dokumen);
+                        $datas->dokumen = $pdfSPK_path;
+                    }
+
                     $data['status']                     = 'success';
                     $data['regions']                    = $regions;
                     $data['penawaran']                  = $penawaran;
                     $data['datas']                      = $datas;
-                    $data['message']['message_success'] = array("data successfully found");
+                    $data['message']['message_success'] = ["data successfully found"];
                 } else {
                     $data['status']                  = 'error';
                     $data['datas']                   = null;
-                    $data['message']['message_data'] = array("data not found");
+                    $data['message']['message_data'] = ["data not found"];
                 }
             } else {
                 $data['status']                  = 'error';
-                $data['message']['message_ajax'] = array("no ajax request");
+                $data['message']['message_ajax'] = ["no ajax request"];
             }
 
             return response()->json($data);
         }
 
-        public function update(Request $request, $id): JsonResponse
+        public function update(Request $request, $id)
-        {
+        : JsonResponse {
             // init
-            $data = array();
+            $data           = [];
-            $dataPermohonan = array();
+            $dataPermohonan = [];
-            $dataPenawaran = array();
+            $dataPenawaran  = [];
 
             if (request()->ajax()) {
                 $validator = RegistrasiFinalController::rulesEditnya($request, $id);
@@ -196,12 +205,9 @@ use Modules\Lpj\Models\PenawaranTender;
                 if ($validator['fails']) {
                     $data['message'] = $validator['errors'];
                     $data['status']  = 'error';
-                } 
+                } else {
-                else
-                {
                     DB::beginTransaction();
                     try {
-
                         // update table permohonan => status (registrasi-final), region_id, keterangan, authorized_at, authorized_status, authorized_by
                         // update table penawaran  => status (registrasi-final)
                         $dataPermohonan = [
@@ -210,14 +216,15 @@ use Modules\Lpj\Models\PenawaranTender;
                             'keterangan'        => $request->catatan,
                             'authorized_at'     => now(),
                             'authorized_status' => 1,
-                                    'authorized_by' => Auth::id()                                    
+                            'authorized_by'     => Auth::id(),
                         ];
 
                         $dataPenawaran = ['status' => 'registrasi-final'];
 
 
                         $permohonan = Permohonan::find($id);
-                        $penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();              
+                        $penawaran  = PenawaranTender::where('nomor_registrasi', '=', $permohonan->nomor_registrasi)
+                                                     ->first();
 
                         $permohonan->update($dataPermohonan);
                         $penawaran->update($dataPenawaran);
@@ -225,21 +232,19 @@ use Modules\Lpj\Models\PenawaranTender;
                         DB::commit();
 
                         $data['status']                     = 'success';
-                        $data['message']['message_success'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' successfully');
+                        $data['message']['message_success'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' successfully'];
                     } catch (Exception $e) {
                         DB::rollBack();
                         $data['status']                       = 'error';
-                        $data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.');
+                        $data['message']['message_try_catch'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' failed.'];
                     }
                 }
-                
             } else {
                 $data['status']                  = 'error';
-                $data['message']['message_ajax'] = array("no ajax request");
+                $data['message']['message_ajax'] = ["no ajax request"];
             }
 
             return response()->json($data);
-
         }
 
         public function rulesEditnya($request, $id)
@@ -254,7 +259,7 @@ use Modules\Lpj\Models\PenawaranTender;
 
             $messageIt = [
                 'region.required'  => 'Silahkan pilih Region',
-                'catatan.required' => 'Silahkan isi Catatan'
+                'catatan.required' => 'Silahkan isi Catatan',
             ];
 
             $validator = Validator::make($request->all(), $validateIt, $messageIt);

app/Http/Controllers/SpkController.php

@@ -4,7 +4,7 @@ namespace Modules\Lpj\Http\Controllers;
 
 use Carbon\Carbon;
 use App\Http\Controllers\Controller;
-use Barryvdh\DomPDF\Facade\Pdf;
+use Barryvdh\DomPDF\Facade\Pdf; // https://github.com/barryvdh/laravel-dompdf
 use Exception;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -34,18 +34,15 @@ use Illuminate\Support\Facades\Auth;
             }
 
             // Retrieve data from the database
-            $query =Permohonan::query()
+            $query =Permohonan::query()->with(['penawaran','penawaran.tujuanPenilaianKjpp'])
-                        ->leftJoin('penawaran', 'penawaran.nomor_registrasi','=','permohonan.nomor_registrasi')
+                        ->where('permohonan.status','=','spk');
-                        ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
-                        ->where('permohonan.status','=','spk')
-                        ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name', 'permohonan.dokumen as dokumenSPK');
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
                     $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('penawaran.tanggal_permohonan', 'LIKE', '%' . $search . '%');
 
                     $q->orWhere('status', 'LIKE', '%' . $search . '%');
                 });
@@ -99,6 +96,14 @@ use Illuminate\Support\Facades\Auth;
 
                 }
 
+                // data dokumen_spk
+                if($obj->dokumen)
+                {
+                    $spkpenawaran_path = Storage::url($obj->dokumen);
+                    // dd($spkpenawaran_path);
+                    $data[$i]->dokumen = $spkpenawaran_path;
+                }
+
                 $i++;
             }
 
@@ -235,4 +240,10 @@ use Illuminate\Support\Facades\Auth;
 
             return view('lpj::spk.dokumennya', compact('data', 'penawaran'));
         }
+
+        public function download($id) {
+            $document = Permohonan::find($id);
+
+            return response()->download(storage_path('app/public/' .$document->dokumen));
+        }
     }

app/Http/Requests/KJPPRequest.php

@@ -3,7 +3,6 @@
 namespace Modules\Lpj\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use daengdeni\LaravelIdGenerator\IdGenerator;
 
 class KJPPRequest extends FormRequest
 {
@@ -17,21 +16,30 @@ class KJPPRequest extends FormRequest
             'jenis_kantor' => 'required',
             'nomor_ijin_usaha' => 'required',
             'province_code' => 'required',
-            'city_code' => 'required',
+            'city_code' => 'nullable',
-            'district_code' => 'required',
+            'district_code' => 'nullable',
-            'village_code' => 'required',
+            'village_code' => 'nullable',
             'address' => 'required',
-            'postal_code' => 'required|numeric',
+            'postal_code' => 'nullable|numeric',
-            'nomor_telepon_kantor' => 'required|numeric|digits_between:8,15',
+            'nomor_telepon_kantor' => 'nullable|numeric|digits_between:8,15',
             'email_kantor' => 'required|email',
+            'detail_email_kantor' => 'nullable',
             'nama_pimpinan' => 'required|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pimpinan' => 'nullable',
             'nomor_hp_pimpinan' => 'required|numeric|digits_between:10,15',
-            'nama_pic_reviewer' => 'required|string|not_regex:/^\d+$/|max:255',
+            'detail_nomor_pic_pimpinan' => 'nullable',
-            'nomor_hp_pic_reviewer' => 'required|numeric|digits_between:10,15',
+            'nama_pic_reviewer' => 'nullable|string|not_regex:/^\d+$/|max:255',
-            'nama_pic_admin' => 'required|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_reviewer' => 'nullable',
-            'nomor_hp_pic_admin' => 'required|numeric|digits_between:10,15',
+            'nomor_hp_pic_reviewer' => 'nullable|numeric|digits_between:10,15',
-            'nama_pic_marketing' => 'required|string|not_regex:/^\d+$/|max:255',
+            'detail_nomor_hp_pic_reviewer' => 'nullable',
-            'nomor_hp_pic_marketing' => 'required|numeric|digits_between:10,15',
+            'nama_pic_admin' => 'nullable|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_admin' => 'nullable',
+            'nomor_hp_pic_admin' => 'nullable|numeric|digits_between:10,15',
+            'detail_nomor_hp_pic_admin' => 'nullable',
+            'nama_pic_marketing' => 'nullable|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_marketing' => 'nullable',
+            'nomor_hp_pic_marketing' => 'nullable|numeric|digits_between:10,15',
+            'detail_nomor_hp_pic_marketing' => 'nullable',
             'ijin_usaha_id' => 'required|array',
             'ijin_usaha_id.*' => 'exists:ijin_usaha,code',
             'jenis_aset_id' => 'required|array',
@@ -69,13 +77,8 @@ class KJPPRequest extends FormRequest
             'nomor_ijin_usaha.required' => 'Nomor Ijin Usaha Wajib diisi!',
             'nomor_ijin_usaha.max'   => 'Nomor Ijin Usaha maksimal 255 huruf!',
             'province_code.required' => 'Provinsi Wajib diisi!',
-            'city_code.required' => 'Kota / Kabupaten Wajib diisi!',
-            'district_code.required' => 'Kecamatan Wajib diisi!',
-            'village_code.required' => 'Kelurahan Wajib diisi!',
-            'postal_code.required' => 'Kode Pos Wajib diisi!',
             'postal_code.numeric' => 'Kode Pos harus berupa angka!',
             'address.required' => 'Alamat Kantor Wajib diisi!',
-            'nomor_telepon_kantor.required' => 'Nomor Telepon Kantor Wajib diisi!',
             'nomor_telepon_kantor.numeric' => 'Nomor Telepon Kantor harus berupa angka!',
             'nomor_telepon_kantor.digits_between' => 'Nomor Telepon Kantor minimum 8 digit dan maksimum 15 digit!',
             'email_kantor.required' => 'Email Kantor Wajib diisi!',
@@ -85,25 +88,17 @@ class KJPPRequest extends FormRequest
             'nomor_hp_pimpinan.required' => 'Nomor HP Pimpinan Wajib diisi!',
             'nomor_hp_pimpinan.numeric' => 'Nomor HP Pimpinan harus berupa angka!',
             'nomor_hp_pimpinan.digits_between' => 'Nomor HP Pimpinan minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_reviewer.required' => 'Nama PIC Reviewer Wajib diisi!',
             'nama_pic_reviewer.not_regex' => 'Nama PIC Reviewer harus berupa huruf!',
-            'nomor_hp_pic_reviewer.required' => 'Nomor HP PIC Reviewer Wajib diisi!',
             'nomor_hp_pic_reviewer.numeric' => 'Nomor HP PIC Reviewer harus berupa angka!',
             'nomor_hp_pic_reviewer.digits_between' => 'Nomor HP PIC Reviewer minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_admin.required' => 'Nama PIC Admin Wajib diisi!',
             'nama_pic_admin.not_regex' => 'Nama PIC Admin harus berupa huruf!',
-            'nomor_hp_pic_admin.required' => 'Nomor HP PIC Admin Wajib diisi!',
             'nomor_hp_pic_admin.numeric' => 'Nomor HP PIC Admin harus berupa angka!',
             'nomor_hp_pic_admin.digits_between' => 'Nomor HP PIC Admin minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_marketing.required' => 'Nama PIC Marketing Wajib diisi!',
             'nama_pic_marketing.not_regex' => 'Nama PIC Marketing harus berupa huruf!',
-            'nomor_hp_pic_marketing.required' => 'Nomor HP PIC Marketing Wajib diisi!',
             'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!',
             'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!',
             'ijin_usaha_id.required' => 'Ijin Usaha Wajib diisi!',
-            'ijin_usaha_id.min' => 'Ijin Usaha Wajib diisi minimal satu atau lebih!',
             'jenis_aset_id.required' => 'Jenis Aset Wajib diisi!',
-            'jenis_aset_id.min' => 'Jenis Aset Wajib diisi minimal satu atau lebih!',
             'attachment.mimes' => 'Attachment harus berformat pdf!',
             'attachment.max' => 'Attachment berukuran maksimum 1 MB!',
         ];

app/Http/Requests/PermohonanRequest.php

@@ -17,7 +17,7 @@
                 'nomor_registrasi'          => 'nullable|string|max:10',
                 'tanggal_permohonan'        => 'nullable|date',
                 'user_id'                   => 'nullable|exists:users,id',
-                'branch_id'                 => 'required|exists:branches,id',
+                'branch_id'                 => 'nullable|exists:branches,id',
                 'tujuan_penilaian_id'       => 'required|exists:tujuan_penilaian,id',
                 'debiture_id'               => 'required|exists:debitures,id',
                 'status'                    => 'nullable|string',
@@ -49,6 +49,7 @@
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
                     'branch_id'          => auth()->user()->branch_id,
+                    'status'             => 'order'
                 ]);
             }
         }

app/Models/DetailDokumenJaminan.php

@@ -16,6 +16,7 @@
             'jenis_legalitas_jaminan_id',
             'name',
             'dokumen_jaminan',
+            'dokumen_nomor',
             'keterangan',
             'details',
             'status',

app/Models/KJPP.php

@@ -18,29 +18,5 @@ class KJPP extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = [
+    protected $guarded = ['id'];
-        'code',
-        'name',
-        'jenis_kantor',
-        'nomor_ijin_usaha',
-        'province_code',
-        'city_code',
-        'district_code',
-        'village_code',
-        'address',
-        'postal_code',
-        'nomor_telepon_kantor',
-        'email_kantor',
-        'nama_pimpinan',
-        'nomor_hp_pimpinan',
-        'nama_pic_reviewer',
-        'nomor_hp_pic_reviewer',
-        'nama_pic_admin',
-        'nomor_hp_pic_admin',
-        'nama_pic_marketing',
-        'nomor_hp_pic_marketing',
-        'ijin_usaha_id',
-        'jenis_aset_id',
-        'attachment'
-    ];
 }

app/Models/PenawaranTender.php

@@ -32,9 +32,9 @@ class PenawaranTender extends Model
     }
 
     // menambahkan relasi tujuan penilaian KJPP
-    public function tujuanPenilaianKJPP()
+    public function tujuanPenilaianKjpp()
     {
-        return $this->hasMany(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id');
+        return $this->belongsTo(TujuanPenilaianKJPP::class, 'tujuan_penilaian_kjpp_id','id');
     }
 
     public function permohonan()
@@ -46,4 +46,6 @@ class PenawaranTender extends Model
     {
         return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
     }
+
+
 }

app/Models/Permohonan.php

@@ -89,4 +89,8 @@ class Permohonan extends Base
     {
         return $this->belongsTo(Regions::class,  'region_id');
     }
+
+    public function penawaran(){
+        return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
 }

app/Models/PermohonanHistory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\PermohonanHistoryFactory;
+
+class PermohonanHistory extends Base
+{
+    protected $fillable = [
+        'permohonan_id',
+        'status',
+        'keterangan',
+        'before_request',
+        'after_request',
+        'file_path',
+        'user_id'
+    ];
+
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Services/PermohonanHistoryService.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Modules\Lpj\Services;
+
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\PermohonanHistory;
+
+class PermohonanHistoryService
+{
+    public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $file = null)
+    {
+
+        $filePath = null;
+        if ($file) {
+            $filePath = $file->store('permohonan_history_files', 'public');
+        }
+
+
+        try {
+            $history = PermohonanHistory::create([
+                'permohonan_id' => $permohonan->id,
+                'status' => $status,
+                'keterangan' => $keterangan,
+                'before_request' => json_encode($beforeRequest),
+                'after_request' => json_encode($afterRequest),
+                'file_path' => $filePath,
+                'user_id' => auth()->id(),
+            ]);
+
+        } catch (\Exception $e) {
+            // Log the error
+            \Log::error('Error creating PermohonanHistory: ' . $e->getMessage());
+
+            // You might want to delete the uploaded file if the database operation fails
+            if ($filePath) {
+                \Storage::disk('public')->delete($filePath);
+            }
+
+            // Rethrow the exception or handle it as per your application's error handling policy
+            throw new \Exception('Failed to create PermohonanHistory: ' . $e->getMessage());
+        }
+    }
+}

database/migrations/2024_09_18_084905_create_kjpp_table.php

@@ -18,23 +18,30 @@ return new class extends Migration
             $table->string('jenis_kantor');
             $table->string('nomor_ijin_usaha');
             $table->string('province_code');
-            $table->string('city_code');
+            $table->string('city_code')->nullable();
-            $table->string('district_code');
+            $table->string('district_code')->nullable();
-            $table->string('village_code');
+            $table->string('village_code')->nullable();
             $table->string('address');
-            $table->string('postal_code');
+            $table->string('postal_code')->nullable();
-            $table->string('nomor_telepon_kantor');
+            $table->string('nomor_telepon_kantor')->nullable();
             $table->string('email_kantor');
+            $table->string('detail_email_kantor')->nullable();
             $table->string('nama_pimpinan');
             $table->string('nomor_hp_pimpinan');
-            $table->string('nama_pic_reviewer');
+            $table->string('nama_pic_reviewer')->nullable();
-            $table->string('nomor_hp_pic_reviewer');
+            $table->string('detail_nama_pic_reviewer')->nullable();
-            $table->string('nama_pic_admin');
+            $table->string('nomor_hp_pic_reviewer')->nullable();
-            $table->string('nomor_hp_pic_admin');
+            $table->string('detail_nomor_hp_pic_reviewer')->nullable();
-            $table->string('nama_pic_marketing');
+            $table->string('nama_pic_admin')->nullable();
-            $table->string('nomor_hp_pic_marketing');
+            $table->string('detail_nama_pic_admin')->nullable();
-            $table->string('ijin_usaha_id')->nullable();
+            $table->string('nomor_hp_pic_admin')->nullable();
-            $table->string('jenis_aset_id')->nullable();
+            $table->string('detail_nomor_hp_pic_admin')->nullable();
+            $table->string('nama_pic_marketing')->nullable();
+            $table->string('detail_nama_pic_marketing')->nullable();
+            $table->string('nomor_hp_pic_marketing')->nullable();
+            $table->string('detail_nomor_hp_pic_marketing')->nullable();
+            $table->string('ijin_usaha_id');
+            $table->string('jenis_aset_id');
             $table->string('attachment')->nullable();
             $table->boolean('status')->default(true)->nullable();
             $table->char('authorized_status', 1)->nullable();

database/migrations/2024_11_01_081201_create_kategori_form_analisa_inspeksi_table.php

@@ -15,6 +15,7 @@ return new class extends Migration
             $table->id();
             $table->string('name');
             $table->string('code');
+            $table->unsignedBigInteger('kategori_jenis_aset_id');  // Add this line
             $table->foreign('kategori_jenis_aset_id')->references('id')->on('kategori_jenis_aset');
             $table->boolean('status')->default(true);
             $table->char('authorized_status', 1)->nullable();

database/migrations/2024_11_07_044004_update_detail_dokumen_jaminan_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_dokumen_jaminan', function (Blueprint $table) {
+            $table->string('dokumen_nomor')->nullable()->after('dokumen_jaminan');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_dokumen_jaminan', function (Blueprint $table) {
+            $table->dropColumn('dokumen_nomor');
+        });
+    }
+};

database/migrations/2024_11_08_081149_create_permohonan_histories_table.php

@@ -4,20 +4,22 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
     public function up(): void
     {
-        Schema::create('penilaian_team', function (Blueprint $table) {
+        Schema::create('permohonan_histories', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('penilaian_id');
+            $table->unsignedBigInteger('permohonan_id');
-            $table->unsignedBigInteger('team_id');
+            $table->string('status');
+            $table->text('keterangan')->nullable();
+            $table->json('before_request')->nullable();
+            $table->json('after_request')->nullable();
+            $table->string('file_path')->nullable();
             $table->unsignedBigInteger('user_id')->nullable();
-            $table->string('role');
-            $table->boolean('status')->default(true);
-            $table->char('authorized_status', 1)->nullable();
             $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
@@ -25,6 +27,9 @@ return new class () extends Migration {
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
+
+            $table->foreign('permohonan_id')->references('id')->on('permohonan')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('set null');
         });
     }
 
@@ -33,6 +38,6 @@ return new class () extends Migration {
      */
     public function down(): void
     {
-        Schema::dropIfExists('penilai_team');
+        Schema::dropIfExists('permohonan_histories');
     }
 };

database/migrations/2024_11_08_085002_update_detail_penawaran_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+            $table->string('no_proposal')->nullable()->after('penawaran_id');
+            $table->date('tgl_proposal')->nullable()->after('no_proposal');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+             $table->dropColumn('no_proposal');
+            $table->dropColumn('tgl_proposal');
+        });
+    }
+};

database/migrations/2024_11_11_063934_update_kjpp_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('kjpp', function (Blueprint $table) {
+            $table->string('detail_nama_pimpinan')->nullable()->after('nama_pimpinan');
+            $table->string('detail_nomor_hp_pimpinan')->nullable()->after('nomor_hp_pimpinan');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('kjpp', function (Blueprint $table) {
+            $table->dropColumn('detail_nama_pimpinan');
+            $table->dropColumn('detail_nomor_hp_pimpinan');
+        });
+    }
+};

database/migrations/2024_11_12_191108_update_detail_penawaran_log_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_penawaran_logs', function (Blueprint $table) {
+            $table->string('no_proposal')->nullable()->after('penawaran_id');
+            $table->date('tgl_proposal')->nullable()->after('no_proposal');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_penawaran_logs', function (Blueprint $table) {
+            $table->dropColumn('no_proposal');
+            $table->dropColumn('tgl_proposal');
+        });
+    }
+};

database/migrations/2024_11_13_101804_create_penilaian_team_table.php

@@ -0,0 +1,38 @@
+<?php
+
+    use Illuminate\Database\Migrations\Migration;
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Support\Facades\Schema;
+
+    return new class () extends Migration {
+        /**
+         * Run the migrations.
+         */
+        public function up(): void
+        {
+            Schema::create('penilaian_team', function (Blueprint $table) {
+                $table->id();
+                $table->unsignedBigInteger('penilaian_id');
+                $table->unsignedBigInteger('team_id');
+                $table->unsignedBigInteger('user_id')->nullable();
+                $table->string('role');
+                $table->boolean('status')->default(true);
+                $table->char('authorized_status', 1)->nullable();
+                $table->timestamps();
+                $table->timestamp('authorized_at')->nullable();
+                $table->unsignedBigInteger('authorized_by')->nullable();
+                $table->softDeletes();
+                $table->unsignedBigInteger('created_by')->nullable();
+                $table->unsignedBigInteger('updated_by')->nullable();
+                $table->unsignedBigInteger('deleted_by')->nullable();
+            });
+        }
+
+        /**
+         * Reverse the migrations.
+         */
+        public function down(): void
+        {
+            Schema::dropIfExists('penilaian_team');
+        }
+    };

database/seeders/JenisLegalitasJaminanSeeder.php

@@ -17,6 +17,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ001',
                 'name' => 'Sertifikat',
                 'slug' => 'sertifikat',
+                'custom_field' => 'Luas Tanah',
+                'custom_field_type' => 'number',
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -29,6 +31,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ002',
                 'name' => 'SHGB',
                 'slug' => 'shgb',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -41,6 +45,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ003',
                 'name' => 'Copy PBB / NJOP Tahun Terakhir (Jika Ada)',
                 'slug' => 'copy-pbb-njop-tahun-terakhir-jika-ada',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -53,6 +59,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ004',
                 'name' => 'Copy NPWP Perusahaan/Perorangan',
                 'slug' => 'copy-npwp-perusahaanperorangan',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -65,6 +73,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ005',
                 'name' => 'Siteplan',
                 'slug' => 'siteplan',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -77,6 +87,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ006',
                 'name' => 'Surat Pernyataan Kebenaran Data (Surat Representasi)',
                 'slug' => 'surat-pernyataan-kebenaran-data-surat-representasi',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -85,6 +97,20 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'updated_by' => 1,
                 'deleted_by' => null
             ],
+            [
+                'code' => 'JLJ007',
+                'name' => 'IMB',
+                'slug' => 'imb',
+                'custom_field' => 'Luas Bangunan',
+                'custom_field_type' => 'number',
+                'status' => 1,
+                'created_at' => now(),
+                'updated_at' => now(),
+                'deleted_at' => null,
+                'created_by' => 1,
+                'updated_by' => 1,
+                'deleted_by' => null
+            ]
         ]);
     }
 }

database/seeders/LpjDatabaseSeeder.php

@@ -31,12 +31,12 @@ class LpjDatabaseSeeder extends Seeder
             TujuanPenilaianKJPPSeeder::class,
             IjinUsahaSeeder::class,
             JenisLaporanSeeder::class,
-            KJPPSeeder::class,
             DebitureSeeder::class,
             PermohonanSeeder::class,
             PemilikJaminanSeeder::class,
             DokumenJaminanSeeder::class,
             DetailDokumenJaminanSeeder::class,
+            KJPPSeeder::class,
             PenawaranSeeder::class,
             DetailPenawaranSeeder::class,
             PenilaianSeeder::class,

database/seeders/PermohonanSeeder.php

@@ -20,7 +20,7 @@ class PermohonanSeeder extends Seeder
                 'branch_id' => 1,
                 'tujuan_penilaian_id' => 1,
                 'debiture_id' => 1,
-                'status' => 'persetujuan-penawaran',
+                'status' => 'registered',
                 'created_at' => now(),
                 'updated_at' => now(),
                 'created_by' => 1,
@@ -38,7 +38,7 @@ class PermohonanSeeder extends Seeder
                 'branch_id' => 1,
                 'tujuan_penilaian_id' => 1,
                 'debiture_id' => 1,
-                'status' => 'tender',
+                'status' => 'registered',
                 'created_at' => now(),
                 'updated_at' => now(),
                 'created_by' => 1,

module.json

@@ -59,14 +59,6 @@
             "attributes": [],
             "permission": "",
             "roles": ["administrator", "admin"]
-          },
-          {
-            "title": "Data Proses Penawaran Ulang",
-            "path": "tender.prosespenawaranulang",
-            "classes": "",
-            "attributes": [],
-            "permission": "",
-            "roles": ["administrator", "admin"]
           }          
         ]
       },

resources/views/component/detail-jaminan.blade.php

@@ -77,16 +77,22 @@
                                         @if(isset($detail->dokumen_jaminan))
                                             @php
                                                 $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                                $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
                                             @endphp
                                             @foreach($dokumen_jaminan as $index => $dokumen)
+                                                <div class="flex w-full lg:w-[30%]">
                                                     @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
+                                                        @if(!empty($dokumen_nomor))
+                                                            <span class="flex-1 mt-2 text-info">Nomor Dokumen : {{ $dokumen_nomor[$index] }}</span>
+                                                        @endif
                                                         <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                                       class="badge badge-sm badge-outline mt-2 mr-2">
+                                                           class="flex-none badge badge-sm badge-outline mt-2 mr-2">
                                                             {{ basename($dokumen) }}
                                                             <i class="ki-filled ki-cloud-download"></i>
                                                         </a>
                                                     @endif
-                                                <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                                    <span class="flex-none badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                                </div>
                                                 <br>
                                             @endforeach
                                         @endif

resources/views/component/pdfviewer.blade.php

@@ -1,11 +1,17 @@
-<!-- Modal for PDF viewing -->
+<!-- Modal for PDF and Image viewing -->
-<div id="pdfModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex items-center justify-center hidden w-full">
+<div id="previewModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex items-center justify-center hidden w-full z-50">
     <div class="bg-white rounded-lg overflow-hidden shadow-xl transform transition-all min-w-3xl w-[1500px] h-[1200px]">
-        <div class="p-4 h-full">
+        <div class="p-4 h-full flex flex-col">
-            <button onclick="closePDFModal()" class="float-right text-2xl">
+            <div class="flex justify-between items-center mb-4">
+                <button id="downloadBtn" class="btn btn-primary btn-sm">
+                    <i class="ki-duotone ki-cloud-download me-1"><span class="path1"></span><span class="path2"></span></i>
+                    Download File
+                </button>
+                <button onclick="closePreviewModal()" class="text-2xl">
                     <i class="ki-filled ki-cross-square text-red-600"></i>
                 </button>
-            <div id="pdfViewer" class="h-full"></div>
+            </div>
+            <div id="previewContent" class="flex-grow"></div>
         </div>
     </div>
 </div>
@@ -13,13 +19,48 @@
 @push('scripts')
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfobject/2.3.0/pdfobject.min.js"></script>
     <script>
+        let currentFileUrl = '';
+
         function viewPDF(url) {
-            PDFObject.embed(url, "#pdfViewer");
+            currentFileUrl = url;
-            document.getElementById('pdfModal').classList.remove('hidden');
+            const fileExtension = url.split('.').pop().toLowerCase();
+            const previewContent = document.getElementById('previewContent');
+
+            if (['pdf'].includes(fileExtension)) {
+                PDFObject.embed(url, "#previewContent");
+            } else if (['jpg', 'jpeg', 'png', 'gif'].includes(fileExtension)) {
+                previewContent.innerHTML = `<img src="${url}" alt="Preview" class="max-w-full max-h-full object-contain">`;
+            } else {
+                previewContent.innerHTML = '<p class="text-center">Unsupported file type</p>';
             }
 
-        function closePDFModal() {
+            document.getElementById('previewModal').classList.remove('hidden');
-            document.getElementById('pdfModal').classList.add('hidden');
+            document.addEventListener('keydown', handleEscKey);
         }
+
+        function closePreviewModal() {
+            document.getElementById('previewModal').classList.add('hidden');
+            document.removeEventListener('keydown', handleEscKey);
+        }
+
+        function handleEscKey(event) {
+            if (event.key === 'Escape') {
+                closePreviewModal();
+            }
+        }
+
+        // Close modal when clicking outside the content
+        document.getElementById('previewModal').addEventListener('click', function(event) {
+            if (event.target === this) {
+                closePreviewModal();
+            }
+        });
+
+        // Download functionality
+        document.getElementById('downloadBtn').addEventListener('click', function() {
+            if (currentFileUrl) {
+                window.open(currentFileUrl, '_blank');
+            }
+        });
     </script>
 @endpush

resources/views/debitur/components/dokumen.blade.php

@@ -146,10 +146,10 @@
 
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
-                        Nama Dokumen
+                        Nomor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nama Dokumen">
+                        <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nomor">
                     </div>
                 </div>
 
@@ -160,23 +160,34 @@
                     <div class="flex flex-wrap items-baseline w-full">
                         <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
                             <div class="flex items-center gap-2">
-                                <input class="file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
+                                <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
-                                <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" accept=".pdf,image/*">
+                                <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
                             </div>
                             <div id="additional-files-{{ $n }}"></div>
                         </div>
 
+                        @if(isset($detail->dokumen_jaminan))
                             @if(isset($detail->dokumen_jaminan))
                                 @php
                                     $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
                                 @endphp
+                                <div class="flex flex-col w-full gap-2">
                                     @foreach($dokumen_jaminan as $index => $dokumen)
+                                        <div class="flex w-full lg:w-[30%]">
+                                            @if(!empty($dokumen_nomor))
+                                                <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : {{ $dokumen_nomor[$index] }}</span>
+                                            @endif
                                             <a href="{{ route('debitur.jaminan.download', ['id' => $debitur->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                   class="badge badge-sm badge-outline mt-2 mr-2">
+                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
                                                 {{ basename($dokumen) }}
                                                 <i class="ki-filled ki-cloud-download"></i>
                                             </a>
+                                        </div>
                                     @endforeach
+                                </div>
+                            @endif
                         @endif
                     </div>
                 </div>
@@ -234,10 +245,10 @@
 
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
-                        Nama Dokumen
+                        Nomor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input " type="text" id="name" name="name[]" value="" placeholder="Nama Dokumen">
+                        <input class="input " type="text" id="name" name="name[]" value="" placeholder="Nomor">
                     </div>
                 </div>
 
@@ -246,7 +257,14 @@
                         Dokumen Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="file-input" type="file" name="dokumen_jaminan[]" value="">
+                        <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
+                            <div class="flex items-center gap-2">
+                                <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" accept=".pdf,image/*">
+                                <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
+                            </div>
+                            <div id="additional-files-{{ $n }}"></div>
+                        </div>
                     </div>
                 </div>
 
@@ -281,8 +299,8 @@
                 </div>
                 @php $n++; @endphp
             @endforeach
-    </div>
         @endif
+    </div>
 
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56">
@@ -490,10 +508,10 @@
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
-                                Nama Dokumen
+                                Nomor
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input" type="text" name="name[]" value="${item.name || ''}" placeholder="Nama Dokumen">
+                                <input class="input" type="text" name="name[]" value="${item.name || ''}" placeholder="Nomor">
                             </div>
                         </div>
 
@@ -502,10 +520,13 @@
                                 Dokumen Jaminan
                             </label>
                             <div class="flex flex-wrap items-baseline w-full" id="file-container-${index}">
-                                ${item.dokumen_jaminan ? renderExistingFiles(item.dokumen_jaminan, debiturId, item.id) : ''}
+                                <div class="flex flex-col w-full gap-2">
+                                    ${item.dokumen_jaminan ? renderExistingFiles(item.dokumen_jaminan, debiturId, item.id, item.dokumen_nomor) : ''}
+                                </div>
                                 <div class="flex items-center gap-2 my-2 w-full">
-                                    <input class="file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                                    <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
-                                    <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
+                                    <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" accept=".pdf,image/*">
+                                    <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
                                 </div>
                             </div>
                         </div>
@@ -535,32 +556,14 @@
                 .catch(error => console.error('Error:', error));
         }
 
-        function renderExistingFiles(dokumenJaminan, debiturId, itemId) {
-            if (typeof dokumenJaminan === 'string') {
-                return `
-            <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="badge badge-sm badge-outline mt-2 mr-2">
-                ${dokumenJaminan.split('/').pop()}
-                <i class="ki-filled ki-cloud-download"></i>
-            </a>
-        `;
-            } else if (Array.isArray(dokumenJaminan)) {
-                return dokumenJaminan.map(file => `
-            <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${encodeURIComponent(file)}" class="badge badge-sm badge-outline mt-2 mr-2">
-                ${file.split('/').pop()}
-                <i class="ki-filled ki-cloud-download"></i>
-            </a>
-        `).join('');
-            }
-            return '';
-        }
-
         function addFileInput(index) {
             const container = document.getElementById(`file-container-${index}`);
             const newInput = document.createElement('div');
             newInput.className = 'flex items-center gap-2 mb-2 w-full';
             newInput.innerHTML = `
-                <input class="file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
-                <button type="button" class="btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
+                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" accept=".pdf,image/*">
+                <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
             `;
             container.appendChild(newInput);
         }
@@ -569,23 +572,53 @@
             button.closest('.flex.items-center.gap-2.mb-2').remove();
         }
 
-        function renderExistingFiles(dokumenJaminan, debiturId, itemId) {
+        function renderExistingFiles(dokumenJaminan, debiturId, itemId, dokumenNomor) {
-            if (typeof dokumenJaminan === 'string') {
+            if (typeof dokumenJaminan === 'string' && typeof dokumenNomor === 'string') {
                 return `
-                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="badge badge-sm badge-outline mt-2">
+                <div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="flex-none badge badge-sm badge-outline mt-2">
                         ${dokumenJaminan.split('/').pop()}
                         <i class="ki-filled ki-cloud-download"></i>
                     </a>
+                </div>
                 `;
-            } else if (Array.isArray(dokumenJaminan)) {
+            }else if (typeof dokumenJaminan === 'string' && dokumenNomor === null) {
-                return dokumenJaminan.map(file => `
+                return `
-                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="badge badge-sm badge-outline mt-2 mr-2">
+                <div class="flex w-full lg:w-[30%]">
-                        ${file.split('/').pop()}
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : --</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="flex-none badge badge-sm badge-outline mt-2">
+                        ${dokumenJaminan.split('/').pop()}
                         <i class="ki-filled ki-cloud-download"></i>
                     </a>
+                </div>
+                `;
+            } else if (Array.isArray(dokumenJaminan) && Array.isArray(dokumenNomor)) {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor[index] || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
+                `).join('');
+            } else if (Array.isArray(dokumenJaminan) && typeof dokumenNomor === 'string') {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor} || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
+                `).join('');
+            } else if (Array.isArray(dokumenJaminan) && dokumenNomor === 'null') {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor} || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
                 `).join('');
             }
-            return '';
+            return dokumenNomor;
         }
 
         function getCustomFieldInput(type, fieldName, value) {

resources/views/debitur/components/jaminan.blade.php

@@ -71,10 +71,23 @@
                             {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}
                         </span>
                         <div>
+                            @if(isset($detail->dokumen_jaminan))
+                                @php
+                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
+                                @endphp
+                                @foreach($dokumen_jaminan as $index => $dokumen)
                                         @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
-                            <a href="{{ route('debitur.jaminan.download',['id'=>$debitur->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2 badge-info"><i class="ki-filled ki-cloud-download mr-2"></i> Download</a>
+                                           <a href="{{ route('debitur.jaminan.download', ['id' => $debitur->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                                                {{ basename($dokumen) }}
+                                                <i class="ki-filled ki-cloud-download"></i>
+                                            </a>
+                                        @endif
+                                        <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                    <br>
+                                @endforeach
                             @endif
-                            <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($detail->dokumen_jaminan) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
                         </div>
                     </div>
                     <div class="border-t border-gray-300 border-dashed">

resources/views/kjpp/create.blade.php

@@ -222,12 +222,32 @@
                         <label class="form-label max-w-56">
                             Email Kantor
                         </label>
-                        <div class="flex flex-wrap items-baseline w-full">
+                        <div class="flex flex-wrap items-baseline w-full gap-1.5">
                             <input class="input  @error('email_kantor') border-danger  @enderror" type="text"
                                 name="email_kantor" value="{{ $kjpp->email_kantor ?? old('email_kantor') }}">
                             @error('email_kantor')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
+                            <div id="detail_email_kantor" class="flex flex-wrap items-center w-full gap-2">
+                                @if (isset($kjpp->detail_email_kantor))
+                                    @foreach ($detailEmailKantor as $detail_email_kantor)
+                                        <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input class="input  @error('email_kantor') border-danger  @enderror"
+                                                    type="text" name="detail_email_kantor[email_kantor][]"
+                                                    value="{{ $detail_email_kantor->email_kantor ?? old('detail_email_kantor.email_kantor') }}">
+                                                @error('email_kantor')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                            <button type="button"
+                                                class="btn btn-danger btn-xs delete-button-edit">Hapus</button>
+                                        </div>
+                                    @endforeach
+                                @endif
+                            </div>
+                            <button type="button" id="tambah_email_kantor" class="btn btn-primary btn-xs">Tambah
+                                Email Kantor</button>
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -253,6 +273,50 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pimpinan" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pimpinan) && isset($kjpp->detail_nomor_hp_pimpinan))
+                                @foreach (json_decode($detailJoinPimpinan) as $detail_pimpinan)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama Pimpinan
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pimpinan') border-danger  @enderror"
+                                                type="text" name="detail_nama_pimpinan[nama_pimpinan][]"
+                                                value="{{ $detail_pimpinan->nama_pimpinan ?? old('detail_nama_pimpinan.nama_pimpinan') }}">
+                                            @error('nama_pimpinan')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP Pimpinan
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nomor_hp_pimpinan') border-danger  @enderror"
+                                                type="text" name="detail_nomor_hp_pimpinan[nomor_hp_pimpinan][]"
+                                                value="{{ $detail_pimpinan->nomor_hp_pimpinan ?? old('detail_nomor_hp_pimpinan.nomor_hp_pimpinan') }}">
+                                            @error('nomor_hp_pimpinan')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pimpinan" class="btn btn-primary btn-xs">Tambah
+                                Pimpinan</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Nama PIC Reviewer
@@ -277,6 +341,51 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_reviewer" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_reviewer) && isset($kjpp->detail_nomor_hp_pic_reviewer))
+                                @foreach (json_decode($detailJoinPicReviewer) as $detail_pic_reviewer)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Reviewer
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_reviewer') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_reviewer[nama_pic_reviewer][]"
+                                                value="{{ $detail_pic_reviewer->nama_pic_reviewer ?? old('detail_nama_pic_reviewer.nama_pic_reviewer') }}">
+                                            @error('nama_pic_reviewer')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP PIC Reviewer
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nomor_hp_pic_reviewer') border-danger  @enderror"
+                                                type="text"
+                                                name="detail_nomor_hp_pic_reviewer[nomor_hp_pic_reviewer][]"
+                                                value="{{ $detail_pic_reviewer->nomor_hp_pic_reviewer ?? old('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer') }}">
+                                            @error('nomor_hp_pic_reviewer')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_reviewer" class="btn btn-primary btn-xs">Tambah
+                                PIC Reviewer</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Nama PIC Admin
@@ -300,6 +409,50 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_admin" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_admin) && isset($kjpp->detail_nomor_hp_pic_admin))
+                                @foreach (json_decode($detailJoinPicAdmin) as $detail_pic_admin)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Admin
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_admin') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_admin[nama_pic_admin][]"
+                                                value="{{ $detail_pic_admin->nama_pic_admin ?? old('detail_nama_pic_admin.nama_pic_admin') }}">
+                                            @error('nama_pic_admin')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP PIC Admin
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nomor_hp_pic_admin') border-danger  @enderror"
+                                                type="text" name="detail_nomor_hp_pic_admin[nomor_hp_pic_admin][]"
+                                                value="{{ $detail_pic_admin->nomor_hp_pic_admin ?? old('detail_nomor_hp_pic_admin.nomor_hp_pic_admin') }}">
+                                            @error('nomor_hp_pic_admin')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_admin" class="btn btn-primary btn-xs">Tambah
+                                PIC Admin</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Nama PIC Marketing
@@ -324,6 +477,52 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_marketing" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_marketing) && isset($kjpp->detail_nomor_hp_pic_marketing))
+                                @foreach (json_decode($detailJoinPicMarketing) as $detail_pic_marketing)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Marketing
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_marketing') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_marketing[nama_pic_marketing][]"
+                                                value="{{ $detail_pic_marketing->nama_pic_marketing ?? old('detail_nama_pic_marketing.nama_pic_marketing') }}">
+                                            @error('nama_pic_marketing')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP PIC Marketing
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input
+                                                class="input  @error('nomor_hp_pic_marketing') border-danger  @enderror"
+                                                type="text"
+                                                name="detail_nomor_hp_pic_marketing[nomor_hp_pic_marketing][]"
+                                                value="{{ $detail_pic_marketing->nomor_hp_pic_marketing ?? old('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing') }}">
+                                            @error('nomor_hp_pic_marketing')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_marketing" class="btn btn-primary btn-xs">Tambah
+                                PIC Marketing</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Ijin Usaha
@@ -397,3 +596,5 @@
         </form>
     </div>
 @endsection
+
+@include('lpj::kjpp.scripts.index')

resources/views/kjpp/scripts/index.blade.php

@@ -0,0 +1,145 @@
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const emailKantorDiv = document.getElementById('detail_email_kantor');
+
+            function addDeleteListeners() {
+                document.querySelectorAll(".delete-button").forEach(button => {
+                    button.addEventListener("click", function() {
+                        this.closest(
+                                ".flex.flex-col.lg\\:flex-row.gap-2.items-baseline.lg\\:items-center.w-full"
+                            )
+                            .remove();
+                    });
+                });
+            }
+
+            function DeleteEditListeners() {
+                document.querySelectorAll(".delete-button-edit").forEach(button => {
+                    button.addEventListener("click", function() {
+                        this.closest(
+                                ".flex.flex-col.lg\\:flex-row.gap-2.items-baseline.lg\\:items-center.w-full"
+                            )
+                            .remove();
+                    });
+                });
+            }
+
+            DeleteEditListeners();
+
+            document.getElementById("tambah_email_kantor").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_email_kantor[email_kantor][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                emailKantorDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            });
+
+            const namaPimpinanDiv = document.getElementById('detail_nama_pimpinan');
+
+            document.getElementById("tambah_nama_pimpinan").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                <label class="form-label max-w-56">
+                            Nama Pimpinan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pimpinan[nama_pimpinan][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP Pimpinan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pimpinan[nomor_hp_pimpinan][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPimpinanDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            });
+
+            const namaPicReviewerDiv = document.getElementById('detail_nama_pic_reviewer');
+
+            document.getElementById("tambah_nama_pic_reviewer").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                        <label class="form-label max-w-56">
+                            Nama PIC Reviewer
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_reviewer[nama_pic_reviewer][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Reviewer
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_reviewer[nomor_hp_pic_reviewer][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicReviewerDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+
+            const namaPicAdminDiv = document.getElementById('detail_nama_pic_admin');
+
+            document.getElementById("tambah_nama_pic_admin").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                <label class="form-label max-w-56">
+                            Nama PIC Admin
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_admin[nama_pic_admin][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Admin
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_admin[nomor_hp_pic_admin][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicAdminDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+
+            const namaPicMarketingDiv = document.getElementById('detail_nama_pic_marketing');
+
+            document.getElementById("tambah_nama_pic_marketing").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                <label class="form-label max-w-56">
+                            Nama PIC Marketing
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_marketing[nama_pic_marketing][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Marketing
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_marketing[nomor_hp_pic_marketing][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicMarketingDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+        });
+    </script>
+@endpush

resources/views/kjpp/show.blade.php

@@ -42,9 +42,7 @@
                     <label class="form-label max-w-56">Nomor Ijin Usaha</label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            @foreach ($ijin_usaha as $iu)
+                            {{ $kjpp->nomor_ijin_usaha }}
-                                {{ $iu->code }}
-                            @endforeach
                         </p>
                     </div>
                 </div>
@@ -53,22 +51,36 @@
                         Alamat Kantor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->address }} , Kel.
+                        <p class="flex style-w-full text-gray-600 font-medium text-sm">{{ $kjpp->address }}
+                            @if (isset($kjpp->village_code))
+                                , Kel.
                                 @foreach ($villages as $village)
                                     {{ $village->name }}
-                            @endforeach , Kec.
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->district_code))
+                                , Kec.
                                 @foreach ($districts as $district)
                                     {{ $district->name }}
-                            @endforeach ,
+                                @endforeach
-                            @foreach ($cities as $city)
+                            @endif
+                            @if (isset($kjpp->city_code))
+                                ,@foreach ($cities as $city)
                                     {{ ucwords(strtolower($city->name)) }}
-                            @endforeach ,
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->province_code))
+                                ,
                                 @foreach ($provinces as $province)
                                     {{ $province->name }}
-                            @endforeach, Kode Pos.
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->postal_code))
+                                , Kode Pos.
                                 @foreach ($villages as $village)
                                     {{ $village->postal_code }}
                                 @endforeach
+                            @endif
                         </p>
                     </div>
                 </div>
@@ -84,6 +96,13 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->email_kantor }}</p>
+                        @if (isset($kjpp->detail_email_kantor))
+                            @foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_email_kantor->email_kantor }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -92,12 +111,26 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pimpinan }}</p>
+                        @if (isset($kjpp->detail_nama_pimpinan))
+                            @foreach (json_decode($detailJoinPimpinan) as $detail_nama_pimpinan)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pimpinan->nama_pimpinan }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP Pimpinan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pimpinan }}</p>
+                        @if (isset($kjpp->detail_nomor_hp_pimpinan))
+                            @foreach (json_decode($detailJoinPimpinan) as $detail_nomor_hp_pimpinan)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pimpinan->nomor_hp_pimpinan }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -105,13 +138,28 @@
                         Nama PIC Reviewer
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_reviewer }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_reviewer ?? '-' }}</p>
+                        @if (isset($kjpp->detail_nama_pic_reviewer))
+                            @foreach (json_decode($detailJoinPicReviewer) as $detail_nama_pic_reviewer)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_reviewer->nama_pic_reviewer }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Reviewer
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_reviewer }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_reviewer ?? '-' }}
+                        </p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_reviewer))
+                            @foreach (json_decode($detailJoinPicReviewer) as $detail_nomor_hp_pic_reviewer)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_reviewer->nomor_hp_pic_reviewer }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -119,13 +167,27 @@
                         Nama PIC Admin
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_admin }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_admin ?? '-' }}</p>
+                        @if (isset($kjpp->detail_nama_pic_admin))
+                            @foreach (json_decode($detailJoinPicAdmin) as $detail_nama_pic_admin)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_admin->nama_pic_admin }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Admin
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_admin }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_admin ?? '-' }}</p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_admin))
+                            @foreach (json_decode($detailJoinPicAdmin) as $detail_nomor_hp_pic_admin)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_admin->nomor_hp_pic_admin }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -133,13 +195,28 @@
                         Nama PIC Marketing
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_marketing }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_marketing ?? '-' }}</p>
+                        @if (isset($kjpp->detail_nama_pic_marketing))
+                            @foreach (json_decode($detailJoinPicMarketing) as $detail_nama_pic_marketing)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_marketing->nama_pic_marketing }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Marketing
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_marketing }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_marketing ?? '-' }}
+                        </p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_marketing))
+                            @foreach (json_decode($detailJoinPicMarketing) as $detail_nomor_hp_pic_marketing)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_marketing->nomor_hp_pic_marketing }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -209,3 +286,19 @@
         </div>
     </div>
 @endsection
+
+@push('styles')
+    <style>
+        @media (min-width: 1024px) {
+            .style-w-full {
+                max-width: 25rem;
+            }
+        }
+
+        @media (max-width: 1024px) {
+            .style-w-full {
+                width: 100%;
+            }
+        }
+    </style>
+@endpush

resources/views/permohonan/authorization/show.blade.php

@@ -40,6 +40,24 @@
                     </span>
                 </div>
 
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Nilai Plafond:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->nilaiPlafond->name }}
+                    </span>
+                </div>
+
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Status Bayar:
+                    </h3>
+                    <span class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
+                        {{ str_replace('_',' ',$permohonan->status_bayar) }}
+                    </span>
+                </div>
+
             </div>
         </div>
 
@@ -139,7 +157,7 @@
         @include('lpj::component.detail-jaminan')
 
         <div class="card">
-            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST">
+            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST" id="authorizationForm">
                 <input type="hidden" name="_method" value="PUT">
                 @csrf
                 <div class="card-body lg:py-7.5">
@@ -149,6 +167,16 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <textarea class="textarea" rows="3" type="number" id="keterangan" name="keterangan"></textarea>
+                            <em class="alert text-danger text-sm" id="keterangan-message"></em>
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-2" id="fileUploadSection">
+                        <label class="form-label max-w-56">
+                            Upload File Revisi
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="file" class="file-input" id="revisionFile" name="revisionFile">
+                            <em class="alert text-danger text-sm hidden" id="file-message"></em>
                         </div>
                     </div>
                 </div>
@@ -156,7 +184,7 @@
                     <button type="submit" name="status" value="preregister" class="btn btn-success">
                         Approve
                     </button>
-                    <button type="submit" name="status" value="revisi" class="btn btn-warning ml-3">
+                    <button type="submit" name="status" value="revisi" id="revisi" class="btn btn-warning ml-3">
                         Revisi
                     </button>
                 </div>
@@ -164,3 +192,45 @@
         </div>
     </div>
 @endsection
+
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const form = document.getElementById('authorizationForm');
+            const keterangan = document.getElementById('keterangan');
+            const revisiBtn = document.getElementById('revisi');
+            const keteranganMessage = document.getElementById('keterangan-message');
+
+            const revisionFile = document.getElementById('revisionFile');
+            const fileMessage = document.getElementById('file-message');
+
+
+            form.addEventListener('submit', function(event) {
+                if (event.submitter === revisiBtn && keterangan.value.trim() === '') {
+                    event.preventDefault();
+                    keteranganMessage.textContent = 'Catatan harus diisi.';
+                } else {
+                    keteranganMessage.textContent = '';
+                }
+
+                if (!revisionFile.files.length) {
+                    event.preventDefault();
+                    fileMessage.textContent = 'File revisi harus diunggah.';
+                    fileMessage.classList.remove('hidden');
+                } else {
+                    fileMessage.classList.add('hidden');
+                }
+            });
+
+            // Add event listener for typing in keterangan textarea
+            keterangan.addEventListener('input', function() {
+                keteranganMessage.classList.add('hidden');
+            });
+
+            // Add event listener for file selection
+            revisionFile.addEventListener('change', function() {
+                fileMessage.classList.add('hidden');
+            });
+        });
+    </script>
+@endpush

resources/views/permohonan/form.blade.php

@@ -34,6 +34,7 @@
                         <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
                             @if(isset($permohonan->id))
                                 @method('PUT')
+                                <input type="hidden" name="id" value="{{ $permohonan->id }}">
                             @endif
                             @csrf
 
@@ -52,19 +53,14 @@
                                     Tujuan Penilaian
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                    <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                         <option value="">Pilih Tujuan Penilaian</option>
                                         @if(isset($tujuanPenilaian))
                                             @foreach($tujuanPenilaian as $row)
-                                                @if(isset($permohonan))
+                                                <option value="{{ $row->id }}"
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
+                                                    {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
                                                     {{ $row->name }}
                                                 </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
                                             @endforeach
                                         @endif
                                     </select>
@@ -83,19 +79,14 @@
                                         <option value="">Pilih Fasilitas Kredit</option>
                                         @if(isset($fasilitasKredit))
                                             @foreach($fasilitasKredit as $row)
-                                                @if(isset($permohonan))
+                                                <option value="{{ $row->id }}"
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
+                                                    {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
                                                     {{ $row->name }}
                                                 </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('jenis_fasilitas_kredit_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -107,22 +98,17 @@
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                        <option value="">Pilih Nilai Flafond</option>
+                                        <option value="">Pilih Nilai Plafond</option>
                                         @if(isset($plafond))
                                             @foreach($plafond as $row)
-                                                @if(isset($permohonan))
+                                                <option value="{{ $row->id }}"
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
+                                                    {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
                                                     {{ $row->name }}
                                                 </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('nilai_plafond_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -135,10 +121,10 @@
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                         <option value="">Pilih Status Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
+                                        <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
+                                        <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                     </select>
-                                    @error('status')
+                                    @error('status_bayar')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -149,12 +135,16 @@
                                     Nilai NJOP
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                    <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                           type="text"
+                                           name="nilai_njop"
+                                           value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                     @error('nilai_njop')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
                             </div>
+
                             @if($permohonan->status=='revisi')
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                     Catatan : <br>
@@ -211,19 +201,14 @@
                                 Tujuan Penilaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                     <option value="">Pilih Tujuan Penilaian</option>
                                     @if(isset($tujuanPenilaian))
                                         @foreach($tujuanPenilaian as $row)
-                                            @if(isset($permohonan))
+                                            <option value="{{ $row->id }}"
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
+                                                {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
                                                 {{ $row->name }}
                                             </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
                                         @endforeach
                                     @endif
                                 </select>
@@ -242,19 +227,14 @@
                                     <option value="">Pilih Fasilitas Kredit</option>
                                     @if(isset($fasilitasKredit))
                                         @foreach($fasilitasKredit as $row)
-                                            @if(isset($permohonan))
+                                            <option value="{{ $row->id }}"
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
+                                                {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
                                                 {{ $row->name }}
                                             </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('jenis_fasilitas_kredit_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -266,22 +246,17 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                    <option value="">Pilih Nilai Flafond</option>
+                                    <option value="">Pilih Nilai Plafond</option>
                                     @if(isset($plafond))
                                         @foreach($plafond as $row)
-                                            @if(isset($permohonan))
+                                            <option value="{{ $row->id }}"
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
+                                                {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
                                                 {{ $row->name }}
                                             </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('nilai_plafond_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -294,10 +269,10 @@
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                     <option value="">Pilih Status Bayar</option>
-                                    <option value="sudah_bayar">Sudah Bayar</option>
+                                    <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
-                                    <option value="belum_bayar">Belum Bayar</option>
+                                    <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                 </select>
-                                @error('status')
+                                @error('status_bayar')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -308,41 +283,16 @@
                                 Nilai NJOP
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                       type="text"
+                                       name="nilai_njop"
+                                       value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                 @error('nilai_njop')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Status Permohonan
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('status') border-danger bg-danger-light @enderror" name="status" id="status">
-                                    <option value="">Pilih Status Permohonan</option>
-                                    @if(isset($status))
-                                        @foreach($status as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->slug }}" {{ isset($permohonan->status) && $permohonan->status == $row->slug ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->slug }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
-                                        @endforeach
-                                    @endif
-                                </select>
-                                @error('status')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-
                         <div class="flex justify-end">
                             <button type="submit" class="btn btn-primary">
                                 Save

resources/views/prosespenawaran/edit.blade.php

@@ -12,7 +12,7 @@
 @section('content')
 <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
    
-    
+        <!-- $id = penawaran.id -->
         <input type="hidden" id="id" name="id" value="{{ $id }}">
        
                 <div class="card pb-2.5">
@@ -46,8 +46,22 @@
                                 </label>
                             </div>
                         </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tambah KJPP
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select class="select " style="width: 25.5em" name="select" id="{{$route[1]}}_kjpps">
+                                    <option value="0"> - Pilih KJPP - </option>
+                                </select>&nbsp;&nbsp;
+                                <button class="btn btn-primary" id="{{$route[1]}}_toAddKJPP">
+                                    Tambah
+                                </button>
+                            </div>
+                        </div>
                         <!-- datatables -->
                         <div class="grid">     
+                            <form enctype="multipart/form-data" id="form_{{$route[1]}}">                        
                             <div class="card min-w-full">
                                 <div class="card-header">
                                     <h3 class="card-title">Data KJPP</h3>
@@ -57,7 +71,9 @@
                                         <thead>
                                             <tr>
                                                 <th class="w-14 text-center">No</th>
-                                                <th class="min-w-[250px]">KJPP</th>
+                                                <th class="min-w-[80px]">KJPP</th>
+                                                <th>No Proposal</th>
+                                                <th>Tanggal Proposal</th>
                                                 <th>Biaya Penawaran</th>
                                                 <th>Upload Penawaran</th>
                                                 <th class="min-w-[50px] text-center">Action</th>
@@ -71,8 +87,12 @@
                         </div>
                         <!-- datatables -->
                         <div class="flex justify-end">
+                            <button type="submit" class="btn btn-success" id="{{$route[1]}}_toEditDraft">
+                                Simpan Draft
+                            </form>    
+                            </button>&nbsp;&nbsp;
                             <button type="button" class="btn btn-primary" id="{{$route[1]}}_toEdit">
-                                Save
+                                Pengajuan Penawaran
                             </button>
                         </div>
                     </div>

resources/views/prosespenawaran/editulang.blade.php

@@ -0,0 +1,159 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+    // $route = Route::currentRouteName();
+    // dd($route);
+    $route = explode('.', Route::currentRouteName());
+@endphp
+
+@section('content')
+<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">    
+    <!-- id ==> penawaran.id -->
+    <input type="hidden" id="id" name="id" value="{{ $id }}">       
+    <div class="card pb-2.5">
+        <div class="card-header" id="basic_settings">
+            <h3 class="card-title">
+                Tambah Data Proses Penawaran Ulang
+            </h3>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('tender.prosespenawaran.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+                <a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+            </div>
+        </div>
+        <div class="card-body lg:py-7.5 grid grid-cols-3">
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Nomor Register Permohonan:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    <label class="card-title" id="textReg">
+                        No. registrasi
+                    </label>
+                </span>
+            </div>
+
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Kode Penawaran:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    <label class="card-title" id="textCodePenawaran">
+                        Kode Penawaran
+                    </label>
+                </span>
+            </div>
+
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Status Penawaran:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    <label class="card-title" id="textStatusPenawaran">
+                        Status
+                    </label>
+                </span>
+            </div>            
+        </div>
+        
+        <!-- add kjpp -->
+        <div class="card-body grid gap-5">
+            <!-- datatables -->
+            <div class="grid">                            
+                <div class="card min-w-full">
+                    <div class="card-header">
+                        <h3 class="card-title">Tambah KJPP</h3>
+                    </div>
+                    <div class="card-table scrollable-x-auto">
+                        <table class="table table-border align-middle text-gray-700 font-medium text-sm">
+                            <thead>
+                                <tr>
+                                    <th class="min-w-[180px]">KJPP</th>
+                                    <th>No Proposal</th>
+                                    <th>Tanggal Proposal</th>
+                                    <th>Biaya Penawaran</th>
+                                    <th>Upload Penawaran</th>
+                                    <th class="min-w-[50px] text-center">Action</th>
+                                </tr>
+                            </thead>
+                            <tbody id="tbodyKJPP0">
+                                <tr>
+                                    <td valign="top">
+                                        <select class="inputku select " style="width: 25.5em" name="select" id="{{$route[1]}}_kjpps1">
+                                            <option value="0"> - Pilih KJPP - </option>
+                                        </select>
+                                        <em id="{{$route[1]}}_kjpp1_msg" class="alert text-danger text-sm"></em>
+                                    </td>
+                                    <td valign="top">
+                                        <input type="text" class="inputku file-input" id="{{$route[1]}}_no_proposal" name="{{$route[1]}}_no_proposal">
+                                        <em id="{{$route[1]}}_no_proposal_msg" class="alert text-danger text-sm"></em>
+                                    </td>
+                                    <td valign="top">
+                                        <input type="date" class="inputku file-input" id="{{$route[1]}}_tgl_proposal" name="{{$route[1]}}_tgl_proposal" >
+                                        <em id="{{$route[1]}}_tgl_proposal_msg" class="alert text-danger text-sm"></em>
+                                    </td>
+                                    <td valign="top">
+                                        <div class="input-group">
+                                            <span class="inputku btn btn-input" id="{{$route[1]}}_rp">Rp.</span>
+                                            <input type="text" style="text-align: right;" onkeydown="return numbersonly(this, event);" onkeyup="javascript:tandaPemisahTitik(this);" class="inputku input" id="{{$route[1]}}_biayaPenawaran" name="{{$route[1]}}_biayaPenawaran">
+                                        </div>
+                                        <em id="{{$route[1]}}_biayaPenawaran_msg" class="alert text-danger text-sm"></em>
+                                    </td>
+                                    <td valign="top">
+                                        <input type="file" class="inputku file-input" id="{{$route[1]}}_dokumenPersetujuan" name="{{$route[1]}}_dokumenPersetujuan" accept="application/pdf" />
+                                        <em id="{{$route[1]}}_dokumenPersetujuan_msg" class="alert text-danger text-sm"></em>
+                                    </td>
+                                    <td  valign="top" class="min-w-[50px] text-center">
+                                        <div class="flex flex-nowrap justify-center">
+                                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="javascript:void(0)" id="{{$route[1]}}_icon_update_'+value.id+'" title="Tambah KJPP" onclick="addDataUlang()"><i class="ki-outline ki-bookmark"></i></a>
+                                        </div>    
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <!-- datatables -->
+            <div class="flex justify-end">
+               &nbsp;
+            </div>
+        </div>
+        <!-- add kjpp -->
+        <div class="card-body grid gap-5">
+            <!-- datatables -->
+            <div class="grid">                            
+                <div class="card min-w-full">
+                    <div class="card-header">
+                        <h3 class="card-title">Data KJPP</h3>
+                    </div>
+                    <div class="card-table scrollable-x-auto">
+                        <table class="table table-border align-middle text-gray-700 font-medium text-sm">
+                            <thead>
+                                <tr>
+                                    <th class="w-14 text-center">No</th>
+                                    <th class="min-w-[80px]">KJPP</th>
+                                    <th>No Proposal</th>
+                                    <th>Tanggal Proposal</th>
+                                    <th>Biaya Penawaran</th>
+                                    <th>Upload Penawaran</th>
+                                    <th class="min-w-[50px] text-center">Action</th>
+                                </tr>
+                            </thead>
+                            <tbody id="tbodyKJPP1">
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <!-- datatables -->
+            <div class="flex justify-end">
+               &nbsp;
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@include('lpj::prosespenawaran.js.editulangjs')

resources/views/prosespenawaran/index.blade.php

@@ -149,10 +149,10 @@
                         return `${formatDate(new Date(data.start_date))} - ${formatDate(new Date(data.end_date))}`
                     }
                 },
-                tujuan_penilaian_k_j_p_p: {
+                tujuan_penilaian_kjpp: {
                     title: 'Tujuan Penilaian KJPP',
                     render: (item, data) => {
-                        return data.tujuan_penilaian_k_j_p_p[0].name
+                        return data.tujuan_penilaian_kjpp.name
                     }
                 },
                 penawarandetails_count: {
@@ -170,13 +170,25 @@
                 actions: {
                     title: 'Status',
                     render: (item, data) => {
+                        // data.id ==> penawaran.id
+                        var iconProses ='';
+                        if('tender'==data.status)
+                        {
+                            iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="tender/prosespenawaran/${data.id}/edit">
+                                                <i class="ki-outline ki-notepad-edit"></i>
+                                            </a>`;
+                        }   
+                        else if('proposal-tender'==data.status)
+                        {
+                            iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran Ulang" href="tender/prosespenawaran/${data.id}/editulang">
+                                                    <i class="ki-outline ki-arrow-circle-right"></i>
+                                                </a>`;
+                        }
+
                         return `<div class="flex flex-nowrap justify-center">
                             <a onclick="showPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
                                 <i class="ki-outline ki-eye"></i>
-                            </a>
+                            </a>`+iconProses+`
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="tender/prosespenawaran/${data.id}/edit">
-                                <i class="ki-outline ki-notepad-edit"></i>
-                            </a>
                         </div>`;
                     },
                 }

resources/views/prosespenawaran/js/editeulangxtjs.blade.php

@@ -0,0 +1,337 @@
+<script tipe="module">
+function switchProses(id)
+{
+	removeErrorCssMsg();
+	let c = $('#{{$route[1]}}_check_'+id).val();
+	
+	if($('input[name="{{$route[1]}}_check_'+id+'"]').is(':checked'))
+	{
+		// checked
+		// alert('aktif nih');
+		setActiveElement(id);
+	}else
+	{
+		// unchecked
+		//alert('tdk aktif nih');
+		setNonActiveElement(id);
+	}
+}
+
+function setActiveElement(id)
+{
+	$('#{{$route[1]}}_no_proposal_'+id).removeAttr('disabled');
+	$('#{{$route[1]}}_tgl_proposal_'+id).removeAttr('disabled');
+	$('#{{$route[1]}}_biayaPenawaran_'+id).removeAttr('disabled');
+	$('#{{$route[1]}}_dokumenPersetujuan_'+id).removeAttr('disabled');
+	$('#{{$route[1]}}_icon_update_'+id).removeAttr('disabled');
+	$('#{{$route[1]}}_icon_delete_'+id).removeAttr('disabled');
+}
+
+function setNonActiveElement(id)
+{
+	$('#{{$route[1]}}_no_proposal_'+id).attr('disabled', 'disabled');
+	$('#{{$route[1]}}_tgl_proposal_'+id).attr('disabled', 'disabled');
+	$('#{{$route[1]}}_biayaPenawaran_'+id).attr('disabled', 'disabled');
+	$('#{{$route[1]}}_dokumenPersetujuan_'+id).attr('disabled', 'disabled');
+	$('#{{$route[1]}}_icon_update_'+id).attr('disabled', 'disabled');
+	$('#{{$route[1]}}_icon_delete_'+id).attr('disabled', 'disabled');
+}
+
+function updateDataUlang(id, kjpp_id, kjppName){
+	// id ==> detail_penawaran.id
+	removeErrorCssMsg();
+		let no_proposal = $("#{{$route[1]}}_no_proposal_"+id).val();                            
+		let tgl_proposal = $("#{{$route[1]}}_tgl_proposal_"+id).val(); 
+		let biaya = $("#{{$route[1]}}_biayaPenawaran_"+id).val();                            
+		let filepdf = $("#{{$route[1]}}_dokumenPersetujuan_"+id).val();       
+		let passednih = true;                    
+		
+		if(!no_proposal){
+			$("#{{$route[1]}}_no_proposal_"+id).addClass(" border-danger");
+			$("#{{$route[1]}}_no_proposal_msg_"+id).text("Silahkan isi No Proposal");
+			passednih = false;
+		}                      
+		if(!tgl_proposal){
+			$("#{{$route[1]}}_tgl_proposal_"+id).addClass(" border-danger");
+			$("#{{$route[1]}}_tgl_proposal_msg_"+id).text("Silahkan isi Tanggal Proposal");
+			passednih = false;
+		}                      
+		if(!biaya){
+			$("#{{$route[1]}}_rp_"+id).addClass(" border-danger");
+			$("#{{$route[1]}}_biayaPenawaran_"+id).addClass(" border-danger");
+			$("#{{$route[1]}}_biayaPenawaran_msg_"+id).text("Silahkan isi Biaya Penawaran nya");
+			passednih = false;
+		}                      
+		if(!filepdf){
+			$("#{{$route[1]}}_dokumenPersetujuan_"+id).addClass(" border-danger");
+			$("#{{$route[1]}}_dokumenPersetujuan_msg_"+id).text("Silahkan isi dokumen nya");
+			$("#{{$route[1]}}_dokumenPersetujuan_"+id).val("");
+			passednih = false;
+		}            
+		
+		if(passednih)
+		{
+			var file_data = $("#{{$route[1]}}_dokumenPersetujuan_"+id).prop("files")[0];
+			let useURL = "{{ route($route[0].'.'.$route[1].'.updateulang', '') }}/"+id;
+			let formData = new FormData();  
+			let token   = "{{ csrf_token() }}";
+			formData.append("dokumen_persetujuan", file_data ?? "");
+			formData.append("no_proposal", no_proposal);
+			formData.append("tgl_proposal", tgl_proposal);
+			formData.append("biaya_penawaran", biaya);
+			formData.append("kjpp_rekanan_id", kjpp_id);
+			formData.append("_method", "PUT");
+			formData.append("_token", token);
+			$.ajax({
+				url: useURL,
+				type: "POST",         
+				data: formData,
+				processData: false,
+				contentType: false,
+				success:function(response){
+					if('success' == response.status)
+					{
+						// toastr.success(response.message);
+						// success
+						var message = response.message;
+						toastrku("success", message);
+						setTimeout(function () {						
+							 location.reload(true);
+						}, 2000);
+					}
+					else if('error' == response.status)
+					{
+						// toastr.error(response.message);
+						var message = response.message;
+						toastrku("error", message);
+					}
+					
+				},
+				error: function (response, textStatus, errorThrown) {
+					var errors = response.responseJSON.errors;
+					$.each(errors, function (key, value) {
+						console.log("v = " + value);
+					});
+				}
+			});
+	
+		}
+}
+
+function deleteData(data, kjppName) {
+	Swal.fire({
+		title: 'Are you sure?',
+		text: "You won't be able to revert KJPP "+kjppName+"!",
+		icon: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: 'Yes, delete it!'
+	}).then((result) => {
+		if (result.isConfirmed) {
+			
+				//define variable
+			let token = "{{ csrf_token() }}";
+			let useURL = "{{ route($route[0].'.'.$route[1].'.updateKJPPStatus','') }}/"+data;
+				
+			var input_data = new Object();
+			input_data._token = token;
+			input_data.id =data;
+			input_data.kjppName =kjppName;
+			$.ajax({
+				url: useURL,
+				type: "PUT",
+				cache: false,
+				data: input_data,
+				dataType: "json",
+				success: function(response) {
+					console.log(response);
+					if('success' == response.status)
+					{
+						swal.fire('Deleted!', response.message.message_success[0], 'success').then(() => {
+							window.location.reload();
+						});
+					}
+					else
+					{
+						Swal.fire('Error!', response.message.message_error_try_catch[0], 'error');
+					}
+						
+					
+				},
+				error: function(response, textStatus, errorThrown) {
+					// var errors = response.responseJSON.errors;
+					// console.log(errors);
+					console.log(response);
+
+				}
+			});     
+		}
+	})
+}
+
+function addDataUlang()
+{
+	removeErrorCssMsg();
+	// id ==> penawaran.id
+	let id = $("#id").val();
+	let kjpp_id = $("#{{$route[1]}}_kjpps1").val();                            
+	let no_proposal = $("#{{$route[1]}}_no_proposal").val();                            
+	let tgl_proposal = $("#{{$route[1]}}_tgl_proposal").val(); 
+	let biaya = $("#{{$route[1]}}_biayaPenawaran").val();                            
+	let filepdf = $("#{{$route[1]}}_dokumenPersetujuan").val();       
+	let passednih = true;
+
+	
+	if("0"==kjpp_id){
+		$("#{{$route[1]}}_kjpps1").addClass(" border-danger");
+		$("#{{$route[1]}}_kjpp1_msg").text("Silahkan pilih KJPP");
+		passednih = false;
+	}                      
+	
+	if(!no_proposal){
+		$("#{{$route[1]}}_no_proposal").addClass(" border-danger");
+		$("#{{$route[1]}}_no_proposal_msg").text("Silahkan isi No Proposal");
+		passednih = false;
+	}                      
+	if(!tgl_proposal){
+		$("#{{$route[1]}}_tgl_proposal").addClass(" border-danger");
+		$("#{{$route[1]}}_tgl_proposal_msg").text("Silahkan isi Tanggal Proposal");
+		passednih = false;
+	}                      
+	if(!biaya){
+		$("#{{$route[1]}}_rp").addClass(" border-danger");
+		$("#{{$route[1]}}_biayaPenawaran").addClass(" border-danger");
+		$("#{{$route[1]}}_biayaPenawaran_msg").text("Silahkan isi Biaya Penawaran");
+		passednih = false;
+	}                      
+	if(!filepdf){
+		$("#{{$route[1]}}_dokumenPersetujuan").addClass(" border-danger");
+		$("#{{$route[1]}}_dokumenPersetujuan_msg").text("Silahkan isi dokumen");
+		$("#{{$route[1]}}_dokumenPersetujuan").val("");
+		passednih = false;
+	}    
+
+	if(passednih)
+	{
+		var file_data = $("#{{$route[1]}}_dokumenPersetujuan").prop("files")[0];
+		let useURL = "{{ route($route[0].'.'.$route[1].'.storeUlang') }}";
+		let formData = new FormData();  
+		let token   = "{{ csrf_token() }}";
+		formData.append("dokumen_persetujuan", file_data ?? "");
+		formData.append("penawaran_id", id);
+		formData.append("no_proposal", no_proposal);
+		formData.append("tgl_proposal", tgl_proposal);
+		formData.append("biaya_penawaran", biaya);
+		formData.append("kjpp_rekanan_id", kjpp_id);
+		formData.append("_token", token);
+		
+		$.ajax({
+			url: useURL,
+			type: "POST",         
+			data: formData,
+			processData: false,
+			contentType: false,
+			success:function(response){
+				if('success' == response.status)
+				{
+					// toastr.success(response.message);
+					// success
+					var message = response.message;
+					toastrku("success", message);
+					setTimeout(function () {						
+							location.reload(true);
+					}, 2000);
+				}
+				else if('error' == response.status)
+				{
+					// toastr.error(response.message);
+					var message = response.message;
+					toastrku("error", message);
+				}
+				
+			},
+			error: function (response, textStatus, errorThrown) {
+				var errors = response.responseJSON.errors;
+				$.each(errors, function (key, value) {
+					console.log("v = " + value);
+				});
+			}
+		});
+
+	}
+}
+
+function deleteDataUlang(data, kjppName) {
+	Swal.fire({
+		title: 'Are you sure?',
+		text: "You won't be able to revert KJPP "+kjppName+"!",
+		icon: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: 'Yes, delete it!'
+	}).then((result) => {
+		if (result.isConfirmed) {
+			
+				//define variable
+			let token = "{{ csrf_token() }}";
+			let useURL = "{{ route($route[0].'.'.$route[1].'.updateKJPPStatusUlang','') }}/"+data;
+				
+			var input_data = new Object();
+			input_data._token = token;
+			input_data.id =data;
+			input_data.kjppName =kjppName;
+			$.ajax({
+				url: useURL,
+				type: "PUT",
+				cache: false,
+				data: input_data,
+				dataType: "json",
+				success: function(response) {
+					// console.log(response);
+					if('success' == response.status)
+					{
+						swal.fire('Deleted!', response.message.message_success[0], 'success').then(() => {
+							window.location.reload();
+						});
+					}
+					else
+					{
+						var arr =response.message; // JSON Object
+						const keyToCheck1 = "active_date_range";
+						const keyToCheck2 = "message_error_try_catch";
+						const exists1 = keyToCheck1 in arr;
+						const exists2 = keyToCheck2 in arr;
+						
+						if(exists1)
+						{
+							Swal.fire('Error!', response.message.active_date_range[0], 'error').then(() => {
+								// window.location.reload();
+								setTimeout(function () {
+									var url = "{{ route('tender.prosespenawaran.index') }}";
+									$(location).attr('href',url);
+								}, 2000);
+							});
+						}
+						else if(exists2)
+						{
+							Swal.fire('Error!', response.message.message_error_try_catch[0], 'error').then(() => {
+								window.location.reload();
+							});
+						}
+					}
+						
+					
+				},
+				error: function(response, textStatus, errorThrown) {
+					// var errors = response.responseJSON.errors;
+					// console.log(errors);
+					console.log(response);
+
+				}
+			});     
+		}
+	})
+}
+</script>    

resources/views/prosespenawaran/js/editextjs.blade.php

@@ -35,21 +35,11 @@
 	
 	function updateData(id, kjpp_id, kjppName){
 		removeErrorCssMsg();
+		let no_proposal = $("#{{$route[1]}}_no_proposal_"+id).val();                            
+		let tgl_proposal = $("#{{$route[1]}}_tgl_proposal_"+id).val();                            
 		let biaya = $("#{{$route[1]}}_biayaPenawaran_"+id).val();                            
 		let filepdf = $("#{{$route[1]}}_dokumenPersetujuan_"+id).val();       
 		let passednih = true;                    
-		if(!biaya){
-			$("#{{$route[1]}}_rp_"+id).addClass(" border-danger");
-			$("#{{$route[1]}}_biayaPenawaran_"+id).addClass(" border-danger");
-			$("#{{$route[1]}}_biayaPenawaran_msg_"+id).text("Silahkan isi Biaya Penawaran nya");
-			passednih = false;
-		}                      
-		if(!filepdf){
-			$("#{{$route[1]}}_dokumenPersetujuan_"+id).addClass(" border-danger");
-			$("#{{$route[1]}}_dokumenPersetujuan_msg_"+id).text("Silahkan isi dokumen nya");
-			$("#{{$route[1]}}_dokumenPersetujuan_"+id).val("");
-			passednih = false;
-		}            
 		
 		if(passednih)
 		{
@@ -58,6 +48,8 @@
 			let formData = new FormData();  
 			let token   = "{{ csrf_token() }}";
 			formData.append("dokumen_persetujuan", file_data ?? "");
+			formData.append("no_proposal", no_proposal);
+			formData.append("tgl_proposal", tgl_proposal);
 			formData.append("biaya_penawaran", biaya);			
 			formData.append("kjpp_rekanan_id", kjpp_id);
 			formData.append("_method", "PUT");
@@ -150,6 +142,4 @@
 			}
 		})
 	}	
-		
-	
 	</script>    

resources/views/prosespenawaran/js/editjs.blade.php

@@ -39,6 +39,7 @@
                     $("#textReg").text(response.penawaran.nomor_registrasi);
                     $("#textCodePenawaran").text(response.penawaran.code);
                     setTablesKJPP1(response.penawrandetails);
+                    setKJPPList(response.kjpps);
                 }
                 else if('error' == response.status)
                 {
@@ -53,28 +54,64 @@
         });
     }
 
+    function setKJPPList(datas)
+    {
+        $('#{{$route[1]}}_kjpps').empty().append('<option value="0"> - Pilih KJPP - </option>');
+
+        $.each(datas, function(key, value){
+            var stringVal = value.code+' - '+value.name;
+            $('#{{$route[1]}}_kjpps').append(new Option(stringVal, value.id));
+        });
+    }
+
     function setTablesKJPP1(datas)
     {
         let i=1;
         $.each(datas, function(key, value){
             var kjppName = value.kjpp_code+' - '+value.kjpp_name;
             var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
+            var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
+            var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
             var htmlDokumenPersetujuanDownload='';
             var dokumenPersetujuanDownload = value.dokumen_persetujuan;
             if(dokumenPersetujuanDownload)
             {
-                htmlDokumenPersetujuanDownload='<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="'+value.dokumen_persetujuan+'" class="badge badge-sm badge-outline" download="'+value.attachment+'">'+value.attachment+'<i class="ki-filled ki-cloud-download"></i></a></div>';
+                htmlDokumenPersetujuanDownload='<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="'+value.dokumen_persetujuan+'" class="badge badge-sm badge-outline" download="'+value.attachment+'">'+value.attachment+' &nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>';
             }
             
             var markup = '<tr>';
             markup +='<td valign="top">'+i+'</td>';
             markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
-            markup +='<td valign="top"><div class="input-group"><span class="inputku btn btn-input" id="{{$route[1]}}_rp_'+value.id+'">Rp.</span><input type="text" disabled="" style="text-align: right;" onkeydown="return numbersonly(this, event);" onkeyup="javascript:tandaPemisahTitik(this);" class="inputku input" id="{{$route[1]}}_biayaPenawaran_'+value.id+'" name="{{$route[1]}}_biayaPenawaran_'+value.id+'"></div><em id="{{$route[1]}}_biayaPenawaran_msg_'+value.id+'" class="alert text-danger text-sm"></em></td>';
+            // No Proposal
-            markup +='<td><input type="file" disabled="" class="inputku file-input" id="{{$route[1]}}_dokumenPersetujuan_'+value.id+'" name="{{$route[1]}}_dokumenPersetujuan_'+value.id+'" accept="application/pdf" /><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
+            markup +='<td valign="top">';
-            markup +='<td><div class="flex flex-nowrap justify-center">';
+                markup +='<input type="hidden" id="{{$route[1]}}_penawarandetail_id_'+value.id+'" name="{{$route[1]}}_penawarandetail_id[]" value="'+value.id+'">';
-                markup +='<a disabled="" class="btn btn-sm btn-icon btn-clear btn-info" href="javascript:void(0)" id="{{$route[1]}}_icon_update_'+value.id+'" title="Proses Penawaran '+kjppName+'" onclick="updateData('+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\')"><i class="ki-outline ki-bookmark"></i></a>';
+                markup +='<input type="text" value="'+no_proposal+'" class="inputku file-input" id="{{$route[1]}}_no_proposal_'+value.id+'" name="{{$route[1]}}_no_proposal[]">';
-                markup +='<a disabled="" class="delete btn btn-sm btn-icon btn-clear btn-danger" id="{{$route[1]}}_icon_delete_'+value.id+'" onclick="deleteData('+value.id+',\''+kjppName+'\')" title="Hapus Proses Penawaran '+kjppName+'"><i class="ki-outline ki-trash"></i></a>';
+                markup +='<em id="{{$route[1]}}_no_proposal_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
-                markup +='<label class="switch"><input name="{{$route[1]}}_check_'+value.id+'" id="{{$route[1]}}_check_'+value.id+'" onclick="switchProses('+value.id+')" type="checkbox" value="0"/><span class="switch-label">Proses</span></label></div></td>';
+            markup +='</td>';
+            // No Proposal
+            // Tanggal Proposal
+            markup +='<td valign="top">';
+                markup +='<input type="date" value="'+tgl_proposal+'" class="inputku file-input" id="{{$route[1]}}_tgl_proposal_'+value.id+'" name="{{$route[1]}}_tgl_proposal[]" >';
+                markup +='<em id="{{$route[1]}}_tgl_proposal_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
+            markup +='</td>';
+            // Tanggal Proposal
+                
+            // Biaya Penawaran
+            markup +='<td valign="top">';
+                markup +='<div class="input-group"><span class="inputku btn btn-input" id="{{$route[1]}}_rp_'+value.id+'">Rp.</span><input type="text" style="text-align: right;" onkeydown="return numbersonly(this, event);" onkeyup="javascript:tandaPemisahTitik(this);" class="inputku input" id="{{$route[1]}}_biayaPenawaran_'+value.id+'" name="{{$route[1]}}_biayaPenawaran[]"></div>';
+                markup +='<em id="{{$route[1]}}_biayaPenawaran_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
+            markup +='</td>';    
+            // Biaya Penawaran    
+            // Upload Penawaran
+            markup +='<td valign="top">';
+                markup +='<input type="file" class="inputku file-input" id="{{$route[1]}}_dokumenPersetujuan_'+value.id+'" name="{{$route[1]}}_dokumenPersetujuan[]" accept="application/pdf" />';
+                markup +='<em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload;
+            markup +='</td>';
+            // Upload Penawaran
+            markup +='<td valign="top"><div class="flex flex-nowrap justify-center">';
+                markup +='<a class="btn btn-sm btn-icon btn-clear btn-info" href="javascript:void(0)" id="{{$route[1]}}_icon_update_'+value.id+'" title="Proses Penawaran '+kjppName+'" onclick="updateData('+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\')"><i class="ki-outline ki-bookmark"></i></a>';
+                markup +='<a class="delete btn btn-sm btn-icon btn-clear btn-danger" id="{{$route[1]}}_icon_delete_'+value.id+'" onclick="deleteData('+value.id+',\''+kjppName+'\')" title="Hapus Proses Penawaran '+kjppName+'"><i class="ki-outline ki-trash"></i></a>';
+                markup +='</div></td>';
             markup += '</tr>';
 
             $('#tbodyKJPP1').append(markup);
@@ -84,6 +121,7 @@
             if(biaya_penawaran)
                 biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran);
             $("#{{$route[1]}}_biayaPenawaran_"+value.id).val(biaya_penawaran_format);
+            
             i++;
         });
     }
@@ -107,7 +145,7 @@
     // updateAll penawaran & permohonan status
     $("#{{$route[1]}}_toEdit").click(function(e) {
         e.preventDefault();
-
+        // $id = penawaran.id
         //define variable
         let token = "{{ csrf_token() }}";
         let useURL = "{{ route($route[0].'.'.$route[1].'.updateAll',$id) }}";
@@ -150,5 +188,106 @@
         });
     });
 
+    $('#form_{{$route[1]}}').submit(function(e) { 
+        e.preventDefault();
+        
+        var formData = new FormData(this);
+        //define variable
+        let token = "{{ csrf_token() }}";
+        let useURL = "{{ route($route[0].'.'.$route[1].'.updateDraft',$id) }}";
+        formData.append('_token', token);
+        formData.append('_method', 'PUT');
+        
+        $.ajax({
+            url: useURL,
+            type: "POST",
+            data: formData,
+            cache: false,
+            processData: false,
+            contentType: false,
+            success: function(response) {
+                console.log(response);
+                
+                if ('success' == response.status)
+                {
+                    // toastr.success(response.message);
+					// success
+                    var message = response.message;
+                    toastrku("success", message);
+                    setTimeout(function () {
+                       location.reload(true);
+                    }, 2000);
+//
+                }
+                else if('error' == response.status)
+                {
+                    var message = response.message;
+                    toastrku("error", message);
+                }
+                
+            },
+            error: function(response, textStatus, errorThrown) {
+                // var errors = response.responseJSON.errors;
+                // console.log(errors);
+                console.log(response);
+
+            }
+        });
+    });    
+    
+    $("#{{$route[1]}}_toAddKJPP").click(function(e) {
+        e.preventDefault();
+
+        let kjpp_id = $("#{{$route[1]}}_kjpps").val();
+        let id = $("#id").val();
+        let token = "{{ csrf_token() }}";
+        let useURL = "{{ route($route[0].'.'.$route[1].'.store') }}";
+        
+        var input_data = new Object();
+        input_data._token= token;
+        input_data.kjpp_id= kjpp_id;
+        input_data.penawaran_id= id;
+
+        if(kjpp_id>0)
+        {
+            $.ajax({
+                url: useURL,
+                type: "POST",
+                cache: false,
+                data: input_data,
+                success:function(response){
+                    
+                    if ('success' == response.status)
+                    {
+                        // toastr.success(response.message);
+                        // success
+                        var message = response.message;
+                        toastrku("success", message);
+                        setTimeout(function () {
+                            location.reload(true);
+                        }, 2000);
+                    }
+                    else if('error' == response.status)
+                    {
+                        var message = response.message;
+                        toastrku("error", message);
+                    }
+                },
+                error: function (response, textStatus, errorThrown) {
+                    console.log(response);
+                }
+
+            });
+        }
+        else
+        {
+            swal.fire({
+                title: "Perhatikan",
+                text: "Silahkan pilih KJPP terlebih dahulu",
+                icon: "error"
+            });
+        }
+        
+    });    
     </script>
 @endpush

resources/views/prosespenawaran/js/editulangjs.blade.php

@@ -0,0 +1,151 @@
+@push('scripts')
+    @include('lpj::assetsku.includenya')
+    @include('lpj::prosespenawaran.js.editeulangxtjs')
+    <script type="module">
+
+    $(document).ready(function() {
+        prepareForm();
+    });
+
+    function prepareForm()
+    {
+        setData();
+    }
+
+    function setData()
+    {
+        let id = $("#id").val();
+        let token =  "{{ csrf_token() }}";
+        // alert('token = ' + token);
+        var useURL = "{{ route('tender.prosespenawaran.setDataUlang') }}";
+        var input_data = new Object();
+        input_data._token = token;
+        input_data.id = id;
+
+        $.ajax({
+            url: useURL,
+            type: "POST",
+            data: input_data,
+            dataType: "json",
+            beforeSend: function() {
+                // if ($("#myLoader").hasClass("pre-loader hidden")) {
+                //     pleaseStartLoader();
+                // }
+            },
+            success: function(response) {
+                console.log(response);
+
+                if("success"==response.status)
+                {
+                    var statusText = response.penawaran.status;
+                    $("#textReg").text(response.penawaran.nomor_registrasi);
+                    $("#textCodePenawaran").text(response.penawaran.code);
+                    $("#textStatusPenawaran").text(statusText);
+                    setTablesKJPP1(response.penawrandetails);
+                    setKJPPList1(response.kjpps);
+                }
+                else
+                {
+                    // toastr.error(response.message);
+                    var message = response.message;
+					toastrku("error", message);
+                }
+
+            },
+            error: function(xhr) {
+            },
+            complete: function() {
+            }
+        });
+    }
+
+    function setTablesKJPP1(datas)
+    {
+        let i=1;
+        $.each(datas, function(key, value){
+            var kjppName = value.kjpp_code+' - '+value.kjpp_name;
+            var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
+            var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
+            var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
+            var htmlDokumenPersetujuanDownload='';
+            var dokumenPersetujuanDownload = value.dokumen_persetujuan;
+            if(dokumenPersetujuanDownload)
+            {
+                htmlDokumenPersetujuanDownload='<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="'+value.dokumen_persetujuan+'" class="badge badge-sm badge-outline" download="'+value.attachment+'">'+value.attachment+' &nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>';
+            }
+            
+            var markup = '<tr>';
+            markup +='<td valign="top">'+i+'</td>';
+            markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
+            // No Proposal
+            markup +='<td valign="top">';
+                markup +='<input type="hidden" id="{{$route[1]}}_penawarandetail_id_'+value.id+'" name="{{$route[1]}}_penawarandetail_id[]" value="'+value.id+'">';
+                markup +='<input disabled="" type="text" value="'+no_proposal+'" class="inputku file-input" id="{{$route[1]}}_no_proposal_'+value.id+'" name="{{$route[1]}}_no_proposal[]">';
+                markup +='<em id="{{$route[1]}}_no_proposal_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
+            markup +='</td>';
+            // No Proposal
+            // Tanggal Proposal
+            markup +='<td valign="top">';
+                markup +='<input disabled="" type="date" value="'+tgl_proposal+'" class="inputku file-input" id="{{$route[1]}}_tgl_proposal_'+value.id+'" name="{{$route[1]}}_tgl_proposal[]" >';
+                markup +='<em id="{{$route[1]}}_tgl_proposal_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
+            markup +='</td>';
+            // Tanggal Proposal
+                
+            // Biaya Penawaran
+            markup +='<td valign="top">';
+                markup +='<div class="input-group"><span class="inputku btn btn-input" id="{{$route[1]}}_rp_'+value.id+'">Rp.</span><input disabled="" type="text" style="text-align: right;" onkeydown="return numbersonly(this, event);" onkeyup="javascript:tandaPemisahTitik(this);" class="inputku input" id="{{$route[1]}}_biayaPenawaran_'+value.id+'" name="{{$route[1]}}_biayaPenawaran[]"></div>';
+                markup +='<em id="{{$route[1]}}_biayaPenawaran_msg_'+value.id+'" class="alert text-danger text-sm"></em>';
+            markup +='</td>';    
+            // Biaya Penawaran    
+            // Upload Penawaran
+            markup +='<td valign="top">';
+                markup +='<input disabled="" type="file" class="inputku file-input" id="{{$route[1]}}_dokumenPersetujuan_'+value.id+'" name="{{$route[1]}}_dokumenPersetujuan[]" accept="application/pdf" />';
+                markup +='<em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload;
+            markup +='</td>';
+            // Upload Penawaran
+            markup +='<td valign="top"><div class="flex flex-nowrap justify-center">';
+                markup +='<a disabled="" class="btn btn-sm btn-icon btn-clear btn-info" href="javascript:void(0)" id="{{$route[1]}}_icon_update_'+value.id+'" title="Proses Penawaran '+kjppName+'" onclick="updateDataUlang('+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\')"><i class="ki-outline ki-bookmark"></i></a>';
+                markup +='<a disabled="" class="delete btn btn-sm btn-icon btn-clear btn-danger" id="{{$route[1]}}_icon_delete_'+value.id+'" onclick="deleteDataUlang('+value.id+',\''+kjppName+'\')" title="Hapus Proses Penawaran '+kjppName+'"><i class="ki-outline ki-trash"></i></a>';
+                markup +='<label class="switch"><input name="{{$route[1]}}_check_'+value.id+'" id="{{$route[1]}}_check_'+value.id+'" onclick="switchProses('+value.id+')" type="checkbox" value="0"/><span class="switch-label">Proses</span></label>';
+                markup +='</div></td>';
+            markup += '</tr>';
+
+            $('#tbodyKJPP1').append(markup);
+
+            // pengecekan kondisi format number
+            var biaya_penawaran_format = "";
+            if(biaya_penawaran)
+                biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran);
+            $("#{{$route[1]}}_biayaPenawaran_"+value.id).val(biaya_penawaran_format);
+            
+            i++;
+        });
+    }
+
+    $(document).on("input", "input:file", function(e) {
+        let fileName = e.target.files[0].name;
+        let inputFile = e.target.id;
+        const myArray = inputFile.split("_");
+        let penawaranID = myArray[myArray.length-1];
+        let kjppName = $("#{{$route[1]}}_kjppName_"+penawaranID).text();
+        let upld = fileName.split(".").pop();
+        if(upld == "pdf" || upld =="PDF"){}
+        else{
+            removeErrorCssMsg();
+            $("#{{$route[1]}}_dokumenPersetujuan_"+penawaranID).addClass(" border-danger");
+            $("#{{$route[1]}}_dokumenPersetujuan_msg_"+penawaranID).text("Silahkan Masukan tipe file PDF Mas");
+            $("#"+inputFile).val("");
+        }
+    });
+
+    function setKJPPList1(datas)
+    {
+        $('#{{$route[1]}}_kjpps1').empty().append('<option value="0"> - Pilih KJPP - </option>');
+
+        $.each(datas, function(key, value){
+            var stringVal = value.code+' - '+value.name;
+            $('#{{$route[1]}}_kjpps1').append(new Option(stringVal, value.id));
+        });
+    }
+    </script>
+@endpush

resources/views/prosespenawaran/show.blade.php

@@ -14,7 +14,18 @@
                 Detail Data Proses Penawaran
             </h3>
             <div class="flex items-center gap-2">
-                <a href="{{ route('tender.prosespenawaran.edit', $id) }}" class="btn btn-xs btn-primary" title="Register"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran</a>
+                @php
+                    $buttonProses='';
+                    if('tender'==$prosespenawaran->status)
+                    {
+                        $buttonProses='<a href="'. route('tender.prosespenawaran.edit', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran"><i class="ki-outline ki-notepad-edit"></i> Proses Penawaran</a>';
+                    }
+                    elseif ('proposal-tender'==$prosespenawaran->status) 
+                    {
+                        $buttonProses='<a href="'. route('tender.prosespenawaran.editulang', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>';
+                    }
+                @endphp
+                {!! $buttonProses !!}
                 <a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
             </div>
         </div>

resources/views/registrasi/edit.blade.php

@@ -83,6 +83,15 @@
                                     <em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
                                 </div>                                
                             </div>
+                            <div id="{{ $route[0] }}_div_catatan2" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Catatan
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <textarea class="inputku textarea" name="{{$route[0]}}_catatan2" id="{{$route[0]}}_catatan2" placeholder="Catatan..." rows="6"></textarea>
+                                    <em id="{{$route[0]}}_catatan2_msg" class="alert text-danger text-sm"></em>
+                                </div>
+                            </div>
                             <div class="flex justify-end">
                                 <button type="button" class="btn btn-primary" id="toEdit">
                                     Save

resources/views/registrasi/js/editjs.blade.php

@@ -13,6 +13,7 @@
         $("#{{ $route[0] }}_div_jenis_pilihan").show();
         $("#{{ $route[0] }}_div_catatan").hide();
         $("#{{ $route[0] }}_div_region").hide();
+        $("#{{ $route[0] }}_div_catatan2").show();
         // prepare data
         setData();
     }
@@ -94,12 +95,14 @@
             $("#{{ $route[0] }}_div_jenis_pilihan").show();
             $("#{{ $route[0] }}_catatan").val('');
             $("#{{ $route[0] }}_div_catatan").hide();
+            $("#{{ $route[0] }}_div_catatan2").show();
         }
         else
         {
             $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
             $("#{{ $route[0] }}_div_jenis_pilihan").hide();
             $("#{{ $route[0] }}_div_catatan").show();
+            $("#{{ $route[0] }}_div_catatan2").hide();
         }
     });
 
@@ -115,6 +118,7 @@
         let jenis_penilaian = $("#{{$route[0]}}_jenis_penilaian").val();
         let region = $("#{{$route[0]}}_region").val();
         let catatan = $("#{{$route[0]}}_catatan").val();
+        let catatan2 = $("#{{$route[0]}}_catatan2").val();
 
         if(jenis_penilaian==0)
             jenis_penilaian='';
@@ -129,6 +133,7 @@
         input_data.jenis_penilaian= jenis_penilaian;
         input_data.region= region;
         input_data.catatan = catatan;
+        input_data.catatan2 = catatan2;
 
         let useURL= '{{ route($route[0].'.update', $id) }}';
         $.ajax({

resources/views/registrasi/show.blade.php

@@ -147,6 +147,38 @@
 
         @include('lpj::component.detail-jaminan')
 
+		<div class="card min-w-full">
+			<div class="card-header">
+				<h3 class="card-title">
+					Data Biaya
+				</h3>
+			</div>
+			<div class="card-table scrollable-x-auto pb-3">
+				<div class="grid grid-cols-1 xl:grid-cols-1 gap-5 lg:gap-7.5">
+					<div class="col-span-1">
+						<table class="table align-middle text-sm text-gray-500">
+							<tr>
+								<td width="10%" class="py-2 text-gray-600 font-normal">
+									Status Bayar
+								</td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
+									{{ strtoupper(str_replace('_',' ',$permohonan->status_bayar)) }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3">
+									Nilai NJOP
+								</td>
+								<td class="py-3 text-gray-700 text-2sm font-normal">
+									{{ $permohonan->nilai_njop }}
+								</td>
+							</tr>
+							
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
 
 		<div class="card pb-2.5">
 			<div class="card-header" id="basic_settings">
@@ -199,7 +231,7 @@
 							<em id="{{$route[0]}}_catatan_msg" class="alert text-danger text-sm"></em>
 						</div>
 					</div>
-					<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-5">
+					<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
 						<label class="form-label max-w-56">
 							Region
 						</label>
@@ -209,6 +241,15 @@
 							</select>
 							<em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
 						</div>                                
+					</div><br />
+					<div id="{{ $route[0] }}_div_catatan2" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+						<label class="form-label max-w-56">
+							Catatan
+						</label>
+						<div class="flex flex-wrap items-baseline w-full">
+							<textarea class="inputku textarea" name="{{$route[0]}}_catatan2" id="{{$route[0]}}_catatan2" placeholder="Catatan..." rows="6"></textarea>
+							<em id="{{$route[0]}}_catatan2_msg" class="alert text-danger text-sm"></em>
+						</div>
 					</div>
 					<div class="flex justify-end mt-5">
 						<button type="button" class="btn btn-primary" id="toEdit">

resources/views/registrasifinal/edit.blade.php

@@ -13,7 +13,8 @@
 <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
    
         <form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST">
-            <input type="hidden" id="id" name="id" value="{{ $id }}">
+            <!-- $id => penawaran.id -->
+            <input type="hidden" id="{{$route[0]}}_id" name="id" value="{{ $id }}">
             @method('PUT')
             @csrf
                     <div class="card pb-2.5">
@@ -69,7 +70,7 @@
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <em id="" class="alert text-danger text-sm"></em>
-                                    <div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="javascript:void(0)" class="badge badge-sm badge-outline">SPK_Dokumen.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>
+                                    <div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a download id="pdfSPK" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>
                                 </div>
                             </div>
                             <div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

resources/views/registrasifinal/index.blade.php

@@ -114,6 +114,9 @@
                 },
                 tujuan_penilaian_kjpp_name: {
                     title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian_kjpp.name || ''}`;
+                    },
                 },
                 nama_kjpp_sebelumnya: {
                     title: 'Nama KJPP Terpilih',
@@ -133,10 +136,10 @@
                     title: 'Status',
                     render: (item, data) => {
                         return `<div class="flex flex-nowrap justify-center">
-                            <a onclick="showRegistrasiFinal(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                            <a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
                                 <i class="ki-outline ki-eye"></i>
                             </a>
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.id}/edit">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.permohonan.id}/edit">
                                 <i class="ki-outline ki-notepad-edit"></i>
                             </a>
                         </div>`;

resources/views/registrasifinal/js/editjs.blade.php

@@ -17,7 +17,8 @@
 
     function setData()
     {
-        let id = $("#id").val();
+        // id => penawaran.id
+        let id = $("#{{$route[0]}}_id").val();
         let token =  "{{ csrf_token() }}";
         // alert('token = ' + token);
         var useURL = "{{ route('registrasifinal.setData') }}";
@@ -43,6 +44,8 @@
                     $("#textCodePenawaran").text(response.penawaran.code);
                     $("#textStatusPenawaran").text(response.penawaran.status);
                     setRegionList(response.regions,0);
+                   //  alert(response.datas.dokumen);
+                    $("#pdfSPK").attr("href", response.datas.dokumen); 
 
                     // success
                     // var message = response.message;
@@ -79,6 +82,7 @@
         let token   = "{{ csrf_token() }}";
 
         let _method   = $('input[name=_method]').val();
+         // id => penawaran.id
         let id   = $('#{{$route[0]}}_id').val();
         let region = $("#{{$route[0]}}_region").val();
         let catatan = $("#{{$route[0]}}_catatan").val();

resources/views/registrasifinal/show.blade.php

@@ -45,10 +45,9 @@
 						Tujan Permohonan:
 					</h3>
 					<span class="text-2sm text-gray-700">
-						{{ $permohonan->tujuanPenilaian->name }}
+						{{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->dokumen !!}
 					</span>
 				</div>
-
 			</div>
 		</div>
 

resources/views/spk/index.blade.php

@@ -78,18 +78,21 @@
 
 @push('scripts')
 <script type="text/javascript">
-    function spkShow(regId)
-    {
-        var url = "{{ url('show') }}/"+regId;
-        $(location).attr('href',url);
-    }
-
     function spkCreate(regId)
     {
         var url1 = "/spk/"+regId+"/edit";
         var url = "{{ url('/') }}"+url1;
         $(location).attr('href',url);
     }
+
+    function formatTanggalIndonesia(dateString) {
+        const date = new Date(dateString);
+        const day = date.getDate().toString().padStart(2, '0');
+        const monthNames = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'];
+        const month = monthNames[date.getMonth()];
+        const year = date.getFullYear();
+        return `${day} ${month} ${year}`;
+    }
 </script>
 <script type="module">
     const element = document.querySelector('#spk-table');
@@ -115,25 +118,44 @@
             },
             code: {
                 title: 'Kode Penawaran',
+                render: (item, data) => {
+                   if(data.penawaran) {
+                       return `${data.penawaran.code}`;
+                   }
+
+                   return '-';
+                },
             },
             date_range: {
                 title: 'Tanggal Penawaran',
+                render: (item, data) => {
+                    const startDate = formatTanggalIndonesia(data.penawaran.start_date);
+                    const endDate = formatTanggalIndonesia(data.penawaran.end_date);
+                    return `${startDate} - ${endDate}`;
+                },
             },
             tujuan_penilaian_kjpp_name: {
                 title: 'Tujuan Penilaian',
+                render: (item, data) => {
+                    if(data.penawaran.tujuan_penilaian_kjpp) {
+                        return `${data.penawaran.tujuan_penilaian_kjpp.name}`;
+                    }
+
+                    return '-';
+                },
             },
             nama_kjpp_sebelumnya: {
                 title: 'Nama KJPP Terpilih',
                 render: (item, data) => {
-                    return `${data.nama_kjpp_sebelumnya}`+'<br />'
+                    return `${data.penawaran.nama_kjpp_sebelumnya}`+'<br />'
-                            +`${data.biaya_kjpp_sebelumnya}`+'<br /> '
+                            +`${data.penawaran.biaya_kjpp_sebelumnya}`+'<br /> '
-                            +`${data.tanggal_penilaian_sebelumnya}`;
+                            +`${data.penawaran.tanggal_penilaian_sebelumnya}`;
                 },
             },
             status: {
                 title: 'Status',
                 render: (item, data) => {
-                    return `${data.status}`.toUpperCase();
+                    return `${data.penawaran.status}`.toUpperCase();
                 },
             },
             actions: {
@@ -141,19 +163,19 @@
                 render: (item, data) => {
                     var spkShow ='';
                     var spkCreate='';
-                    if(!data.dokumenSPK)
+                    if(!data.dokumen)
                     {
-                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.id})" >
+                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.penawaran.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }
                     else
                     {
                         spkShow =`<div class="flex flex-nowrap justify-center">
-                        <a onclick="spkShow(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Lihat SPK">
+                        <a href="/spk/${data.id}/download" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK">
-                            <i class="ki-outline ki-eye"></i>
+                            <i class="ki-filled ki-cloud-download"></i>
                         </a> `;
-                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
+                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.penawaran.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }

routes/breadcrumbs.php

@@ -434,94 +434,6 @@ Breadcrumbs::for('surveyor.data-pembanding', function (BreadcrumbTrail $trail) {
     $trail->push('Form Pembanding');
 });
 
-
-Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
-    $trail->push('Registrasi', route('registrasi.index'));
-});
-
-Breadcrumbs::for('registrasi.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('registrasi');
-    $trail->push('Tambah Registrasi');
-});
-
-Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('registrasi');
-    $trail->push('Detail Permohona');
-});
-// andy add
-// andy add 20241009
-Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender');
-    $trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
-});
-
-Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender.prosespenawaran');
-    $trail->push('Tambah Data Proses Penawaran');
-});
-
-Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender.prosespenawaran');
-    $trail->push('Detail Data Proses Penawaran');
-});
-// andy add 20241009
-// andy add Proses Penawaran Ulang
-Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender');
-    $trail->push('Data Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
-});
-
-Breadcrumbs::for('tender.prosespenawaranulang.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender.prosespenawaranulang');
-    $trail->push('Tambah Data Proses Penawaran Ulang');
-});
-
-Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender.prosespenawaranulang');
-    $trail->push('Detail Data Proses Penawaran Ulang');
-});
-// andy add Proses Penawaran Ulang
-// andy add Otorisasi Tender
-Breadcrumbs::for('otorisasitender', function (BreadcrumbTrail $trail) {
-    $trail->push('Otorisasi Tender');
-});
-Breadcrumbs::for('otorisasitender.penawaran', function (BreadcrumbTrail $trail) {
-    $trail->parent('otorisasitender');
-    $trail->push('Data Otorisasi Penawaran', route('otorisasitender.penawaran.index'));
-});
-Breadcrumbs::for('otorisasitender.penawaran.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('otorisasitender.penawaran');
-    $trail->push('Tambah Data Otorisasi Penawaran ');
-});
-Breadcrumbs::for('otorisasitender.penawaran.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('otorisasitender.penawaran');
-    $trail->push('Detail Data Otorisasi Penawaran');
-});
-// andy add Otorisasi Tender
-// spk
-Breadcrumbs::for('spk', function (BreadcrumbTrail $trail) {
-    $trail->push('SPK', route('spk.index'));
-});
-Breadcrumbs::for('spk.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('spk');
-    $trail->push('Buat SPK');
-});
-// spk
-// andy add registrasi final
-Breadcrumbs::for('registrasifinal', function (BreadcrumbTrail $trail) {
-    $trail->push('Registrasi Final', route('registrasifinal.index'));
-});
-Breadcrumbs::for('registrasifinal.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('registrasifinal');
-    $trail->push('Detail Registrasi Final');
-});
-Breadcrumbs::for('registrasifinal.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('registrasifinal');
-    $trail->push('Tambah registrasifinal');
-});
-// andy add registrasi final
-
-
 Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail) {
     $trail->parent('otorisator');
     $trail->push('Otorisator', route('otorisator.pelaporan.index'));
@@ -637,3 +549,6 @@ Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) {
     $trail->parent('basicdata');
     $trail->push('SLA', route('basicdata.sla.index'));
 });
+
+// add andy
+require __DIR__ . '/breadcrumbs_registrasi.php';

routes/breadcrumbs_registrasi.php

@@ -0,0 +1,95 @@
+<?php
+use Diglactic\Breadcrumbs\Breadcrumbs;
+use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
+
+// registrasi
+Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
+    $trail->push('Registrasi', route('registrasi.index'));
+});
+
+Breadcrumbs::for('registrasi.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('registrasi');
+    $trail->push('Tambah Registrasi');
+});
+
+Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('registrasi');
+    $trail->push('Detail Permohona');
+});
+// registrasi
+// prosespenawaran
+Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender');
+    $trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
+});
+
+Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaran');
+    $trail->push('Tambah Data Proses Penawaran');
+});
+
+Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaran');
+    $trail->push('Detail Data Proses Penawaran');
+});
+
+Breadcrumbs::for('tender.prosespenawaran.editulang', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaran');
+    $trail->push('Tambah Data Proses Penawaran Ulang');
+});
+// prosespenawaran
+// Proses Penawaran Ulang
+Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender');
+    $trail->push('Data Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
+});
+
+Breadcrumbs::for('tender.prosespenawaranulang.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaranulang');
+    $trail->push('Tambah Data Proses Penawaran Ulang');
+});
+
+Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaranulang');
+    $trail->push('Detail Data Proses Penawaran Ulang');
+});
+// Proses Penawaran Ulang
+// Otorisasi Tender
+Breadcrumbs::for('otorisasitender', function (BreadcrumbTrail $trail) {
+    $trail->push('Otorisasi Tender');
+});
+Breadcrumbs::for('otorisasitender.penawaran', function (BreadcrumbTrail $trail) {
+    $trail->parent('otorisasitender');
+    $trail->push('Data Otorisasi Penawaran', route('otorisasitender.penawaran.index'));
+});
+Breadcrumbs::for('otorisasitender.penawaran.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('otorisasitender.penawaran');
+    $trail->push('Tambah Data Otorisasi Penawaran ');
+});
+Breadcrumbs::for('otorisasitender.penawaran.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('otorisasitender.penawaran');
+    $trail->push('Detail Data Otorisasi Penawaran');
+});
+// Otorisasi Tender
+// spk
+Breadcrumbs::for('spk', function (BreadcrumbTrail $trail) {
+    $trail->push('SPK', route('spk.index'));
+});
+Breadcrumbs::for('spk.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('spk');
+    $trail->push('Buat SPK');
+});
+// spk
+// registrasi final
+Breadcrumbs::for('registrasifinal', function (BreadcrumbTrail $trail) {
+    $trail->push('Registrasi Final', route('registrasifinal.index'));
+});
+Breadcrumbs::for('registrasifinal.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('registrasifinal');
+    $trail->push('Detail Registrasi Final');
+});
+Breadcrumbs::for('registrasifinal.edit', function (BreadcrumbTrail $trail) {
+    $trail->parent('registrasifinal');
+    $trail->push('Tambah registrasifinal');
+});
+// registrasi final

routes/registrasi.php

@@ -47,9 +47,21 @@ Route::middleware(['auth'])->group(function () {
            Route::put('/prosespenawaran/{prosespenawaran}', 'update')->name('prosespenawaran.update');
            // update all
            Route::put('/prosespenawaranAll/{prosespenawaranAll}', 'updateAll')->name('prosespenawaran.updateAll');
+           // update draft
+           Route::put('/prosespenawaranDraft/{prosespenawaranDraft}', 'updateDraft')->name('prosespenawaran.updateDraft');
            // delete KJPP, status set = 0 
            Route::put('/prosespenawaranKJPPStatus/{prosespenawaranKJPPStatus}', 'updateKJPPStatus')->name('prosespenawaran.updateKJPPStatus');
            
+           // add KJPP to detail_penawaran
+           Route::post('prosespenawaran/store', 'store')->name('prosespenawaran.store');
+           Route::post('prosespenawaran/storeUlang', 'storeUlang')->name('prosespenawaran.storeUlang');
+
+           // edit proses penawaran ulang
+           Route::get('prosespenawaran/{prosespenawaran}/editulang', 'editulang')->name('prosespenawaran.editulang');
+           Route::post('prosespenawaran/setDataUlang', 'setDataUlang')->name('prosespenawaran.setDataUlang');
+           Route::put('/prosespenawaran2/{prosespenawaran2}', 'updateulang')->name('prosespenawaran.updateulang');
+           Route::put('/prosespenawaranKJPPStatusUlang/{prosespenawaranKJPPStatusUlang}', 'updateKJPPStatusUlang')->name('prosespenawaran.updateKJPPStatusUlang');
+           
         });
 
         // Proses Penawaran Ulang
@@ -88,11 +100,14 @@ Route::middleware(['auth'])->group(function () {
 
     Route::controller(SpkController::class)->group(function(){
         Route::get('/spk/dokumennya', 'dokumennya')->name('spk.dokumennya');
+        
         Route::get('/spk', 'index')->name('spk.index');
         Route::get('/spk/datatables', 'dataForDatatables')->name('spk.datatables');
         Route::get('/spk/{spk}', 'show')->name('spk.show');
         Route::get('/spk/{spk}/edit', 'edit')->name('spk.edit');
         Route::put('/spk/{spk}', 'update')->name('spk.update');	
+        
+        Route::get('spk/{spk}/download', 'download')->name('spk.download');
     });
 
     Route::controller(RegistrasiFinalController::class)->group(function(){