penggabungan feature proses penawaran dan feature proses penawaran ulang, dan terkait keinginan user

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,41 @@
 
                     $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],
+                            ];
 
-                            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) {
-                                        'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
+                                    if ($file) {
-                                        $file_name,
+                                        $file_name = $file->getClientOriginalName();
-                                    );
+                                        $file->storeAs(
-
+                                            'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
-                                    $detail = [
+                                            $file_name,
-                                        'dokumen_jaminan_id'         => $document->id,
+                                        );
-                                        'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key],
+                                        $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
-                                        'dokumen_jaminan'            => 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name,
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
-                                        'name'                       => $request->name[$key],
+                                    }
-                                        'keterangan'                 => $request->keterangan[$key],
-                                        '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(),
-                                    );
                                 }
                             }
+
+                            if (!empty($dokumenJaminan)) {
+                                $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
+                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
+                            }
+
+                            DetailDokumenJaminan::create($detailData);
                         }
-                        DB::commit();
-                    } catch (Exception $e) {
-                        DB::rollBack();
-                        return redirect()->route('debitur.jaminan.index', $id)->with(
-                            'error',
-                            'gg' . $e->getMessage(),
-                        );
                     }
 
+                    DB::commit();
                     return redirect()->route('debitur.jaminan.index', $id)->with(
                         'success',
                         'Dokumen Jaminan berhasil ditambahkan',
@@ -149,6 +145,7 @@
             $debitur = Debiture::find($id);
 
             $validate = $request->validated();
+
             if ($validate) {
                 try {
                     DB::beginTransaction();
@@ -226,44 +223,59 @@
                     $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){
+                    if ($request->jenis_legalitas_jaminan_id) {
-                        foreach($request->jenis_legalitas_jaminan_id as $key => $value){
+                        foreach ($request->jenis_legalitas_jaminan_id as $key => $value) {
                             $detailData = [
-                                'dokumen_jaminan_id' => $document->id,
+                                'dokumen_jaminan_id'         => $document->id,
                                 'jenis_legalitas_jaminan_id' => $value,
-                                'name' => $request->name[$key],
+                                'name'                       => $request->name[$key],
-                                'keterangan' => $request->keterangan[$key],
+                                'keterangan'                 => $request->keterangan[$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])) {
-                                $detailId = $request->detail_dokumen_jaminan_id[$key];
+                                $detailId       = $request->detail_dokumen_jaminan_id[$key];
                                 $detailDocument = $existingDetails->get($detailId);
                                 if ($detailDocument) {
                                     // Merge new files with existing ones
                                     if (!empty($dokumenJaminan)) {
-                                        $existingFiles = json_decode($detailDocument->dokumen_jaminan, true) ?: [];
+                                        $existingFiles                 = json_decode(
-                                        $mergedFiles = array_merge($existingFiles, $dokumenJaminan);
+                                            $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);
@@ -299,24 +311,26 @@
             $id,
             $jaminan,
         ) {
-            $document              = DokumenJaminan::find($jaminan);
+            $document = DokumenJaminan::find($jaminan);
-            $details               = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get();
+            $details  = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get();
 
-            $debitur               = Debiture::find($document->debiture_id);
+            $debitur   = Debiture::find($document->debiture_id);
-            $provinces             = Province::all();
+            $provinces = Province::all();
-            $cities                = City::where('province_code', $document->province_code)->get();
+            $cities    = City::where('province_code', $document->province_code)->get();
-            $districts             = District::where('city_code', $document->city_code)->get();
+            $districts = District::where('city_code', $document->city_code)->get();
-            $villages              = Village::where('district_code', $document->district_code)->get();
+            $villages  = Village::where('district_code', $document->district_code)->get();
 
 
             $jenisJaminan          = JenisJaminan::all();
             $jenisLegalitasJaminan = JenisLegalitasJaminan::all();
 
-            $_jenisJaminan = JenisJaminan::find($document->jenis_jaminan_id);
+            $_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
@@ -324,8 +338,8 @@
 
             $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get();
 
-            $pemilikJaminan        = PemilikJaminan::where('debiture_id', $document->debiture_id)->get();
+            $pemilikJaminan  = PemilikJaminan::where('debiture_id', $document->debiture_id)->get();
-            $hubunganPemilik       = HubunganPemilikJaminan::all();
+            $hubunganPemilik = HubunganPemilikJaminan::all();
 
             return view(
                 'lpj::debitur.jaminan',
@@ -341,7 +355,7 @@
                     'villages',
                     'pemilikJaminan',
                     'hubunganPemilik',
-                    'legalitas'
+                    'legalitas',
                 ),
             );
         }
@@ -378,7 +392,9 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
-                    $files = is_array(json_decode($document->dokumen_jaminan)) ? json_decode($document->dokumen_jaminan) : [$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);
@@ -411,7 +427,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')]));
         }
 
@@ -425,20 +443,19 @@
         }
 
 
-        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1) : JsonResponse
+        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1)
-        {
+        : JsonResponse {
-
+            $jenisJaminan        = JenisJaminan::findOrFail($jenisJaminanId);
-            $jenisJaminan = JenisJaminan::findOrFail($jenisJaminanId);
+            $legalitasJaminan    = $jenisJaminan->jenis_legalitas_jaminan_id;
-            $legalitasJaminan = $jenisJaminan->jenis_legalitas_jaminan_id;
             $newLegalitasJaminan = JenisLegalitasJaminan::whereIn('code', json_decode($legalitasJaminan, true))->get();
 
             $existingLegalitas = [];
-            $newLegalitas = [];
+            $newLegalitas      = [];
 
             // Create a set of new jenis_legalitas_jaminan_ids for quick lookup
             $newLegalitasIds = $newLegalitasJaminan->pluck('id')->toArray();
 
-            if($id>0) {
+            if ($id > 0) {
                 $document = DokumenJaminan::findOrFail($id);
                 if ($document && $document->detail) {
                     foreach ($document->detail as $detail) {
@@ -448,12 +465,14 @@
                                 '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,
                                 '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,15 +482,15 @@
             foreach ($newLegalitasJaminan as $legalitas) {
                 if (!Collection::make($existingLegalitas)->contains('jenis_legalitas_jaminan_id', $legalitas->id)) {
                     $newLegalitas[] = [
-                        'id' => null,
+                        'id'                         => null,
                         'jenis_legalitas_jaminan_id' => $legalitas->id,
-                        'name' => $legalitas->name,
+                        'name'                       => $legalitas->name,
-                        'dokumen_jaminan' => null,
+                        'dokumen_jaminan'            => null,
-                        'custom_field' => $legalitas->custom_field,
+                        'custom_field'               => $legalitas->custom_field,
-                        'custom_field_type' => $legalitas->custom_field_type,
+                        'custom_field_type'          => $legalitas->custom_field_type,
-                        'details' => null,
+                        'details'                    => null,
-                        'keterangan' => null,
+                        'keterangan'                 => null,
-                        'is_existing' => false
+                        'is_existing'                => false,
                     ];
                 }
             }

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,65 +167,52 @@ class ProsesPenawaranController extends Controller
         $data = array();
         $dataPenawaranDetail = array();
         if (request()->ajax()) {
-            $validator = ProsesPenawaranController::rulesEditnya($request, $id);
+            
+            try {
 
-            if ($validator['fails']) {
+                $dataPenawaranDetail = ['updated_by' => Auth::id(),
-                $data['message'] = $validator['errors'];
+                            'updated_at' => now(),
-                $data['status'] = 'error';
+                            'no_proposal' => $request->no_proposal,
-            }
+                            'tgl_proposal' => $request->tgl_proposal,
-            else
+                            'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
-            {
+                        ];
-                try {
 
-                    $dataPenawaranDetail = ['updated_by' => Auth::id(),
+                if ($request->hasFile('dokumen_persetujuan'))
-                               'updated_at' => now(),
+                {
-                               'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
+                    $file_tmp = $request->file('dokumen_persetujuan');
-                            ];
+                    $folderPath = 'uploads/penawaran/';
-
+                    if ($file_tmp->isValid())
-                    if ($request->hasFile('dokumen_persetujuan'))
                     {
-                        $file_tmp = $request->file('dokumen_persetujuan');
+                        $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
-                        $folderPath = 'uploads/penawaran/';
+                        $file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
-                        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();
+                        $extension = $file_tmp->getClientOriginalExtension();
-                            // kjppID_penawaranID_namaFile_userID_time
+                        // kjppID_penawaranID_namaFile_userID_time
-                            $newFileName = $request->kjpp_rekanan_id.'_'.$id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
+                        $newFileName = $request->kjpp_rekanan_id.'_'.$id.'_'.$file_name.'_'.Auth::user()->id."_".time() .'.'. $extension;
-                            Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
+                        Storage::disk('public')->put($folderPath.'/'.$newFileName,file_get_contents($file_tmp));
 
-                            $newFileNameWithPath = $folderPath . $newFileName;
+                        $newFileNameWithPath = $folderPath . $newFileName;
-                            $dataPenawaranDetail['attachment'] = $myFile;
+                        $dataPenawaranDetail['attachment'] = $myFile;
-                            $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath;
+                        $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
-                        {
-                            $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");
+                        $data['message'] ['check_file_jenis'] = array("Silahkan upload file pdf");
-
                     }
-
-                } catch (Exception $e) {
-
-                    $data['status'] = 'error';
-                    $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.');
                 }
-            }
+
+                $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/RegistrasiFinalController.php

@@ -3,10 +3,19 @@
     namespace Modules\Lpj\Http\Controllers;
 
     use App\Http\Controllers\Controller;
-use Carbon\Carbon;
+    use Carbon\Carbon;
-use Exception;
+    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 Illuminate\Support\Facades\Storage;
-use Modules\Lpj\Models\PenawaranTender;
 
     class RegistrasiFinalController extends Controller
     {
@@ -46,12 +46,12 @@ use Modules\Lpj\Models\PenawaranTender;
             }
 
             // Retrieve data from the database
-            // data.id => penawaran.id
+            $query = PenawaranTender::with(['permohonan', 'tujuanPenilaianKjpp'])->whereHas(
-            $query =PenawaranTender::query()
+                    'permohonan',
-                            ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                    function ($q) {
-                            ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                        $q->where('status', '=', 'spk');
-                            ->where('penawaran.status','=','spk')
+                    },
-                            ->withCount('penawarandetails');
+                )->withCount('penawarandetails');
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
@@ -90,25 +90,23 @@ use Modules\Lpj\Models\PenawaranTender;
             //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
             $data = $query->with(['permohonan'])->get();
             // dd($data);
-            $i=0;
+            $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++;
@@ -129,24 +127,20 @@ use Modules\Lpj\Models\PenawaranTender;
                 'pageCount'       => $pageCount,
                 'page'            => $currentPage,
                 'totalCount'      => $totalRecords,
-                'data'            => $data
+                'data'            => $data,
             ]);
         }
 
         public function show($id)
         {
-            // $id => penawaran.id
+            $permohonan = Permohonan::find($id);
-            $penawaran = PenawaranTender::find($id);
+            if ($permohonan->dokumen) {
-            $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
+                $pdfSPK_path         = Storage::url($permohonan->dokumen);
-
-            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>';
+                $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'));
+            return view('lpj::registrasifinal.show', compact('id', 'permohonan'));
         }
 
         public function edit($id)
@@ -155,130 +149,123 @@ 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 = [];
-            $penawaran=null;
-            $regions=null;
 
             if (request()->ajax()) {
-                // $id => penawaran.id
+                $id    = $request->id;
-                $id = $request->id;
+                $datas = Permohonan::find($id);
-                $penawaran = PenawaranTender::find($id);
+
-                $datas  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
                 if ($datas) {
-                    
+                    $penawaran = null;
-                    $regions=Regions::pluck('name', 'id');
+                    $regions   = null;
+                    $regions   = Regions::pluck('name', 'id');
+                    $penawaran = PenawaranTender::where('nomor_registrasi', '=', $datas->nomor_registrasi)->first();
 
                     $penawaranString = "";
-                    if($penawaran->status)
+                    if ($penawaran->status) {
-                    {
+                        $penawaranString   = convertSlug($penawaran->status);
-                        $penawaranString = convertSlug($penawaran->status);
                         $penawaran->status = $penawaranString;
-                    } 
+                    }
-                    
+
-                    if($datas->dokumen)
+                    if ($datas->dokumen) {
-                    {
+                        $pdfSPK_path    = Storage::url($datas->dokumen);
-                        $pdfSPK_path = Storage::url($datas->dokumen);
                         $datas->dokumen = $pdfSPK_path;
                     } 
 
-                    $data['status'] = 'success';
+                    $data['status']                     = 'success';
-                    $data['regions'] = $regions;
+                    $data['regions']                    = $regions;
-                    $data['penawaran'] = $penawaran;
+                    $data['penawaran']                  = $penawaran;
-                    $data['datas'] = $datas;
+                    $data['datas']                      = $datas;
-                    $data['message']['message_success'] = array("data successfully found");
+                    $data['message']['message_success'] = ["data successfully found"];
                 } else {
-                    $data['status'] = 'error';
+                    $data['status']                  = 'error';
-                    $data['datas'] = null;
+                    $data['datas']                   = null;
-                    $data['message']['message_data'] = array("data not found");
+                    $data['message']['message_data'] = ["data not found"];
                 }
             } else {
-                $data['status'] = 'error';
+                $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);
 
                 if ($validator['fails']) {
                     $data['message'] = $validator['errors'];
-                    $data['status'] = 'error';
+                    $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 = [
-                                    'status' => 'registrasi-final',
+                            'status'            => 'registrasi-final',
-                                    'region_id' => $request->region,
+                            'region_id'         => $request->region,
-                                    'keterangan' => $request->catatan,
+                            'keterangan'        => $request->catatan,
-                                    'authorized_at' => now(),
+                            'authorized_at'     => now(),
-                                    'authorized_status' =>1,
+                            'authorized_status' => 1,
-                                    'authorized_by' => Auth::id()
+                            'authorized_by'     => Auth::id(),
-                                  ];
+                        ];
 
                         $dataPenawaran = ['status' => 'registrasi-final'];
 
-                        // $id => penawaran.id
+
-                        $penawaran = PenawaranTender::find($id);
+                        $permohonan = Permohonan::find($id);
-                        $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
+                        $penawaran  = PenawaranTender::where('nomor_registrasi', '=', $permohonan->nomor_registrasi)
+                                                     ->first();
 
                         $permohonan->update($dataPermohonan);
                         $penawaran->update($dataPenawaran);
                         //
                         DB::commit();
 
-                        $data['status'] = 'success';
+                        $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['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['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)
         {
-            $validate_catatan='';
+            $validate_catatan = '';
 
             $validateIt = [
                 // 'name' diambil dari definisi parameter yang di kirim pada POST Data
-                'region' => 'required',
+                'region'  => 'required',
                 'catatan' => 'required',
             ];
 
             $messageIt = [
-                'region.required' => 'Silahkan pilih Region',
+                'region.required'  => 'Silahkan pilih Region',
-                'catatan.required' => 'Silahkan isi Catatan'
+                'catatan.required' => 'Silahkan isi Catatan',
             ];
 
             $validator = Validator::make($request->all(), $validateIt, $messageIt);
 
-            $data['fails'] = $validator->fails();
+            $data['fails']  = $validator->fails();
             $data['errors'] = $validator->errors();
 
             return $data;

app/Models/DetailDokumenJaminan.php

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

database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php

@@ -20,7 +20,7 @@ return new class extends Migration
             $table->string('kontur_tanah');
             $table->string('ketinggian_jalan');
             $table->string('kontur_jalan');
-            $table->string('posis_kavling');
+            $table->string('posisi_kavling');
             $table->enum('tusuk_sate', ['yes', 'no']);
             $table->enum('lockland', ['yes', 'no']);
             $table->string('kondisi_fisik_tanah');

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_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_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');
+        });
+    }
+};

module.json

@@ -59,15 +59,7 @@
             "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

@@ -69,7 +69,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="py-3  max-w-[100px] align-top" >
+                                    <td class="py-3  max-w-[100px] align-top">
                                         Dokumen Jaminan
                                     </td>
                                     <td class="py-3 text-gray-700 text-2sm font-normal">
@@ -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)
-                                                @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
+                                                <div class="flex w-full lg:w-[30%]">
-                                                    <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                                    @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
-                                                       class="badge badge-sm badge-outline mt-2 mr-2">
+                                                        @if(!empty($dokumen_nomor))
-                                                        {{ basename($dokumen) }}
+                                                            <span class="flex-1 mt-2 text-info">Nomor Dokumen : {{ $dokumen_nomor[$index] }}</span>
-                                                        <i class="ki-filled ki-cloud-download"></i>
+                                                        @endif
-                                                    </a>
+                                                        <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                                @endif
+                                                           class="flex-none badge badge-sm badge-outline mt-2 mr-2">
-                                                <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>
+                                                            {{ basename($dokumen) }}
+                                                            <i class="ki-filled ki-cloud-download"></i>
+                                                        </a>
+                                                    @endif
+                                                    <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/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>
 
@@ -158,10 +158,11 @@
                         Dokumen Jaminan
                     </label>
                     <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 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 }}][]">
+                                <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>
@@ -234,10 +235,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,10 +247,11 @@
                         Dokumen Jaminan
                     </label>
                     <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 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 }}][]" multiple>
+                                <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>
@@ -287,8 +289,8 @@
                 </div>
                 @php $n++; @endphp
             @endforeach
+        @endif
     </div>
-    @endif
 
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56">
@@ -496,10 +498,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>
 
@@ -510,8 +512,9 @@
                             <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 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}][]" multiple>
+                                    <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
                                 </div>
                             </div>
                         </div>
@@ -565,8 +568,9 @@
             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}][]" multiple>
+                <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
             `;
             container.appendChild(newInput);
         }

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,18 +46,34 @@
                                 </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">                            
+                        <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>
                                 </div>
-                                <div class="card-table scrollable-x-auto">
+                                <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-[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>
@@ -65,14 +81,18 @@
                                         </thead>
                                         <tbody id="tbodyKJPP1">
                                         </tbody>
-                                    </table>
+                                    </table>                                    
                                 </div>
                             </div>
                         </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.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,7 +48,9 @@
 			let formData = new FormData();  
 			let token   = "{{ csrf_token() }}";
 			formData.append("dokumen_persetujuan", file_data ?? "");
-			formData.append("biaya_penawaran", biaya);
+			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);
@@ -149,7 +141,5 @@
 				
 			}
 		})
-	}
+	}	
-		
-	
 	</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,10 +121,11 @@
             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;
@@ -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
+@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/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',

resources/views/spk/documentSPK.blade.php

@@ -1,5 +1,14 @@
-<link rel="stylesheet" href="{{ public_path('build/assets/app-KMDgGgC4.css') }}" data-navigate-track="reload">
+@php
-<link rel="stylesheet" href="{{ public_path('build/assets/app-DqiwbDNQ.css') }}" data-navigate-track="reload">
+    $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+    $cssFiles = array_filter($manifest, function($value) {
+        return strpos($value['file'], '.css') !== false;
+    });
+
+@endphp
+
+@foreach($cssFiles as $file)
+    <link rel="stylesheet" href="{{ public_path('build/'.$file['file']) }}" data-navigate-track="reload">
+@endforeach
 
 <div class="card-body">
 <div class="scrollable-x-auto">
@@ -80,7 +89,7 @@
 		<tr>
 			<td>Jangka Waktu</td>
 			<td>:</td>
-			<td><span style="color: red;">{{ $penawaran->date_range }}</span></td>
+            <td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) }} - {{ formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 		</tr>
 		<tr>
 			<td colspan="2" style="text-align: center;">i</td>
@@ -180,4 +189,4 @@
 		</table>
 	</div>
 </div>
-</div>
+</div>

resources/views/spk/edit.blade.php

@@ -104,7 +104,7 @@
 					<tr>
 						<td>Jangka Waktu</td>
 						<td>:</td>
-						<td><span style="color: red;">{{ $penawaran->date_range }}</span></td>
+						<td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) }} - {{ formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 					</tr>
 					<tr>
 						<td colspan="2" style="text-align: center;">i</td>

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'));
@@ -636,3 +548,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