memperbaiki konflik pada branch staging - andydev

app/Http/Controllers/RegistrasiController.php

@@ -241,7 +241,8 @@
 
         public function show($id)
         {
-            return view('lpj::registrasi.show', compact('id'));
+            $permohonan  = Permohonan::find($id);
+            return view('lpj::registrasi.show', compact('id','permohonan'));
         }
 
         public function showData(Request $request): JsonResponse

app/Http/Controllers/TeamsController.php

@@ -2,18 +2,19 @@
 
 namespace Modules\Lpj\Http\Controllers;
 
-use App\Http\Controllers\Controller;
+use Exception;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Modules\Lpj\Models\Regions;
-use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Models\Teams;
-use Modules\Lpj\Models\TeamsUsers;
+use Modules\Lpj\Models\Regions;
-use Modules\Lpj\Http\Requests\TeamsRequest;
 use Illuminate\Support\Facades\DB;
-use Modules\Lpj\Exports\TeamPenilaianExport;
+use Modules\Lpj\Models\TeamsUsers;
+use App\Http\Controllers\Controller;
 use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Http\RedirectResponse;
+use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Http\Requests\TeamsRequest;
+use Modules\Lpj\Exports\TeamPenilaianExport;
 
 class TeamsController extends Controller
 {
@@ -165,7 +166,6 @@ class TeamsController extends Controller
             DB::commit();
 
             echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']);
-
         } catch (Exception $e) {
             DB::rollBack();
             echo json_encode(['success' => false, 'message' => 'Failed to delete Team']);
@@ -255,6 +255,4 @@ class TeamsController extends Controller
     {
         return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx');
     }
-
-
 }

app/Http/Controllers/TenderController.php

@@ -33,15 +33,14 @@ class TenderController extends Controller
      */
     public function penawaran_create($id)
     {
+        $penawaran = PenawaranTender::find($id);
+
         $status = StatusPermohonan::all();
         $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
         $jenis_laporan = JenisLaporan::all();
         $kjpp = KJPP::all();
-        $permohonan = Permohonan::find($id);
-        $permohonanId = $permohonan->id;
-        $permohonanNomorRegistrasi = $permohonan->nomor_registrasi;
 
-        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi'));
+        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id'));
     }
 
     /**
@@ -52,10 +51,14 @@ class TenderController extends Controller
         $validated = $request->validated();
 
         if ($validated) {
-            $validated['nomor_registrasi'] = $request->nomor_registrasi;
+            $penawaran = PenawaranTender::find($id);
+
+            $validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
 
             $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya'));
 
+            dd($validated);
+
             PenawaranTender::create($validated);
 
             return redirect()
@@ -73,7 +76,8 @@ class TenderController extends Controller
      */
     public function penawaran_show($id)
     {
-        return view('lpj::show');
+        $penawaran = PenawaranTender::find($id);
+        return view('lpj::penawaran.show', compact('id', 'penawaran'));
     }
 
     /**

app/Models/Permohonan.php

@@ -35,38 +35,52 @@ class Permohonan extends Base
         'region_id',
         // andy add
         'status_bayar',
-        'nilai_njop'
+        'nilai_njop',
+        // andy add
+        'registrasi_catatan',
+        'registrasi_by',
+        'registrasi_at',
+        'jenis_penilaian_id',
+        'region_id'
     ];
 
-    public function user(){
+    public function user()
+    {
         return $this->belongsTo(User::class);
     }
 
-    public function branch(){
+    public function branch()
+    {
         return $this->belongsTo(Branch::class);
     }
 
-    public function tujuanPenilaian(){
+    public function tujuanPenilaian()
+    {
         return $this->belongsTo(TujuanPenilaian::class);
     }
 
-    public function debiture(){
+    public function debiture()
+    {
         return $this->belongsTo(Debiture::class);
     }
 
-    public function documents(){
+    public function documents()
+    {
         return $this->hasMany(DokumenJaminan::class);
     }
 
-    public function nilaiPlafond(){
+    public function nilaiPlafond()
+    {
         return $this->belongsTo(NilaiPlafond::class);
     }
 
-    public function jenisFasilitasKredit(){
+    public function jenisFasilitasKredit()
+    {
         return $this->belongsTo(JenisFasilitasKredit::class);
     }
 
-    public function penilaian(){
+    public function penilaian()
+    {
         return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
     }
 }

module.json

@@ -5,8 +5,9 @@
   "description": "",
   "keywords": [],
   "priority": 0,
-  "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"],
+  "providers": [
-  
+    "Modules\\Lpj\\Providers\\LpjServiceProvider"
+  ],
   "files": [],
   "menu": {
     "main": [
@@ -61,7 +62,7 @@
       {
         "title": "Pembatalan",
         "path": "",
-                "icon": "ki-filled ki-file-deleted text-lg",
+        "icon": "ki-filled ki-file-deleted text-lg text-danger",
         "classes": "",
         "attributes": [],
         "permission": "",
@@ -69,19 +70,6 @@
           "administrator"
         ]
       },
-            {
-                "_comment1": "andy add",
-                "title": "Registrasi",
-                "path": "registrasi",
-                "icon": "ki-filled ki-some-files text-lg",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "Administrator"
-                ],
-                "_comment2": "andy add"
-            },
       {
         "title": "Data Debitur",
         "path": "debitur",
@@ -93,10 +81,32 @@
           "administrator"
         ]
       },
+      {
+        "title": "Authorization",
+        "path": "authorization",
+        "icon": "ki-filled ki-security-user text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": [
+          "administrator"
+        ]
+      },
+      {
+        "title": "Registrasi",
+        "path": "registrasi",
+        "icon": "ki-filled ki-file-added text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": [
+          "Administrator"
+        ]
+      },
       {
         "title": "Assignment",
         "path": "penilaian",
-                "icon": "ki-filled ki-badge",
+        "icon": "ki-filled ki-badge text-lg",
         "classes": "",
         "attributes": [],
         "permission": "",
@@ -107,7 +117,7 @@
       {
         "title": "Activity",
         "path": "activity",
-                "icon": "ki-filled ki-some-files text-lg",
+        "icon": "ki-filled ki-calendar-edit text-lg",
         "classes": "",
         "attributes": [],
         "permission": "",
@@ -118,7 +128,7 @@
       {
         "title": "Laporan",
         "path": "",
-                "icon": "ki-filled ki-some-files text-lg",
+        "icon": "ki-filled ki-filter-tablet text-lg",
         "classes": "",
         "attributes": [],
         "permission": "",
@@ -267,6 +277,14 @@
             "permission": "",
             "roles": []
           },
+          {
+            "title": "Tujuan Penilaian KJPP",
+            "path": "basicdata.tujuan_penilaian_kjpp",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": []
+          },
           {
             "title": "Ijin Usaha",
             "path": "basicdata.ijin_usaha",
@@ -281,4 +299,3 @@
     "system": []
   }
 }
-

resources/views/penawaran/create.blade.php

@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <form action="{{ route('tender.penawaran.storePenawaran', $permohonanId) }}" method="POST">
+        <form action="{{ route('tender.penawaran.storePenawaran', $id) }}" method="POST">
             @csrf
 
             <div class="card pb-2.5">
@@ -15,6 +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
+                                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>
@@ -26,9 +28,8 @@
                             Nomor Registrasi
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input
+                            <input type="text" value="{{ $penawaran->nomor_registrasi ?? '-' }}" name="nomor_registrasi"
-                                class="input bg-gray-200 text-gray-700 cursor-not-allowed @error('nomor_registrasi') border-danger  @enderror"
+                                class="flex w-full text-gray-600 font-medium text-sm" readonly>
-                                type="text" name="nomor_registrasi" value="{{ $permohonanNomorRegistrasi }}" readonly>
                             @error('nomor_registrasi')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
@@ -174,7 +175,8 @@
                             <option value="">Pilih Status</option>
                             @if (isset($status))
                                 @foreach ($status as $s)
-                                    <option value="{{ $s->name }}" {{ old('status') == $s->name ? 'selected' : '' }}>
+                                    <option value="{{ $s->name }}"
+                                        {{ old('status') == $s->name ? 'selected' : '' }}>
                                         {{ $s->name }}
                                     </option>
                                 @endforeach

resources/views/penawaran/index.blade.php

@@ -72,6 +72,24 @@
 
 @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="text/javascript">
         function deleteData(data) {
             Swal.fire({
@@ -131,20 +149,19 @@
                 },
                 tanggal_penilaian_sebelumnya: {
                     title: 'Tanggal Penilaian Sebelumnya',
+                    render: (item, data) => formatDate(new Date(data.tanggal_penilaian_sebelumnya))
                 },
                 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" href="tender/penawaran/${data.id}">
+                            <a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.id}/show">
-                                <i class="ki-filled ki-eye"></i>
+                                 <i class="ki-outline ki-abstract-26"></i>
                             </a>
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="tender/penawaran/${data.id}/edit">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.id}/create">
-                                <i class="ki-outline ki-notepad-edit"></i>
+                                <i class="ki-outline ki-arrow-circle-right"></i>
-                            </a>
-                            <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
-                                <i class="ki-outline ki-trash"></i>
                             </a>
+
                         </div>`;
                     },
                 }

resources/views/penawaran/show.blade.php

@@ -0,0 +1,36 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+@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
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('tender.penawaran.createPenawaran', $id) }}" class="btn btn-xs btn-primary"
+                        title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> 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>
+            </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>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

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

@@ -244,7 +244,7 @@
                     </div>
                 </div>
                 <div class="card-footer flex justify-end">
-                    <button type="submit" name="status" value="register" class="btn btn-success">
+                    <button type="submit" name="status" value="preregister" class="btn btn-success">
                         Approve
                     </button>
                     <button type="submit" name="status" value="revisi" class="btn btn-warning ml-3">

resources/views/permohonan/index.blade.php

@@ -176,9 +176,6 @@
                     render: (item, data) => {
                         return `
                         <div class="flex flex-nowrap justify-center gap-1.5">
-                            <a class="btn btn-sm btn-outline btn-success" href="tender/penawaran/${data.id}/create">
-                                <i class="ki-filled ki-plus-circle"></i> Penawaran
-                            </a>
                             <a class="btn btn-sm btn-outline btn-info" href="permohonan/${data.id}/edit">
                                 <i class="ki-outline ki-notepad-edit"></i>
                             </a>

resources/views/registrasi/show.blade.php

@@ -20,21 +20,224 @@
                 <a href="{{ route('registrasi.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="card-body lg:py-7.5 grid grid-cols-3">
-            <input type="hidden" id="id" name="id" value="{{ $id }}">
+            <div class="mb-5">
-            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <h3 class="text-md font-medium text-gray-900">
-                <label class="form-label max-w-56">
+                    Nomor Register Permohonan:
-                    No. registrasi
+                </h3>
-                </label>
+                <span class="text-2sm text-gray-700">
-                <div class="flex flex-wrap items-baseline w-full">
+                    {{ $permohonan->nomor_registrasi }}
-                    <label class="card-title" id="textReg">
+                </span>
-                        No. registrasi
-                    </label>
             </div>
+
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Pemohon:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+                </span>
+            </div>
+
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Tujan Permohonan:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    {{ $permohonan->tujuanPenilaian->name }}
+                </span>
             </div>
 
         </div>
     </div>
+
+    <div class="card min-w-full">
+        <div class="card-header">
+            <h3 class="card-title">
+                Detail Debutur
+            </h3>
+        </div>
+        <div class="card-table scrollable-x-auto pb-3">
+            <div class="grid grid-cols-1 xl:grid-cols-2 gap-5 lg:gap-7.5">
+                <div class="col-span-1">
+                    <table class="table align-middle text-sm text-gray-500">
+                        <tr>
+                            <td class="py-2 text-gray-600 font-normal">
+                                Name
+                            </td>
+                            <td class="py-2 text-gray-800 font-normaltext-sm">
+                                {{ $permohonan->debiture->name ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3">
+                                Email
+                            </td>
+                            <td class="py-3 text-gray-700 text-2sm font-normal">
+                                {{ $permohonan->debiture->email ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3">
+                                Phone
+                            </td>
+                            <td class="py-3 text-gray-700 text-2sm font-normal">
+                                {{ $permohonan->debiture->phone ?? "" }}
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="py-3 text-gray-600 font-normal">
+                                Address
+                            </td>
+                            <td class="py-3 text-gray-700 text-sm font-normal">
+                                {{ $permohonan->debiture->address ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3 text-gray-600 font-normal">
+                                &nbsp;
+                            </td>
+                            <td class="py-3 text-gray-700 text-sm font-normal">
+                                {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="col-span-1">
+                    <table class="table align-middle text-sm text-gray-500">
+                        <tr>
+                            <td class="py-3 text-gray-600 font-normal">
+                                Cabang
+                            </td>
+                            <td class="py-2 text-gray-800 font-normaltext-sm">
+                                {{ $permohonan->debiture->branch->name  ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3 text-gray-600 font-normal">
+                                CIF
+                            </td>
+                            <td class="py-2 text-gray-800 font-normaltext-sm">
+                                {{ $permohonan->debiture->cif ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3 text-gray-600 font-normal">
+                                Nomor Rekening
+                            </td>
+                            <td class="py-3 text-gray-700 text-sm font-normal">
+                                {{ $permohonan->debiture->nomor_rekening ?? "" }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="py-3">
+                                NPWP
+                            </td>
+                            <td class="py-3 text-gray-700 text-2sm font-normal">
+                                {{ $permohonan->debiture->npwp ?? "" }}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card min-w-full">
+        <div class="card-header">
+            <h3 class="card-title">
+                Data Jaminan
+            </h3>
+        </div>
+        <div data-accordion="true">
+            @foreach($permohonan->debiture->documents as $dokumen)
+                <div class="accordion-item [&:not(:last-child)]:border-b border-b-gray-200" data-accordion-item="true" id="accordion_1_item_1">
+                    <button class="accordion-toggle py-4 group mx-8" data-accordion-toggle="#accordion_1_content_1">
+                        <span class="text-base text-gray-900 font-medium">
+                            Jaminan {{ $loop->index + 1 }}
+                        </span>
+                        <i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
+                        </i>
+                        <i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
+                        </i>
+                    </button>
+                    <div class="accordion-content hidden" id="accordion_1_content_1">
+                        <div class="card-body lg:py-7.5 grid grid-cols-2">
+                            <div class="mb-5">
+                                <h3 class="text-md font-medium text-gray-900">
+                                    Pemilik Jaminan:
+                                </h3>
+                                <span class="text-2sm text-gray-700">
+                                    {{ $dokumen->pemilik->name?? "" }}
+                                </span>
+                            </div>
+                            <div class="mb-5">
+                                <h3 class="text-md font-medium text-gray-900">
+                                    Jenis Jaminan:
+                                </h3>
+                                <span class="text-2sm text-gray-700">
+                                    {{ $dokumen->jenisJaminan->name?? "" }}
+                                </span>
+                            </div>
+                            <div class="mb-5">
+                                <h3 class="text-md font-medium text-gray-900">
+                                    Hubungan Pemilik Jaminan:
+                                </h3>
+                                <span class="text-2sm text-gray-700">
+                                    {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }}
+                                </span>
+                            </div>
+                            <div class="mb-5">
+                                <h3 class="text-md font-medium text-gray-900">
+                                    Alamat Pemilik Jaminan:
+                                </h3>
+                                <span class="text-2sm text-gray-700">
+                                    {{ $dokumen->pemilik->address ?? ""}},
+                                    <br> {{ $dokumen->pemilik->village->name ?? "" }}, {{ $dokumen->pemilik->district->name ?? "" }}, {{ $dokumen->pemilik->city->name ?? "" }}, {{ $dokumen->pemilik->province->name ?? "" }} - {{ $dokumen->pemilik->village->postal_code ?? "" }}
+                                </span>
+                            </div>
+                        </div>
+                        <div class="card-table scrollable-x-auto pb-3">
+                            <table class="table align-middle text-sm text-gray-500">
+                                @foreach($dokumen->detail as $detail)
+                                    <tr>
+                                        <td class="py-2 text-gray-600 font-normal max-w-[100px]">
+                                            {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+                                        </td>
+                                        <td class="py-2 text-gray-800 font-normaltext-sm">
+                                            {{ $detail->name ?? "" }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="py-3  max-w-[100px]">
+                                            Dokumen Jaminan
+                                        </td>
+                                        <td class="py-3 text-gray-700 text-2sm font-normal">
+                                            @if(isset($detail->dokumen_jaminan))
+                                                <a href="{{ route('debitur.jaminan.download',['id'=>$permohonan->debiture->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2">{{ basename($detail->dokumen_jaminan) }}
+                                                    <i class="ki-filled ki-cloud-download"></i></a>
+                                            @endif
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="py-3  max-w-[100px]">
+                                            Keterangan
+                                        </td>
+                                        <td class="py-3 text-gray-700 text-2sm font-normal">
+                                            {{ $detail->keterangan ?? ""  }}
+                                        </td>
+                                    </tr>
+                                @endforeach
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
 </div>
+
+
 @endsection
 @include('lpj::registrasi.js.showjs')

routes/web.php

@@ -1,34 +1,36 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
+    use Illuminate\Support\Facades\Route;
-use Modules\Lpj\Http\Controllers\ActivityController;
+    use Modules\Lpj\Http\Controllers\ActivityController;
-use Modules\Lpj\Http\Controllers\ArahMataAnginController;
+    use Modules\Lpj\Http\Controllers\ArahMataAnginController;
-use Modules\Lpj\Http\Controllers\BranchController;
+    use Modules\Lpj\Http\Controllers\BranchController;
-use Modules\Lpj\Http\Controllers\CurrencyController;
+    use Modules\Lpj\Http\Controllers\CurrencyController;
-use Modules\Lpj\Http\Controllers\DebitureController;
+    use Modules\Lpj\Http\Controllers\DebitureController;
-use Modules\Lpj\Http\Controllers\DokumenJaminanController;
+    use Modules\Lpj\Http\Controllers\DokumenJaminanController;
-use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
+    use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
-use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
+    use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
-use Modules\Lpj\Http\Controllers\IjinUsahaController;
+    use Modules\Lpj\Http\Controllers\IjinUsahaController;
-use Modules\Lpj\Http\Controllers\JenisDokumenController;
+    use Modules\Lpj\Http\Controllers\JenisDokumenController;
-use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
+    use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
-use Modules\Lpj\Http\Controllers\JenisJaminanController;
+    use Modules\Lpj\Http\Controllers\JenisJaminanController;
-use Modules\Lpj\Http\Controllers\JenisLaporanController;
+    use Modules\Lpj\Http\Controllers\JenisLaporanController;
-use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
+    use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
-use Modules\Lpj\Http\Controllers\JenisPenilaianController;
+    use Modules\Lpj\Http\Controllers\JenisPenilaianController;
-use Modules\Lpj\Http\Controllers\KJPPController;
+    use Modules\Lpj\Http\Controllers\KJPPController;
-use Modules\Lpj\Http\Controllers\NilaiPlafondController;
+    use Modules\Lpj\Http\Controllers\NilaiPlafondController;
-use Modules\Lpj\Http\Controllers\PemilikJaminanController;
+    use Modules\Lpj\Http\Controllers\PemilikJaminanController;
-use Modules\Lpj\Http\Controllers\PenilaianController;
+    use Modules\Lpj\Http\Controllers\PenilaianController;
-use Modules\Lpj\Http\Controllers\PermohonanController;
+    use Modules\Lpj\Http\Controllers\PermohonanController;
-use Modules\Lpj\Http\Controllers\RegionController;
+    use Modules\Lpj\Http\Controllers\RegionController;
-use Modules\Lpj\Http\Controllers\StatusPermohonanController;
+    use Modules\Lpj\Http\Controllers\StatusPermohonanController;
-use Modules\Lpj\Http\Controllers\TeamsController;
+    use Modules\Lpj\Http\Controllers\TeamsController;
-use Modules\Lpj\Http\Controllers\TenderController;
+    use Modules\Lpj\Http\Controllers\TenderController;
-use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+    use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
-use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
+    use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
 
-/*
+    // use Modules\Lpj\Http\Controllers\ActivityController;
+
+    /*
             |--------------------------------------------------------------------------
             | Web Routes
             |--------------------------------------------------------------------------
@@ -39,20 +41,22 @@ use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
             |
             */
 
-Route::middleware(['auth'])->group(function () {
+    Route::middleware(['auth'])->group(function () {
         Route::name('basicdata.')->prefix('basic-data')->group(function () {
             Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
                 Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
-            Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])
+                Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
             });
             Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
 
             Route::name('jenis-legalitas-jaminan.')->prefix('jenis-legalitas-jaminan')->group(function () {
                 Route::get('restore/{id}', [JenisLegalitasJaminanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [JenisLegalitasJaminanController::class, 'export'])->name('export');
             });
             Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
@@ -60,45 +64,41 @@ Route::middleware(['auth'])->group(function () {
             Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
                 Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas');
                 Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
-                     ->name('datatables');
                 Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
             });
             Route::resource('jenis-jaminan', JenisJaminanController::class);
 
             Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () {
                 Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore');
-            Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])
+                Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export');
             });
             Route::resource('tujuan-penilaian', TujuanPenilaianController::class);
 
             Route::name('tujuan_penilaian_kjpp.')->prefix('tujuan_penilaian_kjpp')->group(function () {
-            Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])
+                Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [TujuanPenilaianKJPPController::class, 'export'])->name('export');
             });
             Route::resource('tujuan_penilaian_kjpp', TujuanPenilaianKJPPController::class);
 
             Route::name('jenis-dokumen.')->prefix('jenis-dokumen')->group(function () {
                 Route::get('restore/{id}', [JenisDokumenController::class, 'restore'])->name('restore');
-            Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])
+                Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [JenisDokumenController::class, 'export'])->name('export');
             });
             Route::resource('jenis-dokumen', JenisDokumenController::class);
             Route::name('currency.')->prefix('mata-uang')->group(function () {
                 Route::get('restore/{id}', [CurrencyController::class, 'restore'])->name('restore');
-            Route::get('datatables', [CurrencyController::class, 'dataForDatatables'])
+                Route::get('datatables', [CurrencyController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [CurrencyController::class, 'export'])->name('export');
             });
 
             Route::name('debitur.')->prefix('debitur')->group(function () {
                 Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-            Route::get('datatables', [DebitureController::class, 'dataForDatatables'])
+                Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-                 ->name('datatables');
                 Route::get('export', [DebitureController::class, 'export'])->name('export');
 
 
@@ -126,8 +126,7 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('branch.')->prefix('cabang')->group(function () {
                 Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
-            Route::get('datatables', [BranchController::class, 'dataForDatatables'])
+                Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [BranchController::class, 'export'])->name('export');
             });
 
@@ -145,32 +144,32 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
                 Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])
+                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
             });
             Route::resource('nilai-plafond', NilaiPlafondController::class);
 
             Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
                 Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
             });
             Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
 
             Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
                 Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
             });
             Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
 
             Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
                 Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])
+                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
             });
             Route::resource('arah-mata-angin', ArahMataAnginController::class);
@@ -178,8 +177,7 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
                 Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])
+                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
             });
             Route::resource('status-permohonan', StatusPermohonanController::class);
@@ -256,8 +254,7 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('branch.')->prefix('cabang')->group(function () {
                 Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
-            Route::get('datatables', [BranchController::class, 'dataForDatatables'])
+                Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [BranchController::class, 'export'])->name('export');
             });
 
@@ -275,32 +272,32 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
                 Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])
+                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
             });
             Route::resource('nilai-plafond', NilaiPlafondController::class);
 
             Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
                 Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
             });
             Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
 
             Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
                 Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])
+                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                ->name('datatables');
+                        'datatables',
+                    );
                 Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
             });
             Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
 
             Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
                 Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])
+                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
             });
             Route::resource('arah-mata-angin', ArahMataAnginController::class);
@@ -326,16 +323,14 @@ Route::middleware(['auth'])->group(function () {
 
             Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
                 Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])
+                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
             });
             Route::resource('status-permohonan', StatusPermohonanController::class);
 
             // Start Activity KJPP route
             Route::name('kjpp.')->prefix('kjpp')->group(function () {
-            Route::get('datatables', [KJPPController::class, 'dataForDatatables'])
+                Route::get('datatables', [KJPPController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [KJPPController::class, 'export'])->name('export');
             });
 
@@ -344,8 +339,7 @@ Route::middleware(['auth'])->group(function () {
 
             // Start Activity Ijin Usaha route
             Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () {
-            Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])
+                Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [IjinUsahaController::class, 'export'])->name('export');
             });
 
@@ -354,29 +348,30 @@ Route::middleware(['auth'])->group(function () {
 
             // Start Activity Jenis Laporan route
             Route::name('jenis_laporan.')->prefix('jenis_laporan')->group(function () {
-            Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])
+                Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])->name('datatables');
-                ->name('datatables');
                 Route::get('export', [JenisLaporanController::class, 'export'])->name('export');
             });
 
             Route::resource('jenis_laporan', JenisLaporanController::class);
             // End Activity Jenis Laporan route
+
+
         });
 
         Route::name('permohonan.')->prefix('permohonan')->group(function () {
             Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
             Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
             Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
-        Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])
+            Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
-            ->name('datatables');
             Route::get('export', [PermohonanController::class, 'export'])->name('export');
         });
 
         Route::resource('permohonan', PermohonanController::class);
 
         Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
-    Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])
+        Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
-        ->name('authorization.datatables');
+                'authorization.datatables',
+            );
         Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name(
             'authorization.show',
         );
@@ -386,8 +381,7 @@ Route::middleware(['auth'])->group(function () {
 
         Route::name('debitur.')->prefix('debitur')->group(function () {
             Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-        Route::get('datatables', [DebitureController::class, 'dataForDatatables'])
+            Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-            ->name('datatables');
             Route::get('export', [DebitureController::class, 'export'])->name('export');
 
 
@@ -413,6 +407,63 @@ Route::middleware(['auth'])->group(function () {
 
         Route::resource('debitur', DebitureController::class);
 
+        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/{id}/create', [TenderController::class, 'penawaran_create'])->name(
+                'penawaran.createPenawaran',
+            );
+            Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name(
+                'penawaran.storePenawaran',
+            );
+            Route::post('penawaran/{id}/update', [TenderController::class, 'penawaran_store'])->name(
+                'penawaran.updatePenawaran',
+            );
+            Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
+                'penawaran.exportPenawaran',
+            );
+            Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])->name(
+                    'penawaran.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 () {
+            Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
+            Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [PenilaianController::class, 'export'])->name('export');
+            Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
+
+            Route::get('/', [PenilaianController::class, 'index'])->name('index');
+            Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
+            Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+            Route::put('revisi/{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
+            Route::post('create', [PenilaianController::class, 'create'])->name('create');
+            Route::post('store', [PenilaianController::class, 'store'])->name('store');
+        });
+
+        Route::name('activity.')->prefix('activity')->group(function () {
+            Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
+            Route::get('datatables', [ActivityController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [ActivityController::class, 'export'])->name('export');
+            Route::get('/', [ActivityController::class, 'index'])->name('index');
+            Route::get('/{id}/show', [ActivityController::class, 'show'])->name('show');
+            Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
+        });
+    });
+
+    Route::resource('debitur', DebitureController::class);
+
     Route::name('tender.')->prefix('tender')->group(function () {
         // Penawaran
         Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
@@ -433,7 +484,6 @@ Route::middleware(['auth'])->group(function () {
             'penawaran_ulang.index',
         );
     });
-});
 
 // andy add
 require __DIR__ . '/registrasi.php';