Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

app/Http/Controllers/NocController.php

@@ -47,18 +47,19 @@
 
             $dataNoc = [
                 'nominal_bayar'      => $validated['nominal_bayar'],
-                'tanggal_pembayaran' => date('Y-m-d'),
+                'tanggal_pembayaran' => $validated['tanggal_pembayaran'] ?? date('Y-m-d'),
                 'status_bayar'       => $validated['nominal_bayar'] < $validated['total_harus_bayar'] ? false : true,
-                'catatan_noc'         => $validated['catatan_noc'],
+                'catatan_noc'        => $validated['catatan_noc'],
             ];
-            $noc = Noc::updateOrCreate(
+            $noc     = Noc::updateOrCreate(
                 [
                     'permohonan_id'            => $validated['permohonan_id'],
-                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id']
+                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
-                ],$dataNoc
+                ],
+                $dataNoc,
             );
 
-            $folderPath = 'noc/' . request()->get('penawaran_id');
+            $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_ksl/';
 
             if ($request->hasFile('bukti_ksl')) {
                 $noc->bukti_ksl = $request->file('bukti_ksl')->store(
@@ -90,7 +91,7 @@
             }
 
             return redirect()
-                ->route('noc.index')->with('success', 'Penyelesaian KSL berhasil disimpan.');
+                ->route('noc.index')->with('success', 'NOC berhasil disimpan.');
         }
 
         /**
@@ -98,13 +99,36 @@
          */
         public function update(NocRequest $request, PersetujuanPenawaran $persetujuanPenawaran)
         {
-            $validated               = $request->validated();
+            $validated = $request->validated();
-            $validated['updated_by'] = Auth::id();
+            $dataNoc   = [
+                'nominal_penyelesaian' => $validated['nominal_penyelesaian'],
+                'tanggal_penyelesaian' => $validated['tanggal_penyelesaian'] ?? date('Y-m-d'),
+                'status_pelunasan'     => ((int)$validated['nominal_bayar'] + (int)$validated['nominal_penyelesaian']) === (int)$validated['total_harus_bayar'] ? true : false,
+                'catatan_noc'          => $validated['catatan_noc'],
+            ];
+
+
+            $noc = Noc::updateOrCreate(
+                [
+                    'permohonan_id'            => $validated['permohonan_id'],
+                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
+                ],
+                $dataNoc,
+            );
+
+            $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_penyelesaian/';
+
+            if ($request->hasFile('bukti_penyelesaian')) {
+                $noc->bukti_penyelesaian = $request->file('bukti_penyelesaian')->store(
+                    $folderPath,
+                    'public',
+                );
+            }
+            $noc->save();
 
-            $persetujuanPenawaran->update($validated);
 
             return redirect()
-                ->route('noc.index')->with('success', 'Persetujuan Penawaran updated successfully');
+                ->route('noc.index')->with('success', 'NOC updated successfully');
         }
 
         /**
@@ -188,8 +212,8 @@
                     'nomor_registrasi'     => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi,
                     'nama_debitur'         => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name,
                     'cabang'               => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name,
-                    'tanggal_setor'        => dateFormat(
+                    'tanggal_pembayaran'   => dateFormat(
-                        $persetujuanPenawaran->moc->created_at ?? $persetujuanPenawaran->created_at,
+                        $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
                         true,
                     ),
                     'nominal_bayar'        => currencyFormat(
@@ -201,12 +225,12 @@
                         $persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0,
                     ),
                     'bukti_penyelesaian'   => $persetujuanPenawaran->noc->bukti_penyelesaian ?? $persetujuanPenawaran->bukti_penyelesaian ?? null,
-                    'tanggal_penyelesaian' => dateFormat(
+                    'tanggal_penyelesaian' => $persetujuanPenawaran->noc?->tanggal_penyelesaian ? dateFormat(
-                        $persetujuanPenawaran->noc->tanggal_penyelesaian ?? $persetujuanPenawaran->updated_at,
+                        $persetujuanPenawaran->noc?->tanggal_penyelesaian,
-                        true,
+                        true) : '-',
-                    ),
+                    'updated_at'           => dateFormat($persetujuanPenawaran->updated_at, true),
                 ];
-            });
+            })->sortBy('updated_at', 1);
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));

resources/views/noc/form.blade.php

@@ -4,6 +4,16 @@
     {{ Breadcrumbs::render(request()->route()->getName()) }}
 @endsection
 
+@php
+    $hasMemo = false;
+    try {
+        $memoPath = $persetujuanPenawaran->noc->memo_penyelesaian ?? null;
+        $hasMemo = isset($memoPath) && !empty($memoPath) && Storage::exists($memoPath);
+    } catch (Exception $e) {
+        // Jika terjadi error, $hasMemo tetap false
+    }
+@endphp
+
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         <div class="card border border-agi-100 pb-2.5">
@@ -16,8 +26,11 @@
                 </div>
             </div>
             <div class="card-body">
-                <form action="{{ route('noc.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
+                <form action="{{ !$hasMemo ? route('noc.store') : route('noc.update',$persetujuanPenawaran) }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
                     @csrf
+                    @if($hasMemo)
+                        @method('PUT')
+                    @endif
                     <input type="hidden" name="penawaran_id" value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
                     <input type="hidden" name="persetujuan_penawaran_id" value="{{ $persetujuanPenawaran->id ?? old('persetujuan_penawaran_id') }}">
                     <input type="hidden" name="permohonan_id" value="{{ $persetujuanPenawaran->penawaran->permohonan->id ?? $persetujuanPenawaran->permohonan->id }}">
@@ -27,7 +40,7 @@
                             Status Bayar
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full @error('status_pembayar') border-danger bg-danger-light @enderror" name="status_pembayar" id="status_pembayar">
+                            <select class="input tomselect w-full @error('status_pembayar') border-danger bg-danger-light @enderror" name="status_pembayar" id="status_pembayar" {{ $hasMemo ? 'disabled' : '' }}>
                                 <option value="">Pilih Status Bayar</option>
                                 <option value="sudah_bayar" {{ (old('status_pembayar') == 'sudah_bayar') || ($persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
                                 <option value="belum_bayar" {{ (old('status_pembayar') == 'belum_bayar') || ($persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
@@ -55,41 +68,109 @@
                             Nominal Bayar
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="number" name="nominal_bayar" id="nominal_bayar" class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror" value="{{ old('nominal_bayar', $persetujuanPenawaran->noc->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar">
+                            <input type="number" name="nominal_bayar" id="nominal_bayar" class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror" value="{{ old('nominal_bayar', $persetujuanPenawaran->noc->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar" {{ $hasMemo ? 'readonly' : '' }}>
                             @error('nominal_bayar')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Tanggal Pembayaran
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="date" name="tanggal_pembayaran" id="tanggal_pembayaran" class="input w-full @error('tanggal_pembayaran') border-danger bg-danger-light @enderror" value="{{ old('tanggal_pembayaran', isset($persetujuanPenawaran->noc->tanggal_pembayaran) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_pembayaran)) : '') }}" {{ $hasMemo ? 'readonly' : '' }}>
+                            @error('tanggal_pembayaran')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+
+
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Bukti KSL
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="file" name="bukti_ksl" id="bukti_ksl" class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
+                            @if($hasMemo)
-                            @error('bukti_ksl')
+                                <input type="file" name="bukti_ksl" id="bukti_ksl" class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @error('bukti_ksl')
-                            @enderror
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            @endif
 
                             @if(isset($persetujuanPenawaran->noc->bukti_ksl) && !empty($persetujuanPenawaran->noc->bukti_ksl))
                                 <div class="mt-2 flex items-center">
-                                    <span class="text-sm text-gray-600 mr-2">File yang sudah diupload:</span>
+                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_ksl) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
-                                    <a href="{{ asset('storage/' . $persetujuanPenawaran->noc->bukti_ksl) }}"
+                                        <i class="ki-filled ki-eye mr-2"></i> Lihat File
-
-
-                                       target="_blank" class="text-blue-600 hover:text-blue-800 underline flex items-center">
-                                        <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
-                                        </svg>
-                                        Lihat File
                                     </a>
                                 </div>
                             @endif
                         </div>
                     </div>
 
+                    @if($hasMemo)
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Memo Penyelesaian
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <div class="flex items-center">
+                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->memo_penyelesaian) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
+                                        <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                    </a>
+                                    <input type="hidden" name="memo_penyelesaian_existing" value="{{ $persetujuanPenawaran->noc->memo_penyelesaian }}">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Bukti Penyelesaian
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input type="file" name="bukti_penyelesaian" id="bukti_penyelesaian" class="file-input w-full @error('bukti_penyelesaian') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
+                                @error('bukti_penyelesaian')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+
+                                @if(isset($persetujuanPenawaran->noc->bukti_penyelesaian) && !empty($persetujuanPenawaran->noc->bukti_penyelesaian))
+                                    <div class="mt-2 flex items-center">
+                                        <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_penyelesaian) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
+                                            <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                        </a>
+                                        <input type="hidden" name="bukti_penyelesaian_existing" value="{{ $persetujuanPenawaran->noc->bukti_penyelesaian }}">
+                                    </div>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Nominal Penyelesaian
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input type="number" name="nominal_penyelesaian" id="nominal_penyelesaian" class="input w-full @error('nominal_penyelesaian') border-danger bg-danger-light @enderror" value="{{ old('nominal_penyelesaian', $persetujuanPenawaran->noc->nominal_penyelesaian ?? '') }}" placeholder="Masukkan nominal penyelesaian">
+                                @error('nominal_penyelesaian')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tanggal Penyelesaian
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input type="date" name="tanggal_penyelesaian" id="tanggal_penyelesaian" class="input w-full @error('tanggal_penyelesaian') border-danger bg-danger-light @enderror" value="{{ old('tanggal_penyelesaian', isset($persetujuanPenawaran->noc->tanggal_penyelesaian) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_penyelesaian)) : '') }}">
+                                @error('tanggal_penyelesaian')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            </div>
+                        </div>
+                    @endif
+
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Catatan

resources/views/noc/index.blade.php

@@ -57,6 +57,22 @@
                                 <span class="sort"> <span class="sort-label"> Bukti KSL </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_pembayaran">
+                                <span class="sort"> <span class="sort-label"> Tanggal Pembayaran </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="memo_penyelesaian">
+                                <span class="sort"> <span class="sort-label"> Memo Penyelesaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="bukti_penyelesaian">
+                                <span class="sort"> <span class="sort-label"> Bukti Penyelesaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nominal_penyelesaian">
+                                <span class="sort"> <span class="sort-label"> Nominal Penyelesaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
                             <th class="min-w-[150px]" data-datatable-column="tanggal_penyelesaian">
                                 <span class="sort"> <span class="sort-label"> Tanggal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
@@ -149,6 +165,36 @@
                                 }
                             },
                         },
+                        tanggal_pembayaran: {
+                            title: 'Tanggal Pembayaran',
+                        },
+                        memo_penyelesaian: {
+                            title: 'Memo Penyelesaian',
+                            render: (item, data) => {
+                                if (data.memo_penyelesaian) {
+                                    return `<a href="storage/${data.memo_penyelesaian}" download="storage/${data.memo_penyelesaian}" target="_blank" class="badge badge-sm badge-outline">
+                        Download <i class="ki-filled ki-cloud-download"></i>
+                    </a>`;
+                                } else {
+                                    return '-';
+                                }
+                            },
+                        },
+                        bukti_penyelesaian: {
+                            title: 'Bukti Penyelesaian',
+                            render: (item, data) => {
+                                if (data.bukti_penyelesaian) {
+                                    return `<a href="storage/${data.bukti_penyelesaian}" download="storage/${data.bukti_penyelesaian}" target="_blank" class="badge badge-sm badge-outline">
+                        Download <i class="ki-filled ki-cloud-download"></i>
+                    </a>`;
+                                } else {
+                                    return '-';
+                                }
+                            },
+                        },
+                        nominal_penyelesaian: {
+                            title: 'Nominal Penyelesaian',
+                        },
                         tanggal_penyelesaian: {
                             title: 'Tanggal Penyelesaian',
                         },