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

app/Http/Controllers/PersetujuanPenawaranController.php

@@ -12,6 +12,7 @@
     class PersetujuanPenawaranController extends Controller
     {
         public $user;
+
         /**
          * Display a listing of the resource.
          */
@@ -21,6 +22,12 @@
             return view('lpj::persetujuan_penawaran.index', compact('persetujuanPenawarans'));
         }
 
+        /**
+         * Store a newly created resource in storage.
+         */
+        /**
+         * Store a newly created resource in storage.
+         */
         /**
          * Store a newly created resource in storage.
          */
@@ -29,10 +36,43 @@
             $validated               = $request->validated();
             $validated['created_by'] = Auth::id();
 
-            PersetujuanPenawaran::create($validated);
+            $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
+                ['penawaran_id' => $validated['penawaran_id']],
+                $validated,
+            );
+
+            $folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
+
+            if ($request->hasFile('file_persetujuan_penawaran')) {
+                $persetujuanPenawaran->file_persetujuan_penawaran = $request->file('file_persetujuan_penawaran')->store(
+                    $folderPath,
+                    'public',
+                );
+            }
+
+            if ($request->hasFile('surat_representasi')) {
+                $persetujuanPenawaran->surat_representasi = $request->file('surat_representasi')->store(
+                    $folderPath,
+                    'public',
+                );
+            }
+
+            if ($request->hasFile('bukti_bayar')) {
+                $persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
+            }
+
+            $persetujuanPenawaran->save();
+
+            // Update the status of the related permohonan to 'spk'
+            $permohonan = Permohonan::find(request()->get('permohonan_id'));
+            if ($permohonan) {
+                $permohonan->status_bayar = request()->get('status_bayar');
+                $permohonan->status       = 'spk';
+                $permohonan->save();
+            }
 
             return redirect()
-                ->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran created successfully.');
+                ->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
         }
 
         /**
@@ -46,17 +86,21 @@
         /**
          * Display the specified resource.
          */
-        public function show(PersetujuanPenawaran $persetujuanPenawaran)
+        public function show($id)
         {
-            return view('lpj::persetujuan_penawaran.show', compact('persetujuanPenawaran'));
+            $permohonan = Permohonan::find($id);
+            $permohonan->status='tender';
+            return $permohonan->save();
         }
 
         /**
          * Show the form for editing the specified resource.
          */
-        public function edit(PersetujuanPenawaran $persetujuanPenawaran)
+        public function edit($id)
         {
-            return view('lpj::persetujuan_penawaran.edit', compact('persetujuanPenawaran'));
+            $permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
+
+            return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
         }
 
         /**
@@ -97,8 +141,7 @@
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
-                    $q
+                    $q->where('nomor_registrasi', 'LIKE', "%$search%");
-                        ->where('nomor_registrasi', 'LIKE', "%$search%");
                 });
             }
 
@@ -125,7 +168,7 @@
             $filteredRecords = $query->count();
 
             // Get the data for the current page
-            $data = $query->with(['debiture','penawaranTender.detail'])->get();
+            $data = $query->with(['debiture', 'penawaranTender.detail', 'penawaranTender.persetujuan'])->get();
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));

app/Http/Requests/PersetujuanPenawaranRequest.php

@@ -1,51 +1,37 @@
 <?php
 
-    namespace Modules\Lpj\app\Http\Requests;
+    namespace Modules\Lpj\Http\Requests;
 
     use Illuminate\Foundation\Http\FormRequest;
 
     class PersetujuanPenawaranRequest extends FormRequest
     {
-        /**
-         * Determine if the user is authorized to make this request.
-         */
         public function authorize()
-        : bool
         {
-            return true; // Adjust this based on your authorization logic
+            return true;
         }
 
-        /**
-         * Get the validation rules that apply to the request.
-         */
-        /**
-         * Get the validation rules that apply to the request.
-         */
         public function rules()
-        : array
         {
             return [
-                'penawaran_id'               => 'required|exists:penawaran_tender,id',
+                'penawaran_id'               => 'nullable|exists:penawaran,id',
                 'nomor_proposal_penawaran'   => 'nullable|string|max:255',
                 'tanggal_proposal_penawaran' => 'nullable|date',
                 'biaya_final'                => 'nullable|numeric|min:0',
                 'sla_resume'                 => 'nullable|date',
                 'sla_final'                  => 'nullable|date|after_or_equal:sla_resume',
-                'catatan'                    => 'nullable|string',
+                'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
-                'attachment'                 => 'nullable|file|mimes:pdf,doc,docx|max:10240', // Max 10MB
+                'surat_representasi'         => 'nullable|file|mimes:pdf,doc,docx|max:10240',
-                'region_id'                  => 'nullable|exists:regions,id',
+                'bukti_bayar'                => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
                 'status'                     => 'nullable|boolean',
-                'authorized_status'          => 'nullable|boolean',
+                'authorized_status'          => 'boolean',
                 'authorized_at'              => 'nullable|date',
                 'authorized_by'              => 'nullable|exists:users,id',
+                'catatan'                    => 'nullable|string',
             ];
         }
 
-        /**
-         * Get custom messages for validator errors.
-         */
         public function messages()
-        : array
         {
             return [
                 'penawaran_id.required'               => 'Penawaran ID wajib diisi.',
@@ -61,9 +47,15 @@
                 'sla_final.required'                  => 'SLA Final wajib diisi.',
                 'sla_final.date'                      => 'SLA Final harus berupa tanggal yang valid.',
                 'sla_final.after_or_equal'            => 'SLA Final harus sama dengan atau setelah SLA Resume.',
-                'attachment.file'                     => 'Attachment harus berupa file.',
+                'file_persetujuan_penawaran.file'     => 'File Persetujuan Penawaran harus berupa file.',
-                'attachment.mimes'                    => 'Attachment harus berupa file PDF, DOC, atau DOCX.',
+                'file_persetujuan_penawaran.mimes'    => 'File Persetujuan Penawaran harus berupa file PDF, DOC, atau DOCX.',
-                'attachment.max'                      => 'Ukuran attachment tidak boleh lebih dari 10MB.',
+                'file_persetujuan_penawaran.max'      => 'Ukuran File Persetujuan Penawaran tidak boleh lebih dari 10MB.',
+                'surat_representasi.file'             => 'Surat Representasi harus berupa file.',
+                'surat_representasi.mimes'            => 'Surat Representasi harus berupa file PDF, DOC, atau DOCX.',
+                'surat_representasi.max'              => 'Ukuran Surat Representasi tidak boleh lebih dari 10MB.',
+                'bukti_bayar.file'                    => 'Bukti Bayar harus berupa file.',
+                'bukti_bayar.mimes'                   => 'Bukti Bayar harus berupa file PDF, JPG, JPEG, atau PNG.',
+                'bukti_bayar.max'                     => 'Ukuran Bukti Bayar tidak boleh lebih dari 10MB.',
                 'region_id.required'                  => 'Region ID wajib diisi.',
                 'region_id.exists'                    => 'Region ID tidak valid.',
                 'status.required'                     => 'Status wajib diisi.',
@@ -71,6 +63,8 @@
                 'authorized_status.boolean'           => 'Status otorisasi harus berupa nilai boolean.',
                 'authorized_at.date'                  => 'Tanggal otorisasi harus berupa tanggal yang valid.',
                 'authorized_by.exists'                => 'ID pengguna yang mengotorisasi tidak valid.',
+                'status_bayar.required'               => 'Status bayar wajib diisi.',
+                'status_bayar.in'                     => 'Status bayar harus berupa "sudah_bayar" atau "belum_bayar".',
             ];
         }
     }

app/Models/PenawaranTender.php

@@ -55,4 +55,8 @@ class PenawaranTender extends Model
     {
         return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
     }
+
+    public function persetujuan(){
+        return $this->belongsTo(PersetujuanPenawaran::class, 'id', 'penawaran_id');
+    }
 }

app/Models/PersetujuanPenawaran.php

@@ -2,9 +2,6 @@
 
     namespace Modules\Lpj\Models;
 
-    use Modules\Lpj\Models\Base;
-    use Modules\Lpj\Models\PenawaranTender;
-    use Modules\Lpj\Models\Region;
     use Modules\Usermanagemenet\Models\User;
 
     class PersetujuanPenawaran extends Base
@@ -19,20 +16,24 @@
             'biaya_final',
             'sla_resume',
             'sla_final',
-            'catatan',
+            'file_persetujuan_penawaran',
-            'attachment',
+            'surat_representasi',
-            'region_id',
+            'bukti_bayar',
             'status',
             'authorized_status',
             'authorized_at',
             'authorized_by',
+            'status',
+            'catatan',
         ];
 
         protected $casts = [
             'tanggal_proposal_penawaran' => 'date',
-            'sla_resume'                 => 'datetime',
+            'sla_resume'                 => 'date',
-            'sla_final'                  => 'datetime',
+            'sla_final'                  => 'date',
+            'biaya_final'                => 'decimal:2',
             'status'                     => 'boolean',
+            'authorized_status'          => 'boolean',
             'authorized_at'              => 'datetime',
         ];
 

database/migrations/2024_11_21_054047_update_persetujuan_penawaran_table.php

@@ -0,0 +1,30 @@
+<?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::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->dropColumn('created_by');
+            $table->dropColumn('updated_by');
+        });
+    }
+};

database/migrations/2024_11_21_113855_update_persetujuan_penawaran_table.php

@@ -0,0 +1,44 @@
+<?php
+
+    use Illuminate\Database\Migrations\Migration;
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Support\Facades\Schema;
+
+    class UpdatePersetujuanPenawaranTable extends Migration
+    {
+        /**
+         * Run the migrations.
+         *
+         * @return void
+         */
+        public function up()
+        {
+            Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+                // Drop the existing attachment column
+                $table->dropForeign(['region_id']);
+                $table->dropColumn('attachment');
+
+                // Add new columns for file attachments
+                $table->string('file_persetujuan_penawaran')->nullable();
+                $table->string('surat_representasi')->nullable();
+                $table->string('bukti_bayar')->nullable();
+            });
+        }
+
+        /**
+         * Reverse the migrations.
+         *
+         * @return void
+         */
+        public function down()
+        {
+            Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+                // Reverse the changes
+                $table->string('attachment')->nullable();
+
+                $table->dropColumn('file_persetujuan_penawaran');
+                $table->dropColumn('surat_representasi');
+                $table->dropColumn('bukti_bayar');
+            });
+        }
+    }

resources/views/persetujuan_penawaran/form.blade.php

@@ -0,0 +1,126 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@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">
+                <div class="card-title flex flex-row gap-1.5">
+                    Persetujuan Penawaran
+                </div>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('persetujuan-penawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                </div>
+            </div>
+            <div class="card-body">
+                <form action="{{ route('persetujuan-penawaran.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
+                    @csrf
+                    <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
+                    <input type="hidden" name="penawaran_id" value="{{ $permohonan->penawaran->id ?? old('penawaran_id') }}">
+                    <input type="hidden" name="nomor_proposal_penawaran" value="{{ $permohonan->penawaran->detail->no_proposal ?? old('nomor_proposal_penawaran') }}">
+                    <input type="hidden" name="tanggal_proposal_penawaran" value="{{ $permohonan->penawaran->detail->tgl_proposal ?? old('tanggal_proposal_penawaran') }}">
+                    <input type="hidden" name="biaya_final" value="{{ $permohonan->penawaran->detail->biaya_penawaran  ?? old('biaya_final') }}">
+
+
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Status Bayar
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
+                                <option value="">Pilih Status Bayar</option>
+                                <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
+                                <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
+                            </select>
+                            @error('status_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">
+                            SLA Resume
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="date" name="sla_resume" id="sla_resume" class="input w-full @error('sla_resume') border-danger bg-danger-light @enderror" value="{{ old('sla_resume', $persetujuanPenawaran->sla_resume ?? '') }}">
+                            @error('sla_resume')
+                            <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">
+                            SLA Final
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="date" name="sla_final" id="sla_final" class="input w-full @error('sla_final') border-danger bg-danger-light @enderror" value="{{ old('sla_final', $persetujuanPenawaran->sla_final ?? '') }}">
+                            @error('sla_final')
+                            <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">
+                            File Persetujuan Penawaran
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran" class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror" accept=".pdf,.doc,.docx">
+                            @error('file_persetujuan_penawaran')
+                            <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">
+                            Surat Representasi
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="file" name="surat_representasi" id="surat_representasi" class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror" accept=".pdf,.doc,.docx">
+                            @error('surat_representasi')
+                            <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 Bayar
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="file" name="bukti_bayar" id="bukti_bayar" class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
+                            @error('bukti_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">
+                            Catatan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <textarea name="catatan" id="catatan" rows="4" class="textarea w-full @error('catatan') border-danger bg-danger-light @enderror" placeholder="Masukkan catatan">{{ old('catatan', $persetujuanPenawaran->catatan ?? '') }}</textarea>
+                            @error('catatan')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+
+                    <div class="flex justify-end">
+                        <button type="submit" class="btn btn-primary">
+                            Proses
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/persetujuan_penawaran/index.blade.php

@@ -49,6 +49,10 @@
                                 <span class="sort"> <span class="sort-label"> Tanggal Proposal </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="dokumen_persetujuan">
+                                <span class="sort"> <span class="sort-label"> Dokumen Persetujuan </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
                             <th class="min-w-[150px]" data-datatable-column="biaya_final">
                                 <span class="sort"> <span class="sort-label"> Biaya Final </span>
                                     <span class="sort-icon"> </span> </span>
@@ -75,6 +79,43 @@
         @endsection
 
         @push('scripts')
+            <script type="text/javascript">
+                function prosesData(data) {
+                    Swal.fire({
+                        title: 'Persetujuan Penawaran',
+                        text: "Apakah Anda yakin ingin menyetujui data penawaran ini?",
+                        icon: 'info',
+                        showCancelButton: true,
+                        confirmButtonColor: '#3085d6',
+                        cancelButtonColor: '#d33',
+                        confirmButtonText: 'Ya',
+                        cancelButtonText: 'Tidak'
+                    }).then((result) => {
+                        if (result.isConfirmed) {
+                            window.location.href = `persetujuan-penawaran/${data}/edit`;
+                        } else if (result.dismiss==='cancel') {
+                            $.ajaxSetup({
+                                headers: {
+                                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                                }
+                            });
+
+                            $.ajax(`persetujuan-penawaran/${data}`, {
+                                type: 'GET',
+                                data: {'status': 'tender'}
+                            }).then((response) => {
+                                swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang', 'success').then(() => {
+                                    window.location.reload();
+                                });
+                            }).catch((error) => {
+                                console.error('Error:', error);
+                                Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                            });
+                        }
+                    })
+                }
+            </script>
+
             <script type="module">
                 const element = document.querySelector('#persetujuan-penawaran-table');
                 const searchInput = document.getElementById('search');
@@ -112,31 +153,65 @@
                         tanggal_proposal_penawaran: {
                             title: 'Tanggal Proposal',
                             render: (item, data) => {
-                                return `${data.penawaran_tender.detail.tgl_proposal}`;
+                                return window.formatTanggalIndonesia(`${data.penawaran_tender.detail.tgl_proposal}`);
                             },
 
                         },
+                        dokumen_persetujuan: {
+                            title: 'Dokumen Persetujuan',
+                            render: (item, data) => {
+                                if (data.penawaran_tender.detail.dokumen_persetujuan) {
+                                    return `<a href="${data.penawaran_tender.detail.dokumen_persetujuan}" download="${data.penawaran_tender.detail.dokumen_persetujuan}" target="_blank" class="badge badge-sm badge-outline">
+                        Download <i class="ki-filled ki-cloud-download"></i>
+                    </a>`;
+                                } else {
+                                    return 'Tidak ada dokumen';
+                                }
+                            },
+                        },
                         biaya_final: {
                             title: 'Biaya Final',
                             render: (item, data) => {
-                                return `${data.penawaran_tender.detail.biaya_penawaran}`;
+                                return window.formatRupiah(`${data.penawaran_tender.detail.biaya_penawaran}`);
                             },
                         },
                         sla_resume: {
                             title: 'SLA Resume',
+                            render: (item, data) => {
+                                if(data.penawaran_tender.persetujuan) {
+                                    if (data.penawaran_tender.persetujuan.sla_resume) {
+                                        return window.formatTanggalIndonesia(`${data.penawaran_tender.persetujuan.sla_resume}`);
+                                    }
+                                }
+                                return '-';
+                            },
                         },
                         sla_final: {
                             title: 'SLA Final',
+                            render: (item, data) => {
+                                if(data.penawaran_tender.persetujuan) {
+                                    if (data.penawaran_tender.persetujuan.sla_final) {
+                                        return window.formatTanggalIndonesia(`${data.penawaran_tender.persetujuan.sla_final}`);
+                                    }
+                                }
+                                return '-';
+                            }
                         },
                         catatan: {
                             title: 'Catatan',
+                            render: (item, data) => {
+                                if(data.penawaran_tender.persetujuan) {
+                                    return data.penawaran_tender.persetujuan.catatan;
+                                }
+                                return '-';
+                            },
                         },
                         actions: {
                             title: 'Action',
                             render: (item, data) => {
                                 return `<div class="flex flex-nowrap justify-center">
-                            <a class="btn btn-sm btn-icon btn-clear btn-warning" href="persetujuan-penawaran/${data.id}/edit">
+                            <a class="btn btn-sm btn-outline btn-info" onclick="prosesData(${data.id})">
-                                <i class="ki-outline ki-pencil"></i>
+                                <i class="ki-filled ki-double-check"></i>
                             </a>
                         </div>`;
                             },