Merge pull request 'andydev' (#25) from andydev into staging

Reviewed-on: #25

app/Helpers/Lpj.php

@@ -1,6 +1,8 @@
 <?php
 
 use Carbon\Carbon;
+use Modules\Lpj\Models\PenawaranDetailTender;
+use Modules\Lpj\Models\PenawaranTender;
 
 function formatTanggalIndonesia($date)
 {
@@ -39,3 +41,70 @@ function formatAlamat($alamat)
         (isset($alamat->province) ? $alamat->province->name . ', ' : '') .
         ($alamat->postal_code ?? '');
 }
+
+// andy add
+function checkActiveDateRangePenawaran($id)
+{
+    $penawaran = PenawaranTender::find($id);
+
+    $start_date = strtotime($penawaran->start_date);
+    $end_date = strtotime($penawaran->end_date);
+    $todays_date = strtotime(now());
+
+    $allow = true;
+    if ($todays_date >= $start_date && $todays_date <= $end_date) {
+        //Penawaran dibuka
+        $allow = true;
+    } else {
+        if ($todays_date < $start_date) {
+            //Penawaran Belum dibuka
+            $allow = true;
+        } else {
+            //Penawaran sudah ditutup
+            $allow = false;
+        }
+    }
+
+    return $allow;
+}
+
+function checkKelengkapanDetailKJPP($id)
+{
+    $allow = true;
+    // DB::enableQueryLog();
+    // detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap?
+    $query = PenawaranDetailTender::select('id')
+        ->where('penawaran_id', '=', $id)
+        ->where(function ($query) {
+            $query->orWhere('biaya_penawaran', '', "");
+            $query->orWhereNull('biaya_penawaran');
+
+            $query->orWhere('attachment', '', "");
+            $query->orWhereNull('attachment');
+
+            $query->orWhere('dokumen_persetujuan', '', "");
+            $query->orWhereNull('dokumen_persetujuan');
+        })->get();
+    // $sql = DB::getQueryLog();
+
+
+    if (sizeof($query) > 0) {
+        $allow = false;
+    }
+
+    return $allow;
+}
+
+// convert
+function convertSlug($slug) {
+    
+    $words = explode('-', $slug);
+
+    foreach ($words as $index => $word) {
+        $words[$index] = strtoupper($word);
+    }
+
+    return implode(' ', $words);
+}
+// andy add
+

app/Http/Controllers/OtorisasiPenawaranController.php

@@ -0,0 +1,290 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Exception;
+use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Auth;
+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;
+
+class OtorisasiPenawaranController extends Controller
+{
+    public $user;
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        // dd('hai otorisasi');
+        return view('lpj::otorisasipenawaran.index');
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query =PenawaranTender::query()
+                        ->select('penawaran.*',DB::raw("CONCAT(DATE_FORMAT(penawaran.start_date, '%d %M %Y'), ' -  ', DATE_FORMAT(penawaran.end_date, '%d %M %Y')) AS date_range"), 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                        ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                        ->where('penawaran.status','=','persetujuan-penawaran')
+                        ->withCount('penawarandetails'); 
+        
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+        $data = $query->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data
+        ]);
+    }
+
+    public function edit($id)
+    {
+        return view('lpj::otorisasipenawaran.edit', compact('id'));
+    }
+
+    public function setData(Request $request): JsonResponse
+    {
+        $data = array();
+        $penawaran = array();
+        $penawrandetails = array();
+        $penawarandetailLogs = array();
+
+        if (request()->ajax()) {
+            $id = $request->id;
+            $penawaran = PenawaranTender::where('status','=','persetujuan-penawaran')->find($id);
+            
+            if ($penawaran) {
+                $penawarandetailLogs = PenawaranDetailTenderLog::where('penawaran_id',$id)
+                                            ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran_logs.kjpp_rekanan_id') 
+                                            ->select('detail_penawaran_logs.*', DB::raw("DATE_FORMAT(detail_penawaran_logs.created_at, '%d-%m-%Y %H:%i') AS created_at2"),'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
+                                            ->get();
+                $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();
+                
+                if(sizeof($penawarandetailLogs)>0)
+                {
+                    $h=0;
+                    foreach($penawarandetailLogs as $obj1)
+                    {
+                        if($obj1->dokumen_persetujuan && Storage::disk('public')->exists($obj1->dokumen_persetujuan))
+                        {
+                            $penawarandetailLogs_path = Storage::url($obj1->dokumen_persetujuan);
+                            $penawarandetailLogs[$h]->dokumen_persetujuan = $penawarandetailLogs_path;
+                        }
+                        $h++;
+                    }
+                    
+                }   
+
+                $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;
+                } 
+
+                $kjpp=null;
+                $kjpp = KJPP::pluck('name', 'id');
+                $data['penawaran'] = $penawaran;
+                $data['penawrandetails'] = $penawrandetails;
+                $data['penawarandetailLogs'] = $penawarandetailLogs;
+                $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 otorisasiPenawaranKJPP(Request $request, $id): JsonResponse
+    {
+        $data = array();
+        $dataDetailPenawaranLog=[];
+        if (request()->ajax()) {
+
+            // cek masa aktif penawaran
+            $detailpenawaran  = PenawaranDetailTender::find($id);
+            $penawaran = PenawaranTender::findOrFail($detailpenawaran->penawaran_id);
+            $checkActiveDateRange = checkActiveDateRangePenawaran($detailpenawaran->penawaran_id);
+            // cek masa aktif penawaran
+            if($checkActiveDateRange)
+            {
+                DB::beginTransaction();
+                try {
+
+                    // update status KJPP yg tidak terpilih menjadi 2 -> kalah
+                    // update status Penawaran menjadi SPK
+                    // update status Permohonan menjadi SPK
+                    // insert detail_permohonan_log
+                    
+                    PenawaranDetailTender::where('status', 1)
+                            ->where('penawaran_id', $request->penawaran_id)
+                            ->whereNotIn('id', [$id])
+                            ->update(['status' => 2, 
+                                    'updated_by' => Auth::id(),
+                                    'updated_at' => now()
+                                    ]);
+
+                    PenawaranTender::where('id', $request->penawaran_id)
+                                    ->update(['status'=>'spk',
+                                            'nama_kjpp_sebelumnya'=>$request->kjppName,
+                                            'biaya_kjpp_sebelumnya'=>$request->biaya_penawaran,
+                                            'tanggal_penilaian_sebelumnya'=>now(),
+                                            'authorized_status'=>1,
+                                            'authorized_at'=>now(),
+                                            'authorized_by'=>Auth::id(),
+                                            'updated_by' => Auth::id(),
+                                            'updated_at' => now()
+                                    ]);
+
+                    Permohonan::where('nomor_registrasi',$request->noReg)
+                                        ->update(['status'=>'spk',
+                                        'updated_by' => Auth::id(),
+                                        'updated_at' => now()
+                                    ]);
+                    
+                    // log
+                    $detailPenawaran = PenawaranDetailTender::where('penawaran_id', $request->penawaran_id)->get();
+                    if(sizeof($detailPenawaran)>0)
+                    {
+                            
+                        foreach ($detailPenawaran as $model) {
+                            array_push($dataDetailPenawaranLog, [
+                                'detail_penawaran_id' =>$model->id,
+                                'kjpp_rekanan_id'     =>$model->kjpp_rekanan_id,
+                                'penawaran_id'        =>$model->penawaran_id,
+                                'biaya_penawaran'     =>$model->biaya_penawaran,
+                                'attachment'          =>$model->attachment,
+                                'dokumen_persetujuan' =>$model->dokumen_persetujuan,
+                                'status'              =>$model->status,
+                                'authorized_status'   =>$model->authorized_status,
+                                'authorized_at'       =>$model->authorized_at,
+                                'authorized_at'       =>$model->authorized_at,
+                                'created_at'          =>$model->created_at,
+                                'updated_at'          =>$model->updated_at,
+                                'deleted_at'          =>$model->deleted_at,                        
+                                'created_by'          =>$model->created_by,
+                                'updated_by'          =>$model->updated_by,
+                                'deleted_by'          =>$model->deleted_by
+                            ]);
+                            
+                        }
+
+                        PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);
+                    }
+                    // log
+
+                    DB::commit();
+                    $data['status'] = 'success';
+                    $data['message']['message_success'] = array('Otorisasi Penawaran KJPP '.$request->kjppName.' successfully');
+                } catch (Exception $e) {
+                    DB::rollBack();
+                    $data['status'] = 'error';
+                    $data['message']['message_error'] = array("Otorisasi Penawaran KJPP 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 show($id)
+    {
+        $prosespenawaran  = PenawaranTender::find($id);
+        return view('lpj::otorisasipenawaran.show', compact('id','prosespenawaran'));
+    }
+}

app/Http/Controllers/ProsesPenawaranController.php

@@ -108,37 +108,39 @@ class ProsesPenawaranController extends Controller
 
         if (request()->ajax()) {
             $id = $request->id;
-            $penawaran = PenawaranTender::findOrFail($id);
-            $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();
-            $data['status'] = 'success';
+            $penawaran = PenawaranTender::find($id);
+            $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();
+            
             if ($penawaran) {
-                $i = 0;
-                foreach ($penawrandetails as $obj) {
-                    // dd($obj->dokumen_persetujuan);
-                    if ($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan)) {
+                
+                $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++;
+                        $penawrandetails[$i]['dokumen_persetujuan']=$penawrandetails_path;
                     }
+                    $i++;
                 }
 
-                $kjpp = null;
-                $kjpp = KJPP::pluck('name', 'id');
                 $data['penawaran'] = $penawaran;
                 $data['penawrandetails'] = $penawrandetails;
-                $data['message'] = 'data successfully found';
+                $data['status'] = 'success';
+                $data['message'] ['message_success'] = array("data successfully found");
             } else {
                 $data['penawaran'] = null;
                 $data['penawrandetails'] = null;
-                $data['message'] = 'data not found';
+                $data['status'] = 'error';
+                $data['message'] ['message_data'] = array("data not found");
             }
         } else {
             $data['status'] = 'error';
-            $data['message'] = 'no ajax request';
+            $data['message'] ['message_ajax'] = array("no ajax request");
         }
 
         return response()->json($data);
@@ -151,62 +153,71 @@ class ProsesPenawaranController extends Controller
     {
         // init
         $data = array();
-        $dataku = array();
-        $tindakan = null;
+        $dataPenawaranDetail = array();
         if (request()->ajax()) {
             $validator = ProsesPenawaranController::rulesEditnya($request, $id);
-
+            
             if ($validator['fails']) {
                 $data['message'] = $validator['errors'];
                 $data['status'] = 'error';
-            } else {
+            } 
+            else
+            {
                 try {
 
-                    $dataku = [
-                        'updated_by' => Auth::id(),
-                        'updated_at' => now(),
-                        'biaya_penawaran' => str_replace(".", "", $request->biaya_penawaran)
-                    ];
+                    $dataPenawaranDetail = ['updated_by' => Auth::id(),
+                               'updated_at' => now(),
+                               'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
+                            ];
 
-                    if ($request->hasFile('dokumen_persetujuan')) {
+                    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
+                        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));
+                            $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;
-                            $dataku['attachment'] = $myFile;
-                            $dataku['dokumen_persetujuan'] = $newFileNameWithPath;
+                            $dataPenawaranDetail['attachment'] = $myFile;
+                            $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath;
 
-                            $model = PenawaranDetailTender::findOrFail($id);
-                            $model->update($dataku);
+                            $penawarandetail = PenawaranDetailTender::findOrFail($id);
+                            $penawarandetail->update($dataPenawaranDetail);
 
-                            $data['status'] = 'success';
                             $data['detailpenawaran_id'] = $id;
-                            $data['message'] = 'Proses Penawarn KJPP successfully';
-                        } else {
-                            $data['status'] = 'error';
-                            $data['message'] = 'Silahkan upload file pdf';
+                            $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'] = 'Silahkan upload file';
                     }
+                    else
+                    {
+                        $data['status'] = 'error';
+                        $data['message'] ['check_file'] = array("Silahkan upload file");
+                        
+                    }
+                    
                 } catch (Exception $e) {
-
+            
                     $data['status'] = 'error';
-                    $data['message'] = 'Proses Penawarn KJPP failed.';
+                    $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.');
                 }
             }
+            
         } else {
             $data['status'] = 'error';
-            $data['message'] = 'no ajax request';
+            $data['message'] ['message_ajax'] = array("no ajax request");
         }
 
         return response()->json($data);
@@ -240,134 +251,91 @@ class ProsesPenawaranController extends Controller
      */
     public function updateAll(Request $request, $id): JsonResponse
     {
-        // init
-        $data = array();
-        $dataku = array();
-        $model = PenawaranTender::findOrFail($id);
-        $checkActiveDateRange = $this->checkActiveDateRangePenawaran($model->start_date, $model->end_date);
-
-        // cek masa aktif penawaran
-        if ($checkActiveDateRange) {
-
-            $checkKelengkapanDetailKJPP = $this->checkKelengkapanDetailKJPP($id);
-            if ($checkKelengkapanDetailKJPP) {
-                DB::beginTransaction();
-                try {
-                    $dataku = [
-                        'status' => 'tendered',
-                        'updated_by' => Auth::id(),
-                        'updated_at' => now()
-                    ];
-
-                    $dataPermohonan = [
-                        'status' => 'tendered',
-                        'updated_by' => Auth::id(),
-                        'updated_at' => now()
-                    ];
-
-                    $permohonan = Permohonan::where('nomor_registrasi', '=', $model->nomor_registrasi)->first();
-
-                    $model->update($dataku);
-                    $permohonan->update($dataPermohonan);
-
-                    DB::commit();
-
-                    $data['message'] = "Sukses melakukan Proses Penawaran";
-                    $data['status'] = 'success';
-                } catch (Exception $e) {
-                    DB::rollBack();
-                    // dd($e);
-                    $data['message'] = "Gagal melakukan Proses Penawaran";
-                    $data['status'] = 'error';
-                }
-            } else {
-                $data['message'] = "Silahkan lengkapi data KJPP";
-                $data['status'] = 'error';
-            }
-        } else {
-            $data['message'] = "Penawaran sudah di tutup";
-            $data['status'] = 'error';
-        }
-
-        return response()->json($data);
+         // init
+         $data = array();
+         $dataPermohonan = array();
+         $dataPenawaran = array();
+         $penawaran = PenawaranTender::find($id);
+         $checkActiveDateRange = checkActiveDateRangePenawaran($id);
+         
+         // cek masa aktif penawaran
+         if($checkActiveDateRange)
+         {
+             
+             $checkKelengkapanDetailKJPP = checkKelengkapanDetailKJPP($id);     
+             if($checkKelengkapanDetailKJPP)
+             {
+                 DB::beginTransaction();
+                 try {
+                     $dataPenawaran = ['status' => 'persetujuan-penawaran',
+                         'updated_by' => Auth::id(),
+                         'updated_at' => now()
+                     ];
+                     
+                     $dataPermohonan = ['status' => 'persetujuan-penawaran',
+                         'updated_by' => Auth::id(),
+                         'updated_at' => now()
+                     ];
+                     
+                     $permohonan = Permohonan::where('nomor_registrasi','=', $penawaran->nomor_registrasi)->first();
+                     
+                     $penawaran->update($dataPenawaran);    
+                     $permohonan->update($dataPermohonan);    
+                     
+                     DB::commit();
+ 
+                     $data['message'] ['message_success'] = array('Sukses melakukan Proses Penawaran');
+                     $data['status'] = 'success';
+ 
+                 } catch (Exception $e) {
+                     DB::rollBack();
+                     // dd($e);
+                     $data['message'] ['message_error_try_catch'] = array("Gagal melakukan Proses Penawaran");
+                     $data['status'] = 'error';
+                 }
+ 
+             }
+             else
+             {
+                 $data['message'] ['cek_kelengkapan_data'] = array("Silahkan lengkapi data KJPP");
+                 $data['status'] = 'error';
+             }
+             
+         }
+         else
+         {
+             $data['message'] ['active_date_range'] = array("Penawaran sudah di tutup");
+             $data['status'] = 'error';
+         }
+ 
+         return response()->json($data);
     }
 
-    public function checkActiveDateRangePenawaran($start_date1, $end_date1)
-    {
-        $start_date = strtotime($start_date1);
-        $end_date = strtotime($end_date1);
-        $todays_date = strtotime(now());
-
-        $allow = true;
-        if ($todays_date >= $start_date && $todays_date <= $end_date) {
-            //Penawaran dibuka
-            $allow = true;
-        } else {
-            if ($todays_date < $start_date) {
-                //Penawaran Belum dibuka
-                $allow = true;
-            } else {
-                //Penawaran sudah ditutup
-                $allow = false;
-            }
-        }
-
-        return $allow;
-    }
-
-    public function checkKelengkapanDetailKJPP($id)
-    {
-        $allow = true;
-        // DB::enableQueryLog();
-        // detail_penawaran apakah isian biaya_penawaran, attachment, dokumen_persetujuan sudah lengkap?
-        $query = PenawaranDetailTender::select('id')
-            ->where('penawaran_id', '=', $id)
-            ->where(function ($query) {
-                $query->orWhere('biaya_penawaran', '', "");
-                $query->orWhereNull('biaya_penawaran');
-
-                $query->orWhere('attachment', '', "");
-                $query->orWhereNull('attachment');
-
-                $query->orWhere('dokumen_persetujuan', '', "");
-                $query->orWhereNull('dokumen_persetujuan');
-            })->get();
-        // $sql = DB::getQueryLog();
-
-
-        if (sizeof($query) > 0) {
-            $allow = false;
-        }
-
-        return $allow;
-    }
-
-    public function updateStatusPenawaranKJPP(Request $request, $id): JsonResponse
+    public function updateKJPPStatus(Request $request, $id): JsonResponse
     {
         // init
         $data = array();
-        $dataku = array();
+        $dataDetailPenawaran = array();
 
         try {
-            $model = PenawaranDetailTender::findOrFail($id);
-            $data['id'] = $id;
+            $detailpenawaran = PenawaranDetailTender::findOrFail($id);
+            $data['id']=$id;
 
-            $dataku = [
-                'status' => '0',
+            $dataDetailPenawaran = ['status' => '0',
                 'updated_by' => Auth::id(),
                 'updated_at' => now()
             ];
 
-            $model->update($dataku);
+            $detailpenawaran->update($dataDetailPenawaran);    
 
-            $data['message'] = "Sukses delete Penawaran KJPP";
             $data['status'] = 'success';
+            $data['message'] ['message_success'] = array('Sukses delete Penawaran KJPP '.$request->kjppName);
         } catch (Exception $e) {
-
-            // dd($e);
-            $data['message'] = "Gagal delete Penawaran KJPP";
+            
             $data['status'] = 'error';
+            $data['message'] ['message_error_try_catch'] = array("Gagal delete Penawaran KJPP ".$request->kjppName);
         }
+
         return response()->json($data);
     }
 

app/Http/Controllers/ProsesPenawaranUlangController.php

@@ -0,0 +1,373 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Exception;
+use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Auth;
+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;
+
+class ProsesPenawaranUlangController extends Controller
+{
+    public $user;
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::prosespenawaranulang.index');
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query =PenawaranTender::query()
+                        ->select('penawaran.*',DB::raw("CONCAT(DATE_FORMAT(penawaran.start_date, '%d %M %Y'), ' -  ', DATE_FORMAT(penawaran.end_date, '%d %M %Y')) AS date_range"), 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                        ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                        ->where('penawaran.status','=','persetujuan-penawaran')
+                        ->withCount('penawarandetails'); 
+        
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+        $data = $query->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data
+        ]);
+    }
+
+    public function edit($id)
+    {
+        return view('lpj::prosespenawaranulang.edit', compact('id'));
+    }
+
+    public function show($id)
+    {
+        $prosespenawaran  = PenawaranTender::find($id);
+        return view('lpj::prosespenawaranulang.show', compact('id','prosespenawaran'));
+    }
+
+    public function setData(Request $request): JsonResponse
+    {
+        $data = array();
+        $penawaran = array();
+        $penawrandetails = array();
+
+        if (request()->ajax()) {
+            $id = $request->id;
+            $penawaran = PenawaranTender::where('status','=','persetujuan-penawaran')->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;
+                }   
+
+                $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 update(Request $request, $id): JsonResponse
+    {
+        // init
+        $data = array();
+        $dataDetailPenawaranLog = array();
+        $dataDetailPenawaran = array();
+        $pleaseCommit= true;
+        if (request()->ajax()) {
+            $validator = ProsesPenawaranUlangController::rulesEditnya($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
+                if($checkActiveDateRange)
+                {
+                    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,
+                            '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(),
+                                '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);
+    }    
+
+    // delete KJPP di detail_penawaran (status di buat 0)
+    public function updateKJPPStatus(Request $request, $id): JsonResponse
+    {
+        // init
+        $data = array();
+        $dataku = array();
+        $dataDetailPenawaranLog = array();
+
+        DB::beginTransaction();
+        try {
+            $model = PenawaranDetailTender::findOrFail($id);
+
+            // log
+            $dataDetailPenawaranLog = [
+                'detail_penawaran_id' =>$model->id,
+                'kjpp_rekanan_id'     =>$model->kjpp_rekanan_id,
+                'penawaran_id'        =>$model->penawaran_id,
+                'biaya_penawaran'     =>$model->biaya_penawaran,
+                'attachment'          =>$model->attachment,
+                'dokumen_persetujuan' =>$model->dokumen_persetujuan,
+                'status'              =>0,
+                'authorized_status'   =>$model->authorized_status,
+                'authorized_at'       =>$model->authorized_at,
+                'authorized_at'       =>$model->authorized_at,
+                'created_at'          =>$model->created_at,
+                'updated_at'          =>$model->updated_at,
+                'deleted_at'          =>$model->deleted_at,                        
+                'created_by'          =>$model->created_by,
+                'updated_by'          =>$model->updated_by,
+                'deleted_by'          =>$model->deleted_by
+
+            ];
+            
+            PenawaranDetailTenderLog::create($dataDetailPenawaranLog);
+            // log
+            
+            $data['id']=$id;
+
+            $dataku = ['status' => '0',
+                'updated_by' => Auth::id(),
+                'updated_at' => now()
+            ];
+
+            $model->update($dataku);    
+
+            DB::commit();
+            $data['status'] = 'success';
+            $data['message']['message_success'] = array('Sukses delete Penawaran KJPP '.$request->kjppName);
+        } catch (Exception $e) {
+            DB::rollBack();
+            // dd($e);
+            $data['status'] = 'error';
+            $data['message']['message_error_try_catch'] = array("Gagal delete Penawaran KJPP ".$request->kjppName);
+        }
+        return response()->json($data);
+    }
+
+    public function rulesEditnya($request, $id)
+    {
+        $validateIt = [
+            // 'name' diambil dari definisi parameter yang di kirim pada POST Data
+            'biaya_penawaran' => 'required',
+            'dokumen_persetujuan' => 'required|file|mimes:pdf'
+        ];
+
+        $messageIt = [
+            '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;
+    }
+
+}

app/Http/Controllers/RegistrasiController.php

@@ -114,25 +114,27 @@
 
             if (request()->ajax()) {
                 $id = $request->id;
-                $datas = Permohonan::findOrFail($id);
-                $data['status'] = 'success';
+                $datas = Permohonan::find($id);
+                
                 if ($datas) {
                     $jenisPenilaians=null;
                     $regions=null;
                     $regions=Regions::pluck('name', 'id');
                     $jenisPenilaians=JenisPenilaian::pluck('name', 'id');
                     
+                    $data['status'] = 'success';
                     $data['regions'] = $regions;
                     $data['jenisPenilaians'] = $jenisPenilaians;
                     $data['datas'] = $datas;
-                    $data['message'] = 'data successfully found';
+                    $data['message'] ['message_success'] = array("data successfully found");
                 } else {
+                    $data['status'] = 'error';
                     $data['datas'] = null;
-                    $data['message'] = 'data not found';
+                    $data['message'] ['message_data'] = array("data not found");
                 }
             } else {
                 $data['status'] = 'error';
-                $data['message'] = 'no ajax request';
+                $data['message'] ['message_ajax'] = array("no ajax request");
             }
 
             return response()->json($data);
@@ -179,17 +181,17 @@
                         $modal->update($dataku);
                         // 
                         $data['status'] = 'success';
-                        $data['message'] = 'Regitrasi '.$modal->nomor_registrasi.' successfully';
+                        $data['message'] ['message_success'] = array('Regitrasi '.$modal->nomor_registrasi.' successfully');
                     } catch (Exception $e) {
                 
                         $data['status'] = 'error';
-                        $data['message'] = 'Jenis Fasilitas Kredit updated failed.';
+                        $data['message'] ['message_try_catch'] = array('Regitrasi updated failed.');
                     }
                 }
                 
             } else {
                 $data['status'] = 'error';
-                $data['message'] = 'no ajax request';
+                $data['message'] ['message_ajax'] = array("no ajax request");
             }
 
             return response()->json($data);
@@ -245,27 +247,4 @@
             return view('lpj::registrasi.show', compact('id','permohonan'));
         }
 
-        public function showData(Request $request): JsonResponse
-        {
-            $data = array();
-            $datas = array();
-
-            if (request()->ajax()) {
-                $id = $request->id;
-                $datas = Permohonan::findOrFail($id);
-                $data['status'] = 'success';
-                if ($datas) {
-                    $data['datas'] = $datas;
-                    $data['message'] = 'data successfully found';
-                } else {
-                    $data['datas'] = null;
-                    $data['message'] = 'data not found';
-                }
-            } else {
-                $data['status'] = 'error';
-                $data['message'] = 'no ajax request';
-            }
-
-            return response()->json($data);
-        }
     }

app/Http/Controllers/RegistrasiFinalController.php

@@ -0,0 +1,268 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+use Exception;
+    use Illuminate\Http\Request;
+    use Maatwebsite\Excel\Facades\Excel;
+    // use Modules\Location\Models\City;
+    // use Modules\Location\Models\District;
+    // use Modules\Location\Models\Province;
+    // use Modules\Location\Models\Village;
+    // use Modules\Lpj\Exports\DebitureExport;
+    // use Modules\Lpj\Http\Requests\DebitureRequest;
+    // use Modules\Lpj\Http\Requests\DokumenJaminanRequest;
+    // use Modules\Lpj\Models\Branch;
+    // use Modules\Lpj\Models\Debiture;
+    // use Modules\Lpj\Models\DokumenJaminan;
+    // use Modules\Lpj\Models\JenisJaminan;
+    // use Modules\Lpj\Models\JenisLegalitasJaminan;
+    // use Modules\Lpj\Models\PemilikJaminan;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\JenisPenilaian;
+    use Modules\Lpj\Models\Regions;
+    use Illuminate\Http\JsonResponse;
+    use Illuminate\Support\Facades\Validator;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    
+use Modules\Lpj\Models\PenawaranTender;
+
+    class RegistrasiFinalController extends Controller
+    {
+        public $user;
+
+        public function index()
+        {
+            return view('lpj::registrasifinal.index');
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query =PenawaranTender::query()
+                            ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                            ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                            ->where('penawaran.status','=','spk')
+                            ->withCount('penawarandetails'); 
+            
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+            
+            // Get the data for the current page
+            //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+            $data = $query->get();
+            // dd($data);
+            $i=0;
+            foreach($data as $obj)
+            {
+                if($obj->tanggal_penilaian_sebelumnya)
+                {
+                    $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
+                }
+                
+                if($obj->biaya_kjpp_sebelumnya)
+                {
+                    $data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya);
+                    
+                }
+
+                // date_range
+                if($obj->start_date && $obj->end_date)
+                {
+                    $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y');
+                    
+                }
+
+                $i++;
+            }
+
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = 0 + 1;
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data
+            ]);
+        }
+
+        public function show($id)
+        {
+            $permohonan  = Permohonan::find($id);
+            return view('lpj::registrasifinal.show', compact('id','permohonan'));
+        }
+
+        public function edit($id)
+        {
+            return view('lpj::registrasifinal.edit', compact('id'));
+        }
+
+        public function setData(Request $request): JsonResponse
+        {
+            $data = array();
+            $datas = array();
+
+            if (request()->ajax()) {
+                $id = $request->id;
+                $datas = Permohonan::find($id);
+                
+                if ($datas) {
+                    $penawaran=null;
+                    $regions=null;
+                    $regions=Regions::pluck('name', 'id');
+                    $penawaran = PenawaranTender::where('nomor_registrasi','=',$datas->nomor_registrasi)->first();
+
+                    $penawaranString = "";
+                    if($penawaran->status)
+                    {
+                        $penawaranString = convertSlug($penawaran->status);
+                        $penawaran->status = $penawaranString;
+                    } 
+
+                    $data['status'] = 'success';
+                    $data['regions'] = $regions;
+                    $data['penawaran'] = $penawaran;
+                    $data['datas'] = $datas;
+                    $data['message']['message_success'] = array("data successfully found");
+                } else {
+                    $data['status'] = 'error';
+                    $data['datas'] = 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 update(Request $request, $id): JsonResponse
+        {
+            // init
+            $data = array();
+            $dataPermohonan = array();
+            $dataPenawaran = array();
+            
+            if (request()->ajax()) {
+                $validator = RegistrasiFinalController::rulesEditnya($request, $id);
+                
+                if ($validator['fails']) {
+                    $data['message'] = $validator['errors'];
+                    $data['status'] = 'error';
+                } 
+                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',
+                                    'region_id' => $request->region,
+                                    'keterangan' => $request->catatan,
+                                    'authorized_at' => now(),
+                                    'authorized_status' =>1,
+                                    'authorized_by' => Auth::id()                                    
+                                  ];
+
+                        $dataPenawaran = ['status' => 'registrasi-final'];
+
+                       
+                        $permohonan = Permohonan::find($id);
+                        $penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();              
+                        
+                        $permohonan->update($dataPermohonan);
+                        $penawaran->update($dataPenawaran);
+                        // 
+                        DB::commit();
+
+                        $data['status'] = 'success';
+                        $data['message']['message_success'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' successfully');
+                    } catch (Exception $e) {
+                        DB::rollBack();
+                        $data['status'] = 'error';
+                        $data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.');
+                    }
+                }
+                
+            } else {
+                $data['status'] = 'error';
+                $data['message']['message_ajax'] = array("no ajax request");
+            }
+
+            return response()->json($data);
+
+        }
+
+        public function rulesEditnya($request, $id)
+        {
+            $validate_catatan='';
+            
+            $validateIt = [
+                // 'name' diambil dari definisi parameter yang di kirim pada POST Data
+                'region' => 'required',
+                'catatan' => 'required',
+            ];
+
+            $messageIt = [
+                'region.required' => 'Silahkan pilih Region',
+                'catatan.required' => 'Silahkan isi Catatan'
+            ];
+
+            $validator = Validator::make($request->all(), $validateIt, $messageIt);
+
+            $data['fails'] = $validator->fails();
+            $data['errors'] = $validator->errors();
+
+            return $data;
+        }
+
+    }

app/Models/PenawaranDetailTenderLog.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+// use Modules\Lpj\Database\Factories\PenawaranDetailTenderFactory;
+
+class PenawaranDetailTenderLog extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'detail_penawaran_logs';
+
+    protected $guarded = ['id'];
+
+    public function penawaran(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranTender::class, 'penawaran_id', 'id');
+    }
+    
+    public function penawarandetail(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranDetailTender::class, 'detail_penawaran_id', 'id');
+    }
+}

database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('detail_penawaran_logs', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('detail_penawaran_id')->nullable();
+            $table->unsignedBigInteger('kjpp_rekanan_id')->nullable();
+            $table->unsignedBigInteger('penawaran_id')->nullable();
+            $table->string('biaya_penawaran')->nullable();
+            $table->string('attachment')->nullable();
+            $table->string('dokumen_persetujuan')->nullable();
+            $table->boolean('status')->nullable();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamp('authorized_at')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            $table->timestamps();
+            $table->timestamp('deleted_at')->nullable();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('detail_penawaran_logs');
+    }
+};

module.json

@@ -61,9 +61,45 @@
             "attributes": [],
             "permission": "",
             "roles": ["administrator", "admin"]
+          },
+          {
+            "title": "Data Proses Penawaran Ulang",
+            "path": "tender.prosespenawaranulang",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator", "admin"]
           }
         ]
       },
+      {
+        "title": "Otorisasi Tender",
+        "path": "otorisasitender",
+        "icon": "ki-filled ki-category text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": ["administrator", "admin"],
+        "sub": [
+          {
+            "title": "Otorisasi Penawaran",
+            "path": "otorisasitender.penawaran",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator", "admin"]
+          }
+        ]
+      },
+      {
+        "title": "Registrasi Final",
+        "path": "registrasifinal",
+        "icon": "ki-filled ki-file-added text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": ["administrator", "admin"]
+      },
       {
         "title": "Pembatalan",
         "path": "",
@@ -325,7 +361,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": ["Administrator", "admin"]
+            "roles": ["administrator", "admin"]
           },
           {
             "title": "Tujuan Penilaian KJPP",

resources/views/assetsku/includenya.blade.php

@@ -1,4 +1,45 @@
-<script>
+<style>
+	.notification_success {
+		position: fixed;
+		top: 20px;
+		right: 20px;
+		background-color: #51a351;
+		color: white;
+		padding: 15px;
+		border-radius: 5px;
+		z-index: 1000;
+		transition: opacity 0.5s;
+		box-shadow: 0 0 12px #000;
+		cursor: pointer;
+	}
+
+	.notification_error {
+		position: fixed;
+		top: 20px;
+		right: 20px;
+		background-color: #AE342C;
+		color: white;
+		padding: 15px;
+		border-radius: 5px;
+		z-index: 1000;
+		transition: opacity 0.5s;
+		box-shadow: 0 0 12px #000;
+		cursor: pointer;
+	}
+</style>
+<div id="notificationSuccess" class="notification_success" style="display: none;">
+	<div style="display: flex; align-items: center;">
+    	<img style="margin-right: 10px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==">
+    	<span id="notification-message-success"></span>
+	</div>
+</div>
+<div id="notificationError" class="notification_error" style="display: none;">
+	<div style="display: flex; align-items: center;">
+    	<img style="margin-right: 10px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=">
+    	<span id="notification-message-error"></span>
+	</div>
+</div>
+<script tipe="module">
 function removeErrorCssMsg() {
 	$(".inputku").removeClass("border-danger");
 	$("em").text('');
@@ -99,4 +140,56 @@ function numbersonly(ini, e){
 	}
 
 }
+
+function toastrku(flag, message)
+{
+	$.each(message, function (key, value) {
+		var msg = '';
+		var lengthnya = value.length;
+		for (let i = 0; i < lengthnya; i++)
+		{	
+			if(0!=i && (lengthnya-1)==i)
+				msg+=", ";
+			
+			msg+=value[i];
+			
+		}
+		if('success'==flag)
+			toastrSuccessBuild(msg);
+		else if('error' ==flag)
+			toastrErrorBuild(msg);
+	});
+}
+
+function toastrSuccessBuild(message) {	
+	const notification = document.getElementById('notificationSuccess');
+	const messageElement = document.getElementById('notification-message-success');
+	
+	messageElement.textContent = message;
+	notification.style.display = 'block';
+	notification.style.opacity = '1';
+
+	setTimeout(() => {
+		notification.style.opacity = '0';
+		setTimeout(() => {
+			notification.style.display = 'none';
+		}, 500);
+	}, 3000);
+}
+
+function toastrErrorBuild(message) {
+	const notification = document.getElementById('notificationError');
+	const messageElement = document.getElementById('notification-message-error');
+	
+	messageElement.textContent = message;
+	notification.style.display = 'block';
+	notification.style.opacity = '1';
+
+	setTimeout(() => {
+		notification.style.opacity = '0';
+		setTimeout(() => {
+			notification.style.display = 'none';
+		}, 500);
+	}, 3000);
+}
 </script>

resources/views/otorisasipenawaran/edit.blade.php

@@ -0,0 +1,121 @@
+@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">    
+    <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 Otorisasi Penawaran
+            </h3>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('otorisasitender.penawaran.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+                <a href="{{ route('otorisasitender.penawaran.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>
+        <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-[250px]">KJPP</th>
+                                    <th>Biaya Penawaran</th>
+                                    <th>Dokumen 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 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 Sebelumnya</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-[250px]">KJPP</th>
+                                    <th>Biaya Penawaran</th>
+                                    <th>Dokumen Penawaran</th>
+                                    <th>created_at</th>
+                                </tr>
+                            </thead>
+                            <tbody id="tbodyKJPPLog">
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <!-- datatables -->
+            <div class="flex justify-end">
+               &nbsp;
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@include('lpj::otorisasipenawaran.js.editjs')

resources/views/otorisasipenawaran/index.blade.php

@@ -0,0 +1,151 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('otorisasitender.penawaran') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="otorisasipenawaran-table" data-api-url="{{ route('otorisasitender.penawaran.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Otorisasi Penawaran
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Otorisasi penawaran" id="search" type="text" value="">
+                        </label>
+                    </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="#"> Export to Excel </a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                        <thead>
+                        <tr>
+                            <th class="w-14">
+                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="code">
+                                <span class="sort"> <span class="sort-label"> Kode Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="start_date">
+                                <span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
+                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="penawarandetails_count">
+                                <span class="sort"> <span class="sort-label"> Total KJPP </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="status">
+                                <span class="sort"> <span class="sort-label"> Status </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                        </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript">
+        function showOtorisasiPenawaranData(regId)
+        {
+            var url = "{{ url('otorisasitender/penawaran') }}/"+regId;
+            $(location).attr('href',url);
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#otorisasipenawaran-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                'nomor_registrasi': {
+                    title: 'Nomor Registrasi',
+                },
+                code: {
+                    title: 'Kode Penawaran',
+                },
+                date_range: {
+                    title: 'Tanggal Penawaran',
+                },
+                tujuan_penilaian_kjpp_name: {
+                    title: 'Tujuan Penilaian',
+                },
+                penawarandetails_count: {
+                    title: 'Total KJPP',
+                    createdCell(cell) {
+                        cell.classList.add('text-center');
+                    },
+                },
+                status: {
+                    title: 'Status'
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a onclick="showOtorisasiPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="otorisasitender/penawaran/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                        </div>`;
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush

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

@@ -0,0 +1,94 @@
+<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]}}_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]}}_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 otorisasiKJPP(penawaran_id, id, kjpp_id, kjppName, biaya_penawaran) {
+	Swal.fire({
+		title: ' ',
+		text: "Yakin akan Otorisasi "+kjppName+"?",
+		icon: 'warning',
+		showCancelButton: true,
+		confirmButtonColor: '#3085d6',
+		cancelButtonColor: '#d33',
+		confirmButtonText: 'Yes'
+	}).then((result) => {
+		if (result.isConfirmed) {
+			
+			//define variable
+			let token = "{{ csrf_token() }}";
+			let useURL = "{{ route($route[0].'.'.$route[1].'.otorisasiPenawaranKJPP','') }}/"+id;
+			let noReg = $("#textReg").text();
+			var input_data = new Object();
+			input_data._token = token;
+			input_data.id =id;
+			input_data.penawaran_id =penawaran_id;
+			input_data.kjpp_id =kjpp_id;
+			input_data.kjppName =kjppName;
+			input_data.biaya_penawaran =biaya_penawaran;
+			input_data.noReg =noReg;
+			
+			$.ajax({
+				url: useURL,
+				type: "PUT",
+				cache: false,
+				data: input_data,
+				dataType: "json",
+				success: function(response) {
+					console.log(response);
+					if('success' == response.status)
+					{
+						swal.fire('Sukses Otorisasi!', response.message.message_success[0], 'success').then(() => {
+							var url = "{{ route('otorisasitender.penawaran.index') }}";    
+                        	$(location).attr('href',url);
+						});
+					}
+					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);
+
+				}
+			});   
+			
+		}
+	})
+}
+</script>    

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

@@ -0,0 +1,188 @@
+@push('scripts')
+    @include('lpj::assetsku.includenya')
+    @include('lpj::otorisasipenawaran.js.editextjs')    
+    <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('otorisasitender.penawaran.setData') }}";
+        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);
+                    setTablesKJPPLog(response.penawarandetailLogs);
+                }
+                else
+                {
+                    toastrError(response.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 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;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>';
+            }
+
+            // pengecekan kondisi format number
+            var biaya_penawaran_format = "";
+            if(biaya_penawaran)
+                biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran);
+
+            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" align="right">Rp.'+biaya_penawaran_format+'</td>';
+            markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
+            markup +='<td><div class="flex flex-nowrap justify-center">';
+                markup +='<a class="btn btn-sm btn-icon btn-clear btn-success" href="javascript:void(0)" id="{{$route[1]}}_icon_update_'+value.id+'" title="Otorisasi Penawaran '+kjppName+'" onclick="otorisasiKJPP('+value.penawaran_id+','+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\',\''+biaya_penawaran+'\')"><i class="ki-outline ki-notepad-edit"></i></a>';
+            markup += '</tr>';
+
+            $('#tbodyKJPP1').append(markup);
+
+            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 setTablesKJPPLog(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 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;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>';
+            }
+
+            // pengecekan kondisi format number
+            var biaya_penawaran_format = "";
+            if(biaya_penawaran)
+                biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran);
+
+            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" align="right">Rp.'+biaya_penawaran_format+'</td>';
+            markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
+            markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+value.created_at2+'</label></td>';
+
+            $('#tbodyKJPPLog').append(markup);
+
+            i++;
+        });
+    }
+    /*
+    // update proses penawaran ulang & permohonan status
+    $("#{{$route[1]}}_toEdit").click(function(e) {
+        e.preventDefault();
+        
+        //define variable
+        let token = "{{ csrf_token() }}";
+        let useURL = "";
+        
+        var input_data = new Object();
+        input_data._token = token;
+        input_data.id = "{{ $id }}";
+        $.ajax({
+            url: useURL,
+            type: "PUT",
+            cache: false,
+            data: input_data,
+            dataType: "json",
+            success: function(response) {
+                console.log(response);
+                if('success' == response.status)
+				{
+					// toastr.success(response.message);
+					toastrSuccess(response.message);
+                    setTimeout(function () {						
+                        var url = "{{ route('tender.prosespenawaran.index') }}";    
+                        $(location).attr('href',url);
+                        // window.location.href = "https://www.newurl.com";
+                    }, 2000);
+                }
+				else
+                {
+					// toastr.error(response.message);
+                    toastrError(response.message);
+                }
+            },
+            error: function(response, textStatus, errorThrown) {
+                // var errors = response.responseJSON.errors;
+                // console.log(errors);
+                console.log(response);
+
+            }
+        });  
+    });      
+    */
+
+    </script>
+@endpush  

resources/views/otorisasipenawaran/show.blade.php

@@ -0,0 +1,43 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+@section('content')
+<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+    <div class="card pb-2.5">
+        <div class="card-header" id="basic_settings">
+            <h3 class="card-title">                
+                Detail Data Otorisasi Penawaran
+            </h3>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('otorisasitender.penawaran.edit', $id) }}" class="btn btn-xs btn-primary" title="Register"><i class="ki-filled ki-arrow-circle-right"></i> Otorisasi Penawaran</a>
+                <a href="{{ route('otorisasitender.penawaran.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">
+                    {{ $prosespenawaran->nomor_registrasi }}
+                </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">
+                    {{ $prosespenawaran->code }}
+                </span>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+@endsection

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

@@ -1,147 +1,155 @@
 <script tipe="module">
-function switchProses(id)
-{
-	
-	let c = $('#{{$route[1]}}_check_'+id).val();
-	
-	if($('input[name="{{$route[1]}}_check_'+id+'"]').is(':checked'))
+	function switchProses(id)
 	{
-		// checked
-		// alert('aktif nih');
-		setActiveElement(id);
-	}else
-	{
-		// unchecked
-		//alert('tdk aktif nih');
-		setNonActiveElement(id);
-	}
-}
-
-function setActiveElement(id)
-{
-	$('#{{$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]}}_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 updateData(id, kjpp_id, kjppName){
-	removeErrorCssMsg();
-	let biaya = $("#{{$route[1]}}_biayaPenawaran_"+id).val();                            
-	let filepdf = $("#{{$route[1]}}_dokumenPersetujuan_"+id).val();       
-	let passednih = true;                    
-	if(!biaya){
-		$("#{{$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].'.update', '') }}/"+id;
-		let formData = new FormData();  
-		let token   = "{{ csrf_token() }}";alert(token);
-		formData.append("dokumen_persetujuan", file_data);
-		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);
-					
-					setTimeout(function () {						
-					 	location.reload(true);
-					}, 2000);
-				}
-				else
-					toastr.error(_data.message);
-				
-			},
-			error: function (response, textStatus, errorThrown) {
-				var errors = response.responseJSON.errors;
-				$.each(errors, function (key, value) {
-					console.log("v = " + value);
-				});
-			}
-		});
-
+		
+		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 deleteData(data) {
-	Swal.fire({
-		title: 'Are you sure?',
-		text: "You won't be able to revert this!",
-		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].'.updateStatusPenawaranKJPP','') }}/"+data;
-				
-			alert(useURL);   
-			var input_data = new Object();
-			input_data._token = token;
-			input_data.id =1;
+	function setActiveElement(id)
+	{
+		$('#{{$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]}}_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 updateData(id, kjpp_id, kjppName){
+		removeErrorCssMsg();
+		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)
+		{
+			var file_data = $("#{{$route[1]}}_dokumenPersetujuan_"+id).prop("files")[0];
+			let useURL = "{{ route($route[0].'.'.$route[1].'.update', '') }}/"+id;
+			let formData = new FormData();  
+			let token   = "{{ csrf_token() }}";
+			formData.append("dokumen_persetujuan", file_data ?? "");
+			formData.append("biaya_penawaran", biaya);
+			formData.append("kjpp_rekanan_id", kjpp_id);
+			formData.append("_method", "PUT");
+			formData.append("_token", token);
 			$.ajax({
 				url: useURL,
-				type: "PUT",
-				cache: false,
-				data: input_data,
-				dataType: "json",
-				success: function(response) {
-					console.log(response);
+				type: "POST",         
+				data: formData,
+				processData: false,
+				contentType: false,
+				success:function(response){
 					if('success' == response.status)
 					{
-						swal.fire('Deleted!', response.message, 'success').then(() => {
-                            window.location.reload();
-                        });
+						// toastr.success(response.message);
+						// success
+						var message = response.message;
+						toastrku("success", message);
+						setTimeout(function () {						
+							 location.reload(true);
+						}, 2000);
 					}
-					else
+					else if('error' == response.status)
 					{
-						Swal.fire('Error!', response.message, 'error');
+						// toastr.error(response.message);
+						var message = response.message;
+						toastrku("error", message);
 					}
-						
 					
 				},
-				error: function(response, textStatus, errorThrown) {
-					// var errors = response.responseJSON.errors;
-					// console.log(errors);
-					console.log(response);
-
+				error: function (response, textStatus, errorThrown) {
+					var errors = response.responseJSON.errors;
+					$.each(errors, function (key, value) {
+						console.log("v = " + value);
+					});
 				}
-			});     
+			});
+	
 		}
-	})
-}
-    
-</script>    
+		
+	}
+	
+	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) {
+						
+						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);
+	
+					}
+				});     
+				
+			}
+		})
+	}
+		
+	
+	</script>    

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

@@ -33,11 +33,18 @@
                 // }
             },
             success: function(response) {
-                console.log(response);
-
-                $("#textReg").text(response.penawaran.nomor_registrasi);
-                $("#textCodePenawaran").text(response.penawaran.code);
-                setTablesKJPP1(response.penawrandetails);
+                
+                if ('success' == response.status)
+                {
+                    $("#textReg").text(response.penawaran.nomor_registrasi);
+                    $("#textCodePenawaran").text(response.penawaran.code);
+                    setTablesKJPP1(response.penawrandetails);
+                }
+                else if('error' == response.status)
+                {
+                    var message = response.message;
+                    toastrku("error", message);
+                }
             },
             error: function(xhr) {
             },
@@ -62,16 +69,21 @@
             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="btn btn-input">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>';
+            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>';
             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><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="updateData('+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\')"><i class="ki-outline ki-notepad-edit"></i></a>';
-                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+')" title="Hapus Proses Penawaran '+kjppName+'"><i class="ki-outline ki-trash"></i></a>';
+                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 +='<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 += '</tr>';
 
             $('#tbodyKJPP1').append(markup);
-            $("#{{$route[1]}}_biayaPenawaran_"+value.id).val(tandaPemisahTitik(biaya_penawaran));
+
+            // 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++;
         });
     }
@@ -92,7 +104,7 @@
         }
     });
 
-    // update penawaran & permohonan status
+    // updateAll penawaran & permohonan status
     $("#{{$route[1]}}_toEdit").click(function(e) {
         e.preventDefault();
         
@@ -110,19 +122,24 @@
             data: input_data,
             dataType: "json",
             success: function(response) {
-                console.log(response);
-                if('success' == response.status)
-				{
-					toastr.success(response.message);
-					setTimeout(function () {						
+                
+                if ('success' == response.status)
+                {
+                    // toastr.success(response.message);
+					// success
+                    var message = response.message;
+                    toastrku("success", message);
+                    setTimeout(function () {						
                         var url = "{{ route('tender.prosespenawaran.index') }}";    
                         $(location).attr('href',url);
-                        // window.location.href = "https://www.newurl.com";
                     }, 2000);
+
+                }
+                else if('error' == response.status)
+                {
+                    var message = response.message;
+                    toastrku("error", message);
                 }
-				else
-					toastr.error(_data.message);
-                
             },
             error: function(response, textStatus, errorThrown) {
                 // var errors = response.responseJSON.errors;
@@ -131,6 +148,7 @@
 
             }
         });  
-    });        
+    });      
+    
     </script>
 @endpush  

resources/views/prosespenawaranulang/edit.blade.php

@@ -0,0 +1,92 @@
+@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">    
+    <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.prosespenawaranulang.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+                <a href="{{ route('tender.prosespenawaranulang.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>
+        <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-[250px]">KJPP</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::prosespenawaranulang.js.editjs')

resources/views/prosespenawaranulang/index.blade.php

@@ -0,0 +1,152 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('tender.prosespenawaranulang') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="prosespenawaranulang-table" data-api-url="{{ route('tender.prosespenawaranulang.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Proses Penawaran Ulang
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Proses penawaran Ulang" id="search" type="text" value="">
+                        </label>
+                    </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="#"> Export to Excel </a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                        <thead>
+                        <tr>
+                            <th class="w-14">
+                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="code">
+                                <span class="sort"> <span class="sort-label"> Kode Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="start_date">
+                                <span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
+                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="penawarandetails_count">
+                                <span class="sort"> <span class="sort-label"> Total KJPP </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="status">
+                                <span class="sort"> <span class="sort-label"> Status </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                        </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript">
+        function showProsesPenawaranUlangData(regId)
+        {
+            // alert('aw');
+            var url = "{{ url('tender/prosespenawaranulang') }}/"+regId;
+            $(location).attr('href',url);
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#prosespenawaranulang-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                'nomor_registrasi': {
+                    title: 'Nomor Registrasi',
+                },
+                code: {
+                    title: 'Kode Penawaran',
+                },
+                date_range: {
+                    title: 'Tanggal Penawaran',
+                },
+                tujuan_penilaian_kjpp_name: {
+                    title: 'Tujuan Penilaian',
+                },
+                penawarandetails_count: {
+                    title: 'Total KJPP',
+                    createdCell(cell) {
+                        cell.classList.add('text-center');
+                    },
+                },
+                status: {
+                    title: 'Status'
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a onclick="showProsesPenawaranUlangData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="tender/prosespenawaranulang/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                        </div>`;
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush

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

@@ -0,0 +1,152 @@
+<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]}}_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]}}_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 updateData(id, kjpp_id, kjppName){
+	removeErrorCssMsg();
+		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)
+		{
+			var file_data = $("#{{$route[1]}}_dokumenPersetujuan_"+id).prop("files")[0];
+			let useURL = "{{ route($route[0].'.'.$route[1].'.update', '') }}/"+id;
+			let formData = new FormData();  
+			let token   = "{{ csrf_token() }}";
+			formData.append("dokumen_persetujuan", file_data ?? "");
+			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);
+
+				}
+			});     
+		}
+	})
+}
+</script>    

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

@@ -0,0 +1,112 @@
+@push('scripts')
+    @include('lpj::assetsku.includenya')
+    @include('lpj::prosespenawaranulang.js.editextjs')    
+    <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.prosespenawaranulang.setData') }}";
+        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);
+                }
+                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 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>';
+            }
+
+            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>';
+            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><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="updateData('+value.id+','+value.kjpp_rekanan_id+',\''+kjppName+'\')"><i class="ki-outline ki-notepad-edit"></i></a>';
+                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 +='<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 += '</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("");
+        }
+    });
+    </script>
+@endpush  

resources/views/prosespenawaranulang/show.blade.php

@@ -0,0 +1,43 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+@section('content')
+<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+    <div class="card pb-2.5">
+        <div class="card-header" id="basic_settings">
+            <h3 class="card-title">
+                Detail Data Proses Penawaran Ulang
+            </h3>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('tender.prosespenawaranulang.edit', $id) }}" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>
+                <a href="{{ route('tender.prosespenawaranulang.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">
+                    {{ $prosespenawaran->nomor_registrasi }}
+                </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">
+                    {{ $prosespenawaran->code }}
+                </span>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+@endsection

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

@@ -38,11 +38,23 @@
                 // }
             },
             success: function(response) {
-                console.log(response);
+                
+                if ('success' == response.status)
+                {
+                    $("#textReg").text(response.datas.nomor_registrasi);
+                    setJenisPenilaianList(response.jenisPenilaians,0);
+                    setRegionList(response.regions,0);
 
-                $("#textReg").text(response.datas.nomor_registrasi);
-                setJenisPenilaianList(response.jenisPenilaians,0);
-                setRegionList(response.regions,0);
+                    // success
+                    // var message = response.message;
+                    // toastrku("success", message);
+					
+                }
+                else if('error' == response.status)
+                {
+                    var message = response.message;
+                    toastrku("error", message);
+                }
             },
             error: function(xhr) {
             },
@@ -152,8 +164,14 @@
                 else
                 {
                     //toastr.success(response.message);
-                    var url = "{{ route('registrasi.index') }}";
-                    $(location).attr('href',url);
+                    var message = response.message;
+                    toastrku("success", message);
+
+                    setTimeout(function () {						
+                        var url = "{{ route('registrasi.index') }}";
+                        $(location).attr('href',url);
+                        // window.location.href = "https://www.newurl.com";
+                    }, 2000);
                 }
 
             },
@@ -189,10 +207,5 @@
         }
     });
 
-    /*
-    $('#{{$route[0]}}_jenis_penilaian').on('change', function() {
-        console.log( this.value );
-    });
-    */
     </script>
 @endpush

resources/views/registrasi/show.blade.php

@@ -312,5 +312,4 @@
 	</div>
 
 @endsection
-@include('lpj::registrasi.js.showjs')
 @include('lpj::registrasi.js.editjs')

resources/views/registrasifinal/edit.blade.php

@@ -0,0 +1,106 @@
+@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">
+   
+        <form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST">
+            <input type="hidden" id="id" name="id" value="{{ $id }}">
+            @method('PUT')
+            @csrf
+                    <div class="card pb-2.5">
+                        <div class="card-header" id="basic_settings">
+                            <h3 class="card-title">
+                                Tambah Registrasi Final
+                            </h3>
+                            <div class="flex items-center gap-2">
+                                <a href="{{ route('registrasifinal.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+                                <a href="{{ route('registrasifinal.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>
+                        <div class="card-body grid gap-5">
+                            
+                            <div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Dokumen SPK
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <em id="" class="alert text-danger text-sm"></em>
+                                    <div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a href="javascript:void(0)" class="badge badge-sm badge-outline">SPK_Dokumen.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>
+                                </div>
+                            </div>
+                            <div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Region
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select class="inputku select" id="{{$route[0]}}_region" name="{{$route[0]}}_region">
+                                        <option></option>
+                                    </select>
+                                    <em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
+                                </div>
+                            </div>
+                            <div id="{{ $route[0] }}_div_catatan" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Catatan
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <textarea class="inputku textarea" name="{{$route[0]}}_catatan" id="{{$route[0]}}_catatan" placeholder="Catatan..." rows="6"></textarea>
+                                    <em id="{{$route[0]}}_catatan_msg" class="alert text-danger text-sm"></em>
+                                </div>
+                            </div>
+                            
+                            <div class="flex justify-end">
+                                <button type="button" class="btn btn-primary" id="toEdit">
+                                    Save
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+</div>
+@endsection
+@include('lpj::registrasifinal.js.editjs')

resources/views/registrasifinal/index.blade.php

@@ -0,0 +1,158 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('registrasifinal') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="registrasifinal-table" data-api-url="{{ route('registrasifinal.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Registrasi Final
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Registrasi Final" id="search" type="text" value="">
+                        </label>
+                    </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="#"> Export to Excel </a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                        <thead>
+                        <tr>
+                            <th class="w-14">
+                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="code">
+                                <span class="sort"> <span class="sort-label"> Kode Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="start_date">
+                                <span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
+                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nama_kjpp_sebelumnya">
+                                <span class="sort"> <span class="sort-label">KJPP Data</span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="status">
+                                <span class="sort"> <span class="sort-label"> Status </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                        </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript">
+        function showRegistrasiFinal(regId)
+        {
+            var url = "{{ url('registrasifinal') }}/"+regId;
+            $(location).attr('href',url);
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#registrasifinal-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                'nomor_registrasi': {
+                    title: 'Nomor Registrasi',
+                },
+                code: {
+                    title: 'Kode Penawaran',
+                },
+                date_range: {
+                    title: 'Tanggal Penawaran',
+                },
+                tujuan_penilaian_kjpp_name: {
+                    title: 'Tujuan Penilaian',
+                },
+                nama_kjpp_sebelumnya: {
+                    title: 'Nama KJPP Terpilih',
+                    render: (item, data) => {
+                        return `${data.nama_kjpp_sebelumnya}`+'<br />'
+                                +`${data.biaya_kjpp_sebelumnya}`+'<br /> '
+                                +`${data.tanggal_penilaian_sebelumnya}`;
+                    },
+                },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `${data.status}`.toUpperCase();
+                    },
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a onclick="showRegistrasiFinal(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                        </div>`;
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+
+    </script>
+@endpush
+

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

@@ -1,12 +1,17 @@
 @push('scripts')
-    <script type="module">
-
+    @include('lpj::assetsku.includenya')
+    <script type="module">    
+    
     $(document).ready(function() {
         prepareForm();
     });
 
     function prepareForm()
     {
+        $("#registrasifinal_form")[0].reset();
+        // $("#{{ $route[0] }}_div_catatan").hide();
+        // $("#{{ $route[0] }}_div_region").hide();
+        // prepare data
         setData();
     }
 
@@ -15,7 +20,7 @@
         let id = $("#id").val();
         let token =  "{{ csrf_token() }}";
         // alert('token = ' + token);
-        var useURL = "{{ route('registrasi.showData') }}";
+        var useURL = "{{ route('registrasifinal.setData') }}";
         var input_data = new Object();
         input_data._token = token;
         input_data.id = id;
@@ -31,10 +36,24 @@
                 // }
             },
             success: function(response) {
-                console.log(response);
+                
+                if ('success' == response.status)
+                {
+                    $("#textReg").text(response.datas.nomor_registrasi);
+                    $("#textCodePenawaran").text(response.penawaran.code);
+                    $("#textStatusPenawaran").text(response.penawaran.status);
+                    setRegionList(response.regions,0);
 
-                $("#textReg").text(response.datas.nomor_registrasi);
-                // setJenisPenilaianList(response.jenisPenilaians,0);
+                    // success
+                    // var message = response.message;
+                    // toastrku("success", message);
+					
+                }
+                else if('error' == response.status)
+                {
+                    var message = response.message;
+                    toastrku("error", message);
+                }
             },
             error: function(xhr) {
             },
@@ -43,35 +62,16 @@
         });
     }
 
-    function setJenisPenilaianList(datas, cid)
+    function setRegionList(datas, cid)
     {
-        $('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
+        $('#{{$route[0]}}_region').empty().append('<option value="0"> - Pilih Region - </option>');
 
         $.each(datas, function(key, value){
 
-            $('#{{$route[0]}}_jenis_penilaian').append(new Option(value, key));
+            $('#{{$route[0]}}_region').append(new Option(value, key));
         });
     }
 
-    $('input[type=radio][name={{ $route[0] }}_tindakan]').change(function() {
-
-
-        if($(this).val()==0)
-        {
-            // show jenis pilihan
-            // hide catatan
-            $("#{{ $route[0] }}_div_jenis_pilihan").show();
-            $("#{{ $route[0] }}_catatan").val('');
-            $("#{{ $route[0] }}_div_catatan").hide();
-        }
-        else
-        {
-            $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
-            $("#{{ $route[0] }}_div_jenis_pilihan").hide();
-            $("#{{ $route[0] }}_div_catatan").show();
-        }
-    });
-
     $("#toEdit").click(function(e) {
         e.preventDefault();
 
@@ -80,19 +80,17 @@
 
         let _method   = $('input[name=_method]').val();
         let id   = $('#{{$route[0]}}_id').val();
-        let tindakan = $('input[name="{{$route[0]}}_tindakan"]:checked').val();
-        let jenis_penilaian = $("#{{$route[0]}}_jenis_penilaian").val();
+        let region = $("#{{$route[0]}}_region").val();
         let catatan = $("#{{$route[0]}}_catatan").val();
 
-        if(jenis_penilaian==0)
-            jenis_penilaian='';
+        if(region==0)
+            region='';
 
         var input_data = new Object();
         input_data._token= token;
         input_data._method= _method;
         input_data.id= id;
-        input_data.tindakan= tindakan;
-        input_data.jenis_penilaian= jenis_penilaian;
+        input_data.region= region;
         input_data.catatan = catatan;
 
         let useURL= '{{ route($route[0].'.update', $id) }}';
@@ -115,17 +113,23 @@
                             $("#{{$route[0]}}_catatan_msg").text(value);
                         }
 
-                        if ("jenis_penilaian" === index) {
-                            $("#{{$route[0]}}_jenis_penilaian").addClass(" border-danger");
-                            $("#{{$route[0]}}_jenis_penilaian_msg").text(value);
+                        if ("region" === index) {
+                            $("#{{$route[0]}}_region").addClass(" border-danger");
+                            $("#{{$route[0]}}_region_msg").text(value);
                         }
                     });
                 }
                 else
                 {
-                    toastr.success(response.message);
-                    var url = "{{ route('registrasi.index') }}";
-                    $(location).attr('href',url);
+                    //toastr.success(response.message);
+                    var message = response.message;
+                    toastrku("success", message);
+
+                    setTimeout(function () {						
+                        var url = "{{ route('registrasifinal.index') }}";
+                        $(location).attr('href',url);
+                        // window.location.href = "https://www.newurl.com";
+                    }, 2000);
                 }
 
             },
@@ -144,5 +148,6 @@
 
     });
 
+   
     </script>
 @endpush

resources/views/registrasifinal/show.blade.php

@@ -0,0 +1,242 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+	{{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+	// $route = Route::currentRouteName();
+	// dd($route); registrasi.show
+	$route = explode('.', Route::currentRouteName());
+@endphp
+@section('content')
+	<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+		<div class="card">
+			<div class="card-header" id="advanced_settings_appearance">
+				<h3 class="card-title">
+					Data Permohonan
+				</h3>
+
+				<div class="flex items-center gap-2">
+					<a href="{{ route('registrasifinal.edit', $id) }}" class="btn btn-xs btn-primary" title="Register Final"><i class="ki-filled ki-arrow-circle-right"></i> Registrasi Final</a>
+					<a href="{{ route('registrasifinal.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">
+						{{ $permohonan->nomor_registrasi }}
+					</span>
+				</div>
+
+				<div class="mb-5">
+					<h3 class="text-md font-medium text-gray-900">
+						Pemohon:
+					</h3>
+					<span class="text-2sm text-gray-700">
+						{{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+					</span>
+				</div>
+
+				<div class="mb-5">
+					<h3 class="text-md font-medium text-gray-900">
+						Tujan Permohonan:
+					</h3>
+					<span class="text-2sm text-gray-700">
+						{{ $permohonan->tujuanPenilaian->name }}
+					</span>
+				</div>
+
+			</div>
+		</div>
+
+		<div class="card min-w-full">
+			<div class="card-header">
+				<h3 class="card-title">
+					Detail Debutur
+				</h3>
+			</div>
+			<div class="card-table scrollable-x-auto pb-3">
+				<div class="grid grid-cols-1 xl:grid-cols-2 gap-5 lg:gap-7.5">
+					<div class="col-span-1">
+						<table class="table align-middle text-sm text-gray-500">
+							<tr>
+								<td class="py-2 text-gray-600 font-normal">
+									Name
+								</td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
+									{{ $permohonan->debiture->name ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3">
+									Email
+								</td>
+								<td class="py-3 text-gray-700 text-2sm font-normal">
+									{{ $permohonan->debiture->email ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3">
+									Phone
+								</td>
+								<td class="py-3 text-gray-700 text-2sm font-normal">
+									{{ $permohonan->debiture->phone ?? "" }}
+								</td>
+							</tr>
+
+							<tr>
+								<td class="py-3 text-gray-600 font-normal">
+									Address
+								</td>
+								<td class="py-3 text-gray-700 text-sm font-normal">
+									{{ $permohonan->debiture->address ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3 text-gray-600 font-normal">
+									&nbsp;
+								</td>
+								<td class="py-3 text-gray-700 text-sm font-normal">
+									{{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div class="col-span-1">
+						<table class="table align-middle text-sm text-gray-500">
+							<tr>
+								<td class="py-3 text-gray-600 font-normal">
+									Cabang
+								</td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
+									{{ $permohonan->debiture->branch->name  ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3 text-gray-600 font-normal">
+									CIF
+								</td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
+									{{ $permohonan->debiture->cif ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3 text-gray-600 font-normal">
+									Nomor Rekening
+								</td>
+								<td class="py-3 text-gray-700 text-sm font-normal">
+									{{ $permohonan->debiture->nomor_rekening ?? "" }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3">
+									NPWP
+								</td>
+								<td class="py-3 text-gray-700 text-2sm font-normal">
+									{{ $permohonan->debiture->npwp ?? "" }}
+								</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="card min-w-full">
+			<div class="card-header">
+				<h3 class="card-title">
+					Data Jaminan
+				</h3>
+			</div>
+			<div data-accordion="true">
+				@foreach($permohonan->debiture->documents as $dokumen)
+					<div class="accordion-item [&:not(:last-child)]:border-b border-b-gray-200" data-accordion-item="true" id="accordion_1_item_1">
+						<button class="accordion-toggle py-4 group mx-8" data-accordion-toggle="#accordion_1_content_1">
+							<span class="text-base text-gray-900 font-medium">
+								Jaminan {{ $loop->index + 1 }}
+							</span>
+							<i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
+							</i>
+							<i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
+							</i>
+						</button>
+						<div class="accordion-content hidden" id="accordion_1_content_1">
+							<div class="card-body lg:py-7.5 grid grid-cols-2">
+								<div class="mb-5">
+									<h3 class="text-md font-medium text-gray-900">
+										Pemilik Jaminan:
+									</h3>
+									<span class="text-2sm text-gray-700">
+										{{ $dokumen->pemilik->name?? "" }}
+									</span>
+								</div>
+								<div class="mb-5">
+									<h3 class="text-md font-medium text-gray-900">
+										Jenis Jaminan:
+									</h3>
+									<span class="text-2sm text-gray-700">
+										{{ $dokumen->jenisJaminan->name?? "" }}
+									</span>
+								</div>
+								<div class="mb-5">
+									<h3 class="text-md font-medium text-gray-900">
+										Hubungan Pemilik Jaminan:
+									</h3>
+									<span class="text-2sm text-gray-700">
+										{{ $dokumen->pemilik->hubungan_pemilik->name?? "" }}
+									</span>
+								</div>
+								<div class="mb-5">
+									<h3 class="text-md font-medium text-gray-900">
+										Alamat Pemilik Jaminan:
+									</h3>
+									<span class="text-2sm text-gray-700">
+										{{ $dokumen->pemilik->address ?? ""}},
+										<br> {{ $dokumen->pemilik->village->name ?? "" }}, {{ $dokumen->pemilik->district->name ?? "" }}, {{ $dokumen->pemilik->city->name ?? "" }}, {{ $dokumen->pemilik->province->name ?? "" }} - {{ $dokumen->pemilik->village->postal_code ?? "" }}
+									</span>
+								</div>
+							</div>
+							<div class="card-table scrollable-x-auto pb-3">
+								<table class="table align-middle text-sm text-gray-500">
+									@foreach($dokumen->detail as $detail)
+										<tr>
+											<td class="py-2 text-gray-600 font-normal max-w-[100px]">
+												{{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+											</td>
+											<td class="py-2 text-gray-800 font-normaltext-sm">
+												{{ $detail->name ?? "" }}
+											</td>
+										</tr>
+										<tr>
+											<td class="py-3  max-w-[100px]">
+												Dokumen Jaminan
+											</td>
+											<td class="py-3 text-gray-700 text-2sm font-normal">
+												@if(isset($detail->dokumen_jaminan))
+													<a href="{{ route('debitur.jaminan.download',['id'=>$permohonan->debiture->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2">{{ basename($detail->dokumen_jaminan) }}
+														<i class="ki-filled ki-cloud-download"></i></a>
+												@endif
+											</td>
+										</tr>
+										<tr>
+											<td class="py-3  max-w-[100px]">
+												Keterangan
+											</td>
+											<td class="py-3 text-gray-700 text-2sm font-normal">
+												{{ $detail->keterangan ?? ""  }}
+											</td>
+										</tr>
+									@endforeach
+								</table>
+							</div>
+						</div>
+					</div>
+				@endforeach
+			</div>
+		</div>
+	</div>
+
+@endsection

routes/breadcrumbs.php

@@ -482,7 +482,52 @@ Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail
     $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
+// 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) {

routes/registrasi.php

@@ -2,6 +2,9 @@
 
 use Modules\Lpj\Http\Controllers\RegistrasiController;
 use Modules\Lpj\Http\Controllers\ProsesPenawaranController;
+use Modules\Lpj\Http\Controllers\ProsesPenawaranUlangController;
+use Modules\Lpj\Http\Controllers\OtorisasiPenawaranController;
+use Modules\Lpj\Http\Controllers\RegistrasiFinalController;
 
 Route::middleware(['auth'])->group(function () {
     
@@ -39,11 +42,58 @@ Route::middleware(['auth'])->group(function () {
     
            Route::get('prosespenawaran/{prosespenawaran}/edit', 'edit')->name('prosespenawaran.edit');
 
+           // update one
            Route::put('/prosespenawaran/{prosespenawaran}', 'update')->name('prosespenawaran.update');
-           Route::put('/prosespenawaranAll/{prosespenawaran}', 'updateAll')->name('prosespenawaran.updateAll');
-           Route::put('/prosespenawaranStatusKJPP/{prosespenawaran}', 'updateStatusPenawaranKJPP')->name('prosespenawaran.updateStatusPenawaranKJPP');
+           // update all
+           Route::put('/prosespenawaranAll/{prosespenawaranAll}', 'updateAll')->name('prosespenawaran.updateAll');
+           // delete KJPP, status set = 0 
+           Route::put('/prosespenawaranKJPPStatus/{prosespenawaranKJPPStatus}', 'updateKJPPStatus')->name('prosespenawaran.updateKJPPStatus');
            
         });
-    });    
+
+        // Proses Penawaran Ulang
+        Route::controller(ProsesPenawaranUlangController::class)->group(function(){
+            Route::get('prosespenawaranulang', 'index')->name('prosespenawaranulang.index');
+            Route::get('prosespenawaranulang/datatables', 'dataForDatatables')->name('prosespenawaranulang.datatables');
+            Route::get('prosespenawaranulang/{prosespenawaranulang}/edit', 'edit')->name('prosespenawaranulang.edit');
+
+            // show data
+            Route::get('/prosespenawaranulang/{prosespenawaranulang}', 'show')->name('prosespenawaranulang.show');
+            Route::post('prosespenawaranulang/setData', 'setData')->name('prosespenawaranulang.setData');
+
+            // update KJPP data, detail penawaran
+            Route::put('/prosespenawaranulang/{prosespenawaranulang}', 'update')->name('prosespenawaranulang.update');
+            // delete KJPP, status set = 0 
+            Route::put('/prosespenawaranulangKJPPStatus/{prosespenawaranulangKJPPStatus}', 'updateKJPPStatus')->name('prosespenawaranulang.updateKJPPStatus');
+           
+        });
+    });  
+    
+    Route::name('otorisasitender.')->prefix('otorisasitender')->group(function () {
+        Route::controller(OtorisasiPenawaranController::class)->group(function(){
+            Route::get('penawaran', 'index')->name('penawaran.index');
+            Route::get('penawaran/datatables', 'dataForDatatables')->name('penawaran.datatables');
+            Route::get('penawaran/{penawaran}/edit', 'edit')->name('penawaran.edit');
+
+            // show data
+            Route::get('/penawaran/{penawaran}', 'show')->name('penawaran.show');
+            Route::post('penawaran/setData', 'setData')->name('penawaran.setData');
+
+            // update KJPP data, detail penawaran
+            Route::put('/otorisasiPenawaranKJPP/{penawaran}', 'otorisasiPenawaranKJPP')->name('penawaran.otorisasiPenawaranKJPP');
+       
+        });
+    });
+
+    Route::controller(RegistrasiFinalController::class)->group(function(){
+        Route::get('/registrasifinal', 'index')->name('registrasifinal.index');
+        Route::get('/registrasifinal/datatables', 'dataForDatatables')->name('registrasifinal.datatables');
+        Route::get('/registrasifinal/{registrasifinal}', 'show')->name('registrasifinal.show');
+
+        Route::post('registrasifinal/setData', 'setData')->name('registrasifinal.setData');
+
+        Route::get('/registrasifinal/{registrasifinal}/edit', 'edit')->name('registrasifinal.edit');
+        Route::put('/registrasifinal/{registrasifinal}', 'update')->name('registrasifinal.update');
+    });
 });