diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index c49398e..c51457b 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -94,5 +94,17 @@ function checkKelengkapanDetailKJPP($id)
 
     return $allow;
 }
+
+// convert
+function convertSlug($slug) {
+    
+    $words = explode('-', $slug);
+
+    foreach ($words as $index => $word) {
+        $words[$index] = strtoupper($word);
+    }
+
+    return implode(' ', $words);
+}
 // andy add
 
diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index 243fb9d..a37669b 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -313,7 +313,6 @@ class ProsesPenawaranController extends Controller
 
     public function updateKJPPStatus(Request $request, $id): JsonResponse
     {
-        // dd('updateKJPPStatus');
         // init
         $data = array();
         $dataDetailPenawaran = array();
diff --git a/app/Http/Controllers/ProsesPenawaranUlangController.php b/app/Http/Controllers/ProsesPenawaranUlangController.php
new file mode 100644
index 0000000..4cf278d
--- /dev/null
+++ b/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;
+    }
+
+}
diff --git a/app/Models/PenawaranDetailTenderLog.php b/app/Models/PenawaranDetailTenderLog.php
new file mode 100644
index 0000000..d29ff58
--- /dev/null
+++ b/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');
+    }
+}
diff --git a/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php b/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php
new file mode 100644
index 0000000..730a0b1
--- /dev/null
+++ b/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');
+    }
+};
diff --git a/module.json b/module.json
index 7977c0c..0390201 100644
--- a/module.json
+++ b/module.json
@@ -61,6 +61,14 @@
             "attributes": [],
             "permission": "",
             "roles": ["administrator", "admin"]
+          },
+          {
+            "title": "Data Proses Penawaran Ulang",
+            "path": "tender.prosespenawaranulang",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator", "admin"]
           }
         ]
       },
diff --git a/resources/views/prosespenawaranulang/edit.blade.php b/resources/views/prosespenawaranulang/edit.blade.php
new file mode 100644
index 0000000..79e5e79
--- /dev/null
+++ b/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')
\ No newline at end of file
diff --git a/resources/views/prosespenawaranulang/index.blade.php b/resources/views/prosespenawaranulang/index.blade.php
new file mode 100644
index 0000000..86b7c77
--- /dev/null
+++ b/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
diff --git a/resources/views/prosespenawaranulang/js/editextjs.blade.php b/resources/views/prosespenawaranulang/js/editextjs.blade.php
new file mode 100644
index 0000000..1e17943
--- /dev/null
+++ b/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>    
\ No newline at end of file
diff --git a/resources/views/prosespenawaranulang/js/editjs.blade.php b/resources/views/prosespenawaranulang/js/editjs.blade.php
new file mode 100644
index 0000000..7d8d9da
--- /dev/null
+++ b/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  
\ No newline at end of file
diff --git a/resources/views/prosespenawaranulang/show.blade.php b/resources/views/prosespenawaranulang/show.blade.php
new file mode 100644
index 0000000..74a361e
--- /dev/null
+++ b/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
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 8e753e1..5ae30ec 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -482,7 +482,22 @@ 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
 
 
 Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail) {
diff --git a/routes/registrasi.php b/routes/registrasi.php
index 311da52..dd14aa5 100644
--- a/routes/registrasi.php
+++ b/routes/registrasi.php
@@ -2,6 +2,7 @@
 
 use Modules\Lpj\Http\Controllers\RegistrasiController;
 use Modules\Lpj\Http\Controllers\ProsesPenawaranController;
+use Modules\Lpj\Http\Controllers\ProsesPenawaranUlangController;
 
 Route::middleware(['auth'])->group(function () {
     
@@ -47,6 +48,23 @@ Route::middleware(['auth'])->group(function () {
            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');
+           
+        });
     });    
 });