"Tambah fitur approval pembayaran dan pembaruan konvensi data"

- Implementasi fitur approval untuk pembayaran dengan tampilan antarmuka baru.
- Penyesuaian teks konfirmasi pada proses persetujuan pembayaran.
- Penambahan relasi `approveBayar` pada model `Permohonan`.
- Perbaikan logika status pada proses pembaruan permohonan dan penawaran.
- Penyesuaian data output pada JSON respons untuk otorisasi pembayaran.

app/Http/Controllers/NocController.php

@@ -43,7 +43,6 @@
                 $status = "persetujuan-penawaran";
             }
 
-
             $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
                 ['penawaran_id' => $validated['penawaran_id']],
                 $validated,
@@ -64,16 +63,20 @@
             $permohonan = Permohonan::find(request()->get('permohonan_id'));
             if ($permohonan) {
                 $permohonan->status_bayar = request()->get('status_bayar');
-                $permohonan->status       = $status;
+                if($permohonan->jenis_penilaian_id==2) {
+                    $permohonan->status = $status;
+                }
                 $permohonan->save();
 
                 // andy add, update status penawaran.status='spk'
                 // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
-                PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
+                if($permohonan->jenis_penilaian_id==2) {
-                    'status'     => $status,
+                    PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
-                    'updated_by' => Auth::id(),
+                        'status'     => $status,
-                    'updated_at' => now(),
+                        'updated_by' => Auth::id(),
-                ]);
+                        'updated_at' => now(),
+                    ]);
+                }
                 // andy add, update status penawaran.status='spk'
             }
 
@@ -114,7 +117,7 @@
         public function edit($id)
         {
             $persetujuanPenawaran = PersetujuanPenawaran::where('id', $id)->with(
-                ['penawaran.detail', 'penawaran.permohonan.debiture'],
+                ['penawaran.detail', 'penawaran.permohonan.debiture','permohonan'],
             )->first();
             return view('lpj::noc.form', compact('persetujuanPenawaran'));
         }

app/Http/Controllers/PembayaranController.php

@@ -27,9 +27,83 @@
             return view('lpj::pembayaran.index');
         }
 
-        public function approval() {}
+        public function approval() {
+            return view('lpj::pembayaran.approval');
+        }
 
-        public function dataApprovalForDatatables(Request $request) {}
+        public function dataApprovalForDatatables(Request $request) {
+            if (is_null($this->user) || !$this->user->can('noc.view')) {
+                //abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
+            }
+
+            // Retrieve data from the database
+            $query = PersetujuanPenawaran::query();
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', "%$search%");
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query
+                ->with(
+                    [
+                        'penawaran.permohonan.user',
+                        'penawaran.permohonan.debiture',
+                        'penawaran.permohonan.branch',
+                        'permohonan.debiture',
+                        'permohonan.branch',
+                        'permohonan.user',
+                        'permohonan.approveBayar',
+                        'penawaran.permohonan.approveBayar',
+                        'penawaran.detail',
+                        'penawaran.persetujuan',
+                    ],
+                )->get();
+
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = $request->get('page', 1);
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
 
         function edit($id)
         {
@@ -66,7 +140,6 @@
             $permohonan = Permohonan::find(request()->get('permohonan_id'));
             if ($permohonan) {
                 $permohonan->status_bayar = request()->get('status_bayar');
-                $permohonan->status       = 'noc';
                 $permohonan->save();
 
                 // andy add, update status penawaran.status='spk'
@@ -88,32 +161,32 @@
         : JsonResponse {
             // init
             $data     = [];
-            $dataku   = [];
+            $output   = [];
             $tindakan = null;
             if (request()->ajax()) {
                 try {
-                    $dataku = [
+                    $data = [
                         'approve_bayar_by' => Auth::id(),
                         'approve_bayar_at' => now(),
                     ];
 
                     if ($request->keterangan) {
-                        $dataku['approve_keterangan_bayar'] = $request->keterangan;
+                        $data['approve_keterangan_bayar'] = $request->keterangan;
                     }
 
-                    $data['dataku'] = $dataku;
+                    $output['data'] = $data;
 
                     $modal = Permohonan::find($id);
-                    $modal->update($dataku);
+                    $modal->update($data);
                     //
-                    $data['status']  = 'success';
+                    $output['status']  = 'success';
-                    $data['message'] = ['Otorisasi' . $modal->nomor_registrasi . 'berhasil di lakukan'];
+                    $output['message'] = ['Otorisasi' . $modal->nomor_registrasi . 'berhasil di lakukan'];
                 } catch (Exception $e) {
-                    $data['status']  = 'error';
+                    $output['status']  = 'error';
-                    $data['message'] = ['Otorisasi gagal di lakukan.'];
+                    $output['message'] = ['Otorisasi gagal di lakukan.'];
                 }
             }
-            return response()->json($data);
+            return response()->json($output);
         }
 
         public function dataForDatatables(Request $request)

app/Models/Permohonan.php

@@ -170,4 +170,8 @@
         public function pembatalan(){
             return $this->hasMany(PermohonanPembatalan::class);
         }
+
+        public function approveBayar(){
+            return $this->belongsTo(User::class, 'approve_bayar_by', 'id');
+        }
     }

resources/views/noc/form.blade.php

@@ -19,7 +19,7 @@
                 <form action="{{ route('noc.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
                     @csrf
                     <input type="hidden" name="penawaran_id" value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
-                    <input type="hidden" name="permohonan_id" value="{{ $persetujuanPenawaran->penawaran->permohonan->id ?? old('permohonan_id') }}">
+                    <input type="hidden" name="permohonan_id" value="{{ $persetujuanPenawaran->penawaran->permohonan->id ?? $persetujuanPenawaran->permohonan->id }}">
 
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">

resources/views/noc/index.blade.php

@@ -88,7 +88,7 @@
                 function prosesData(data) {
                     Swal.fire({
                         title: 'NOC',
-                        text: "Apakah Anda yakin ingin menyetujui data penawaran ini?",
+                        text: "Apakah Anda yakin ingin menyetujui pembayaran ini?",
                         icon: 'info',
                         showCancelButton: true,
                         confirmButtonColor: '#3085d6',

resources/views/pembayaran/approval.blade.php

@@ -0,0 +1,331 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('pembayaran.approval') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false"
+             id="pembayaran-table" data-api-url="{{ route('pembayaran.approval.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Pembayaran
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Pembayaran" id="search" type="text" value="">
+                        </label>
+                    </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="#"> Export to Excel </a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                           data-datatable-table="true">
+                        <thead>
+                        <tr>
+                            <th class="w-14">
+                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="user_id">
+                                <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                <span class="sort"> <span class="sort-label"> Debitur </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px] text-center" data-datatable-column="tujuan_penilaian_id">
+                                <span class="sort"> <span class="sort-label"> Status Bayar </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_setor">
+                                <span class="sort"> <span class="sort-label"> Tanggal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="nominal_bayar">
+                                <span class="sort"> <span class="sort-label"> Nominal bayar </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="bukti_ksl">
+                                <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_penyelesaian">
+                                <span class="sort"> <span class="sort-label"> Tanggal Penyelesaian </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="approval_by">
+                                <span class="sort"> <span class="sort-label"> Approval By </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                        </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div
+                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
+                        page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript">
+        function pembayaranOtorisator(id) {
+            // alert('hai id = ' + id);
+            Swal.fire({
+                title: 'Apakah Anda yakin?',
+                text: `Untuk melakukan approve Pembayaran!`,
+                icon: 'warning',
+                input: 'textarea', // Menambahkan input textarea
+                inputLabel: 'Keterangan',
+                inputPlaceholder: 'Masukkan keterangan...',
+                inputAttributes: {
+                    'aria-label': 'Masukkan keterangan'
+                },
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Ya, Lanjutkan!',
+                cancelButtonText: 'Lain kali',
+            }).then((result) => {
+                if (result.isConfirmed) {
+
+                    let useURL = "{{ URL::to('pembayaran') }}" + "/" + id;
+                    const keterangan = result.value || ''; // Ambil pesan dari textarea
+
+                    var input_data = new Object();
+                    input_data._method = 'PUT';
+                    input_data.id = id;
+                    input_data.keterangan = keterangan;
+
+                    $.ajaxSetup({
+                        headers: {
+                            'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                        },
+                    });
+                    $.ajax({
+                        url: useURL,
+                        type: 'PUT',
+                        data: input_data,
+                        dataType: "json",
+                        success: (response) => {
+                            if ('success' == response.status) {
+                                Swal.fire('Berhasil!', response.message, 'success').then(() => {
+                                    window.location.reload();
+                                });
+                            } else if ('error' == response.status) {
+                                Swal.fire('Error!', response.message, 'error').then(() => {
+                                    window.location.reload();
+                                });
+                            }
+
+                            console.log(response);
+                        },
+                        error: (error) => {
+                            console.error('Error:', error);
+                            Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
+                                'error');
+                        }
+                    });
+                }
+            });
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#pembayaran-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                nomor_registrasi: {
+                    title: 'Nomor Registrasi',
+                    render: (item, data) => {
+                        if (data.permohonan) {
+                            return `${data.permohonan.nomor_registrasi}`;
+                        }
+                        return `${data.penawaran.permohonan.nomor_registrasi}`;
+                    },
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan',
+                    render: (item, data) => {
+                        if (data.permohonan) {
+                            return `${data.permohonan.tanggal_permohonan}`;
+                        }
+                        return `${data.penawaran.permohonan.tanggal_permohonan}`;
+                    },
+                },
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => {
+                        if (data.permohonan) {
+                            return `${data.permohonan.user.name}`;
+                        }
+                        return `${data.penawaran.permohonan.user.name}`;
+                    },
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => {
+                        if (data.permohonan) {
+                            return `${data.permohonan.branch.name}`;
+                        }
+                        return `${data.penawaran.permohonan.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        if (data.permohonan) {
+                            return `${data.permohonan.debiture.name}`;
+                        }
+                        return `${data.penawaran.permohonan.debiture.name}`;
+                    },
+                },
+                status_bayar: {
+                    title: 'Status Bayar',
+                    render: (item, data) => {
+                        if(data.permohonan){
+                            var permohonan = data.permohonan;
+                        } else {
+                            var permohonan = data.penawaran.permohonan;
+                        }
+
+                        const status = permohonan.status_bayar.replace(/_/g,
+                            ' ');
+                        const statusClass = permohonan.status_bayar === 'belum_bayar' ? 'text-red-600' :
+                            'text-green-600';
+                        return `<span class="text-md font-bold ${statusClass} uppercase">
+                            ${status}
+                            </span>`;
+                    },
+                },
+                tanggal_setor: {
+                    title: 'Tanggal Setor',
+                    render: (item, data) => {
+                        return `${window.formatTanggalIndonesia(data.created_at)}`;
+                    },
+                },
+                nominal_bayar: {
+                    title: 'Nominal Bayar',
+                    render: (item, data) => {
+                        return `${window.formatRupiah(data.nominal_bayar)}`;
+                    },
+                },
+                bukti_ksl: {
+                    title: 'Bukti KSL',
+                    render: (item, data) => {
+                        if (data.bukti_ksl) {
+                            return `<a href="storage/${data.bukti_ksl}" download="storage/${data.bukti_ksl}" target="_blank" class="badge badge-sm badge-outline">
+                        Download <i class="ki-filled ki-cloud-download"></i>
+                    </a>`;
+                        } else {
+                            return '-';
+                        }
+                    },
+                },
+                tanggal_penyelesaian: {
+                    title: 'Tanggal Penyelesaian',
+                    render: (item, data) => {
+                        if(data.status==1) {
+                            return `${window.formatTanggalIndonesia(data.updated_at)}`;
+                        }
+                        return "-";
+                    },
+                },
+                approve_bayar_by: {
+                    title: 'Status Approve',
+                    render: (item, data) => {
+                        if(data.permohonan){
+                            var permohonan = data.permohonan;
+                        } else {
+                            var permohonan = data.penawaran.permohonan;
+                        }
+
+                        if(permohonan.approve_bayar_by) {
+                            return `${permohonan.approve_bayar.name}`;
+                        }
+
+                        return "Menunggu Approval";
+                    },
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        var iconPembayaranOtorisator = '';
+                        if (!data.approve_bayar_by) {
+                            iconPembayaranOtorisator = `<a class="btn btn-sm btn-icon btn-clear btn-primary " onclick="pembayaranOtorisator(${data.id})">
+                                <i class="ki-filled ki-double-check"></i>
+                            </a>`;
+                        }
+
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-warning " href="#">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>`
+                            + iconPembayaranOtorisator + `
+                            </div>`;
+
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush
+

routes/breadcrumbs_registrasi.php

@@ -113,4 +113,9 @@ Breadcrumbs::for('pembayaran', function (BreadcrumbTrail $trail) {
         $trail->parent('pembayaran');
         $trail->push('Lakukan Pembayaran');
     });
+
+    Breadcrumbs::for('pembayaran.approval', function (BreadcrumbTrail $trail) {
+        $trail->parent('pembayaran');
+        $trail->push('Approval Pembayaran');
+    });
 // pembayaran