Mengubah Menu Tender pada sub menu data penawaran dan data penawaran ulang ketika nama kjpp status nya 1 maka munculkan datanya

app/Http/Controllers/TenderController.php

@@ -34,9 +34,10 @@ class TenderController extends Controller
     /**
      * Show the form for creating a new resource.
      */
-    public function penawaran_create($id)
+    public function penawaran_create($noreg)
     {
-        $penawaran = PenawaranTender::find($id);
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+
 
         $status = StatusPermohonan::all();
         $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
@@ -44,20 +45,20 @@ class TenderController extends Controller
 
         $kjpp = KJPP::all();
 
-        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id'));
+        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'noreg'));
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function penawaran_store(TenderPenawaranRequest $request, $id)
+    public function penawaran_store(TenderPenawaranRequest $request, $noreg)
     {
         $validated = $request->validated();
 
         DB::beginTransaction();
 
         try {
-            $penawaran = PenawaranTender::find($id);
+            $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
 
             $validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
 
@@ -84,7 +85,7 @@ class TenderController extends Controller
             DB::rollBack();
 
             return redirect()
-                ->route('tender.penawaran.createPenawaran', $id)
+                ->route('tender.penawaran.createPenawaran', $noreg)
                 ->with('error', 'Validation failed: ' . $e);
         }
     }
@@ -92,89 +93,120 @@ class TenderController extends Controller
     /**
      * Show the specified resource.
      */
-    public function penawaran_show($id)
+    public function penawaran_show($noreg)
     {
-        $penawaran = PenawaranTender::find($id);
+        $penawaran = null;
-        $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $id)->pluck('kjpp_rekanan_id')->toArray();
+        $kjpps = null;
+        $tujuan_penilaian_kjpp = null;
+        $jenis_laporan = null;
+
+        $penawaran1 = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        // dd($penawaran1->id);
+        if ($penawaran1) {
+            $penawaran = $penawaran1;
+            $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran1->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
             $kjpps = KJPP::whereIn('id', $detail_penawaran)->get();
             $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::where('id', $penawaran->tujuan_penilaian_kjpp_id)->get();
             $jenis_laporan = JenisLaporan::where('id', $penawaran->jenis_laporan_id)->get();
+        } else {
+            $penawaran2 = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+            $penawaran = $penawaran2;
+        }
 
         // dd($kjpps);
 
-        return view('lpj::penawaran.show', compact('id', 'penawaran', 'kjpps', 'tujuan_penilaian_kjpp', 'jenis_laporan'));
+        return view('lpj::penawaran.show', compact('noreg', 'penawaran', 'kjpps', 'tujuan_penilaian_kjpp', 'jenis_laporan'));
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function penawaran_edit($id)
+    public function penawaran_edit($noreg)
     {
         // Find the specific penawaran by its ID
-        $penawaran = PenawaranTender::find($id);
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
 
         $status = StatusPermohonan::all();
         $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
         $jenis_laporan = JenisLaporan::all();
 
-        $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $id)->pluck('kjpp_rekanan_id')->toArray();
+        $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
         $kjpps = KJPP::whereIn('id', $detail_penawaran)->pluck('id')->toArray();
 
         $kjpp = KJPP::all();
 
-        return view('lpj::penawaran.edit', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id', 'kjpps'));
+        return view('lpj::penawaran.edit', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'noreg', 'kjpps'));
     }
 
 
     /**
      * Update the specified resource in storage.
      */
-    public function penawaran_update(TenderPenawaranRequest $request, $id)
+    public function penawaran_update(TenderPenawaranRequest $request, $noreg)
     {
         $validated = $request->validated();
 
-        // dd($validated);
-
         DB::beginTransaction();
 
         try {
-            $penawaran = PenawaranTender::find($id);
+            // Ambil data penawaran berdasarkan nomor registrasi
-
+            $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
             $validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
-
+            $validated['status'] = $request->input('status') ?? 'tender';
-            $validated['status'] = $request->input('status') ?? 'Tender';
-
             $penawaran->update($validated);
 
             $kjpps = $request->input('kjpp', []);
 
+            // Ubah status KJPP lama menjadi 0 jika tidak ada dalam request
             foreach ($penawaran->penawaranKjpp as $kjpp) {
-                $kjpp->delete(); // Assuming penawaranKjpp is a relationship on the PenawaranTender model
+                if (!in_array($kjpp->kjpp_rekanan_id, $kjpps)) {
+                    // Ubah status KJPP lama menjadi 0
+                    $kjpp->status = 0;
+                    $kjpp->save();
+                }
             }
 
+            // Tangani penambahan atau perubahan KJPP baru
             foreach ($kjpps as $kjpp) {
+                $existingDetail = PenawaranDetailTender::where('penawaran_id', $penawaran->id)
+                    ->where('kjpp_rekanan_id', $kjpp)
+                    ->first();
+
+                if ($existingDetail) {
+                    // Jika KJPP sudah ada, pastikan statusnya aktif (1)
+                    if ($existingDetail->status == 0) {
+                        $existingDetail->status = 1;
+                        $existingDetail->save();
+                    }
+                } else {
+                    // Buat data baru jika tidak ada dalam database
                     PenawaranDetailTender::create([
                         'penawaran_id' => $penawaran->id,
-                    'kjpp_rekanan_id' => $kjpp
+                        'kjpp_rekanan_id' => $kjpp,
+                        'status' => 1, // Default status untuk KJPP baru adalah 1
                     ]);
                 }
+            }
 
-            // Commit the transaction
+            // Commit transaksi
             DB::commit();
 
             return redirect()
                 ->route('tender.penawaran.index')
-                ->with('success', 'Data Penawaran created successfully');
+                ->with('success', 'Data Penawaran updated successfully');
         } catch (Exception $e) {
+            // Rollback jika ada kesalahan
             DB::rollBack();
 
             return redirect()
-                ->route('tender.penawaran.createPenawaran', $id)
+                ->route('tender.penawaran.createPenawaran', $noreg)
-                ->with('error', 'Validation failed: ' . $e);
+                ->with('error', 'Validation failed: ' . $e->getMessage());
         }
     }
 
 
+
+
     /**
      * Remove the specified resource from storage.
      */
@@ -190,15 +222,19 @@ class TenderController extends Controller
         }
 
         // Retrieve data from the database
-        $query = PenawaranTender::query()->where('status', '=', 'Registered');
+        $query = Permohonan::query()->where('status', '=', 'registered')->where('jenis_penilaian_id', '=', 2);
 
         // 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('code', 'LIKE', "%$search%");
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('nama_kjpp_sebelumnya', 'LIKE', "%$search%");
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_penilaian_sebelumnya', 'LIKE', "%$search%");
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
             });
         }
 
@@ -225,7 +261,7 @@ class TenderController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -247,16 +283,108 @@ class TenderController extends Controller
 
     public function exportPenawaran()
     {
-        return Excel::download(new PenawaranTenderExport, 'kjpp.xlsx');
+        return Excel::download(new PenawaranTenderExport, 'penawarantender.xlsx');
+    }
+
+    // penawaran ulang
+    public function penawaran_ulang_index()
+    {
+        return view('lpj::penawaran_ulang/index');
+    }
+
+    public function datatablesPenawaranUlang(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('penawaran_ulang.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query()->where('status', '=', 'tender')->where('jenis_penilaian_id', '=', 2);
+
+        // 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->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', '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();
+
+        // 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 penawaran_ulang_show($noreg)
+    {
+        $penawaran = null;
+        $kjpps = null;
+        $tujuan_penilaian_kjpp = null;
+        $jenis_laporan = null;
+
+        $penawaran1 = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        // dd($penawaran1->id);
+        if ($penawaran1) {
+            $penawaran = $penawaran1;
+            $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran1->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
+            $kjpps = KJPP::whereIn('id', $detail_penawaran)->get();
+            $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::where('id', $penawaran->tujuan_penilaian_kjpp_id)->get();
+            $jenis_laporan = JenisLaporan::where('id', $penawaran->jenis_laporan_id)->get();
+        } else {
+            $penawaran2 = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+            $penawaran = $penawaran2;
+        }
+
+        // dd($kjpps);
+
+        return view('lpj::penawaran_ulang.show', compact('noreg', 'penawaran', 'kjpps', 'tujuan_penilaian_kjpp', 'jenis_laporan'));
     }
 
     public function proses_penawaran_index()
     {
         return view('lpj::proses_penawaran/index');
     }
-
-    public function penawaran_ulang_index()
-    {
-        return view('lpj::penawaran_ulang/index');
-    }
 }

app/Http/Requests/TenderPenawaranRequest.php

@@ -26,7 +26,7 @@ class TenderPenawaranRequest extends FormRequest
         ];
 
         if ($this->method() == 'PUT') {
-            $rules['code'] = 'required|max:50|unique:penawaran,code,' . $this->id;
+            $rules['code'] = 'required|max:50';
         } else {
             $rules['code'] = 'required|max:50|unique:penawaran,code';
         }

resources/views/penawaran/create.blade.php

@@ -1,12 +1,12 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
 @endsection
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <form action="{{ route('tender.penawaran.storePenawaran', $id) }}" method="POST">
+        <form action="{{ route('tender.penawaran.storePenawaran', $noreg) }}" method="POST">
             @csrf
 
             <div class="card pb-2.5">
@@ -15,8 +15,8 @@
                         Tambah Data Penawaran
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('tender.penawaran.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i
+                        <a href="{{ route('tender.penawaran.show', $noreg) }}" class="btn btn-xs btn-primary"
-                                class="ki-outline ki-abstract-26"></i> Detail</a>
+                            title="Detail"><i class="ki-outline ki-abstract-26"></i> Detail</a>
                         <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
                                 class="ki-filled ki-exit-left"></i>
                             Back</a>

resources/views/penawaran/edit.blade.php

@@ -1,22 +1,22 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
 @endsection
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <form action="{{ route('tender.penawaran.updatePenawaran', $id) }}" method="POST">
+        <form action="{{ route('tender.penawaran.updatePenawaran', $noreg) }}" method="POST">
             @csrf
             @method('PUT')
 
             <div class="card pb-2.5">
                 <div class="card-header" id="basic_settings">
                     <h3 class="card-title">
-                        Data Penawaran Ulang
+                        Penawaran Ulang
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('tender.penawaran.show', $id) }}" class="btn btn-xs btn-primary" title="Detail">
+                        <a href="{{ route('tender.penawaran.show', $noreg) }}" class="btn btn-xs btn-primary" title="Detail">
                             <i class="ki-outline ki-abstract-26"></i> Detail
                         </a>
                         <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info">
@@ -82,10 +82,12 @@
                                 class="input tomselect w-full @error('kjpp') border-danger @enderror" id="kjpp_select">
                                 <option value="">Pilih Nama KJPP</option>
                                 @foreach ($kjpp as $row)
+                                    @if ($row->status == 1)
                                         <option value="{{ $row->id }}"
                                             {{ in_array($row->id, old('kjpp', $kjpps ?? [])) ? 'selected' : '' }}>
                                             {{ $row->name }}
                                         </option>
+                                    @endif
                                 @endforeach
                             </select>
                             @error('kjpp')
@@ -93,6 +95,7 @@
                             @enderror
                         </div>
                     </div>
+
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Tujuan Penilaian KJPP
@@ -179,8 +182,8 @@
                                 <option value="">Pilih Status</option>
                                 @if (isset($status))
                                     @foreach ($status as $s)
-                                        <option value="{{ $s->name }}"
+                                        <option value="{{ strtolower($s->name) }}"
-                                            {{ $penawaran->status == $s->name ? 'selected' : '' }}>
+                                            {{ $penawaran->status == strtolower($s->name) ? 'selected' : '' }}>
                                             {{ $s->name }}
                                         </option>
                                     @endforeach

resources/views/penawaran/index.blade.php

@@ -16,7 +16,7 @@
                 <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 KJPP" id="search" type="text" value="">
+                            <input placeholder="Search Penawaran Tender" id="search" type="text" value="">
                         </label>
                     </div>
                     <div class="flex flex-wrap gap-2.5">
@@ -24,6 +24,8 @@
                         <a class="btn btn-sm btn-light" href="{{ route('tender.penawaran.exportPenawaran') }}"> Export to
                             Excel
                         </a>
+                        <a class="btn btn-sm btn-danger" href="{{ route('tender.penawaran.ulang.index') }}">Penawaran
+                            Ulang</a>
                     </div>
                 </div>
             </div>
@@ -36,16 +38,32 @@
                                 <th class="w-14">
                                     <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
                                 </th>
-                                <th class="min-w-[250px]" data-datatable-column="code">
+                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
-                                    <span class="sort"> <span class="sort-label"> Nomor Penawaran </span>
+                                    <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
-                                <th class="min-w-[250px]" data-datatable-column="nama_kjpp_sebelumnya">
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                    <span class="sort"> <span class="sort-label"> Nama KJPP Sebelumnya </span>
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
-                                <th class="min-w-[50px]" data-datatable-column="tanggal_penilaian_sebelumnya">
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
-                                    <span class="sort"> <span class="sort-label"> Tanggal Penilaian Sebelumnya </span>
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"> <span class="sort-label"> Debitur </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_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="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>
@@ -109,38 +127,50 @@
                         return checkbox.outerHTML.trim();
                     },
                 },
-                code: {
+                nomor_registrasi: {
-                    title: 'Nomor Penawaran',
+                    title: 'Nomor Registrasi',
                 },
-                nama_kjpp_sebelumnya: {
+                tanggal_permohonan: {
-                    title: 'Nama KJPP Sebelumnya',
+                    title: 'Tanggal Permohonan',
                     render: (item, data) => {
-                        const nama = data.nama_kjpp_sebelumnya;
+                        return `${formatDate(new Date(data.tanggal_permohonan))}`
-                        if (nama === null || nama === '') {
-                            return 'Tidak Ada'
-                        } else {
-                            return nama;
-                        }
                     }
                 },
-                tanggal_penilaian_sebelumnya: {
+                user_id: {
-                    title: 'Tanggal Penilaian Sebelumnya',
+                    title: 'User Pemohon',
                     render: (item, data) => {
-                        const tanggal = data.tanggal_penilaian_sebelumnya;
+                        return `${data.user.name}`;
-                        if (!tanggal) {
+                    },
-                            return 'Tidak ada';
+                },
-                        }
+                branch_id: {
-                        return formatDate(new Date(tanggal));
+                    title: 'Cabang Pemohon',
-                    }
+                    render: (item, data) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        return `${data.debiture.name}`;
+                    },
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian.name}`;
+                    },
+                },
+                status: {
+                    title: 'Status'
                 },
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
                         return `<div class="flex flex-nowrap justify-center">
-                            <a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.id}/show">
+                            <a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.nomor_registrasi}/show">
                                  <i class="ki-outline ki-abstract-26"></i>
                             </a>
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.id}/create">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.nomor_registrasi}/create">
                                 <i class="ki-outline ki-arrow-circle-right"></i>
                             </a>
 

resources/views/penawaran/show.blade.php

@@ -33,7 +33,7 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
 @endsection
 
 @section('content')
@@ -44,10 +44,10 @@
                     Detail Penawaran
                 </h3>
                 <div class="flex items-center gap-2">
-                    <a href="{{ route('tender.penawaran.editPenawaran', $id) }}" class="btn btn-xs btn-danger"
+                    <a href="{{ route('tender.penawaran.ulang.index') }}" class="btn btn-xs btn-danger" title="Penawaran"><i
-                        title="Penawaran"><i class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
+                            class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
-                    <a href="{{ route('tender.penawaran.createPenawaran', $id) }}" class="btn btn-xs btn-primary"
+                    <a href="{{ route('tender.penawaran.createPenawaran', $noreg) }}" class="btn btn-xs btn-primary"
-                        title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Penawaran</a>
+                        title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Tambah Penawaran</a>
                     <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
                             class="ki-filled ki-exit-left"></i> Back</a>
                 </div>
@@ -71,6 +71,20 @@
                         </p>
                     </div>
                 </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Status
+                    </label>
+                    @if (isset($penawaran->status))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ ucwords($penawaran->status) }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
                         Nama KJPP Sebelumnya
@@ -178,19 +192,5 @@
                         @endif
                     </div>
                 </div>
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
-                        Status
-                    </label>
-                    @if (isset($penawaran->status))
-                        <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $penawaran->status }}
-                        </p>
-                    @else
-                        <p class="flex w-full text-gray-600 font-medium text-sm">
-                            Tidak Ada
-                        </p>
-                    @endif
-                </div>
             </div>
         @endsection

resources/views/penawaran_ulang/index.blade.php

@@ -7,16 +7,185 @@
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
-        <div class="card pb-2.5">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
-            <div class="card-header" id="basic_settings">
+            data-datatable-state-save="false" id="penawaran-table"
+            data-api-url="{{ route('tender.penawaran.ulang.datatables') }}">
+            <div class="card-header py-5 flex-wrap" id="basic_settings">
                 <h3 class="card-title">
                     Data 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 Penawaran Tender" 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="{{ route('tender.penawaran.exportPenawaran') }}"> Export to
+                            Excel
+                        </a>
+                        <a class="btn btn-sm btn-danger" href="{{ route('tender.penawaran.index') }}">Penawaran</a>
+                    </div>
+                </div>
             </div>
             <div class="card-body">
-                {{-- @include('lpj::debitur.form') --}}
+                <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="tanggal_permohonan">
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"> <span class="sort-label"> Debitur </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_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="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 src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script type="text/javascript">
+        function formatDate(date) {
+            const day = date.getDate().toString().padStart(2, '0');
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            // Months are 0-indexed
+            const year = date.getFullYear();
+
+            return `${day} ${getIndonesianMonth(month)} ${year}`;
+        }
+
+        function getIndonesianMonth(month) {
+            const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
+                'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
+            ];
+            return months[month -
+                1];
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#penawaran-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',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan',
+                    render: (item, data) => {
+                        return `${formatDate(new Date(data.tanggal_permohonan))}`
+                    }
+                },
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => {
+                        return `${data.user.name}`;
+                    },
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        return `${data.debiture.name}`;
+                    },
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian.name}`;
+                    },
+                },
+                status: {
+                    title: 'Status'
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/ulang/${data.nomor_registrasi}/show">
+                                 <i class="ki-outline ki-abstract-26"></i>
+                            </a>
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.nomor_registrasi}/edit">
+                                <i class="ki-outline ki-arrow-circle-right"></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/penawaran_ulang/show.blade.php

@@ -0,0 +1,196 @@
+@php
+    function formatTanggalIndonesia($date)
+    {
+        $carbonDate = \Carbon\Carbon::parse($date);
+        $indonesianMonths = [
+            'Januari',
+            'Februari',
+            'Maret',
+            'April',
+            'Mei',
+            'Juni',
+            'Juli',
+            'Agustus',
+            'September',
+            'Oktober',
+            'November',
+            'Desember',
+        ];
+        $month = $indonesianMonths[$carbonDate->month - 1];
+        return $carbonDate->format('d') . ' ' . $month . ' ' . $carbonDate->format('Y');
+    }
+
+    function formatRupiah($number)
+    {
+        // Convert to float if the input is a string
+        $number = (float) $number;
+
+        return 'Rp ' . number_format($number, 2, ',', '.');
+    }
+@endphp
+
+
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
+@endsection
+
+@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 Penawaran Ulang
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('tender.penawaran.editPenawaran', $noreg) }}" class="btn btn-xs btn-danger"
+                        title="Penawaran"><i class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
+                    <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-primary" title="Penawaran"><i
+                            class="ki-filled ki-arrow-circle-right"></i> Penawaran</a>
+                    <a href="{{ route('tender.penawaran.ulang.index') }}" class="btn btn-xs btn-info"><i
+                            class="ki-filled ki-exit-left"></i> Back</a>
+                </div>
+            </div>
+            <div class="card-body grid gap-5">
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        No. registrasi
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ $penawaran->nomor_registrasi ?? '' }}
+                        </p>
+                    </div>
+                    <label class="form-label max-w-56">
+                        No. Penawaran
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ $penawaran->code ?? '' }}
+                        </p>
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Status
+                    </label>
+                    @if (isset($penawaran->status))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ ucwords($penawaran->status) }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Nama KJPP Sebelumnya
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        @if (isset($penawaran->nama_kjpp_sebelumnya) && !empty($penawaran->nama_kjpp_sebelumnya))
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">
+                                {{ $penawaran->nama_kjpp_sebelumnya }}
+                            </div>
+                        @else
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">
+                                Tidak ada
+                            </div>
+                        @endif
+                    </div>
+                    <label class="form-label max-w-56">
+                        Biaya KJPP Sebelumnya
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($penawaran->biaya_kjpp_sebelumnya))
+                            {{ formatRupiah($penawaran->biaya_kjpp_sebelumnya) }}
+                        @else
+                            {{ formatRupiah(0) }}
+                        @endif
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tanggal Penilaian Sebelumnya
+                    </label>
+                    @if (isset($penawaran->tanggal_penilaian_sebelumnya) && !empty($penawaran->tanggal_penilaian_sebelumnya))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ formatTanggalIndonesia($penawaran->tanggal_penilaian_sebelumnya) }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tujuan Penilaian KJPP
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($tujuan_penilaian_kjpp))
+                            @foreach ($tujuan_penilaian_kjpp as $tpk)
+                                {{ $tpk->name }}
+                            @endforeach
+                        @else
+                            Tidak Ada
+                        @endif
+                    </p>
+                    <label class="form-label max-w-56">
+                        Jenis Laporan
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($jenis_laporan))
+                            @foreach ($jenis_laporan as $jl)
+                                {{ $jl->name }}
+                            @endforeach
+                        @else
+                            Tidak Ada
+                        @endif
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tanggal Batas Waktu
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        {{ formatTanggalIndonesia($penawaran->start_date) }} -
+                        {{ formatTanggalIndonesia($penawaran->end_date) }}
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Catatan
+                    </label>
+                    @if (isset($penawaran->catatan))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ $penawaran->catatan }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Nama KJPP
+                    </label>
+                    <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm gap-1">
+                        @if (isset($kjpps) && !empty(json_decode($kjpps, true)))
+                            @foreach ($kjpps as $kjpp)
+                                @if (isset($kjpp))
+                                    <div
+                                        class="flex flex-row space-x-4 text-white font-medium text-sm badge badge-dark dark-mode:badge dark-mode:text-gray-600 badge-xs">
+                                        {{ $kjpp->name }}</div>
+                                @endif
+                            @endforeach
+                        @else
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">Tidak Ada</div>
+                        @endif
+                    </div>
+                </div>
+            </div>
+        @endsection

routes/breadcrumbs.php

@@ -397,19 +397,29 @@ Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) {
     $trail->push('Data Penawaran', route('tender.penawaran.index'));
 });
 
-Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $trail, $id) {
+Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $trail, $noreg) {
     $trail->parent('tender.penawaran');
-    $trail->push('Data Penawaran Ulang', route('tender.penawaran.editPenawaran', $id));
+    $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
 });
 
-Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $id) {
+Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $noreg) {
     $trail->parent('tender.penawaran');
-    $trail->push('Detail Penawaran', route('tender.penawaran.show', $id));
+    $trail->push('Detail Penawaran', route('tender.penawaran.show', $noreg));
 });
 
-Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $trail, $id) {
+Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $trail, $noreg) {
     $trail->parent('tender.penawaran');
-    $trail->push('Tambah Data Penawaran', route('tender.penawaran.createPenawaran', $id));
+    $trail->push('Tambah Data Penawaran', route('tender.penawaran.createPenawaran', $noreg));
+});
+
+Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender');
+    $trail->push('Data Penawaran Ulang', route('tender.penawaran.ulang.index'));
+});
+
+Breadcrumbs::for('tender.penawaran.ulang.show', function (BreadcrumbTrail $trail, $noreg) {
+    $trail->parent('tender.penawaran');
+    $trail->push('Detail Penawaran Ulang', route('tender.penawaran.ulang.show', $noreg));
 });
 
 Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) {
@@ -418,11 +428,6 @@ Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) {
 });
 
 
-Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
-    $trail->parent('tender');
-    $trail->push('Data Penawaran Ulang', route('tender.penawaran_ulang.index'));
-});
-
 Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
     $trail->push('Registrasi', route('registrasi.index'));
 });

routes/web.php

@@ -407,17 +407,17 @@ Route::middleware(['auth'])->group(function () {
     Route::name('tender.')->prefix('tender')->group(function () {
         // Penawaran
         Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
-        Route::get('penawaran/{id}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
+        Route::get('penawaran/{noreg}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
-        Route::get('penawaran/{id}/create', [TenderController::class, 'penawaran_create'])->name(
+        Route::get('penawaran/{noreg}/create', [TenderController::class, 'penawaran_create'])->name(
             'penawaran.createPenawaran',
         );
-        Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name(
+        Route::post('penawaran/{noreg}/store', [TenderController::class, 'penawaran_store'])->name(
             'penawaran.storePenawaran',
         );
-        Route::get('penawaran/{id}/edit', [TenderController::class, 'penawaran_edit'])->name(
+        Route::get('penawaran/{noreg}/edit', [TenderController::class, 'penawaran_edit'])->name(
             'penawaran.editPenawaran',
         );
-        Route::put('penawaran/{id}/update', [TenderController::class, 'penawaran_update'])->name(
+        Route::put('penawaran/{noreg}/update', [TenderController::class, 'penawaran_update'])->name(
             'penawaran.updatePenawaran',
         );
         Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
@@ -427,15 +427,19 @@ Route::middleware(['auth'])->group(function () {
             'penawaran.datatables',
         );
 
+        // Penawaran Ulang
+        Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
+            'penawaran.ulang.index',
+        );
+        Route::get('penawaran/ulang/{noreg}/show', [TenderController::class, 'penawaran_ulang_show'])->name('penawaran.ulang.show');
+        Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
+            'penawaran.ulang.datatables',
+        );
+
         // Proses Penawaran
         Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name(
             'proses_penawaran.index',
         );
-
-        // Penawaran Ulang
-        Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
-            'penawaran_ulang.index',
-        );
     });
 
     Route::name('penilaian.')->prefix('penilaian')->group(function () {