Merge branches 'feature/senior-officer' and 'staging' of https://git.putrakuningan.com/daengdeni/lpj into staging

app/Http/Controllers/LaporanAdminKreditController.php

@@ -0,0 +1,137 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Modules\Lpj\Exports\LaporanAdminKreditExport;
+    use Modules\Lpj\Models\LaporanAdminKredit;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Models\Permohonan;
+
+    class LaporanAdminKreditController extends Controller
+    {
+        public $user;
+
+        /**
+         * Display a listing of the resource.
+         */
+        public function index()
+        {
+            $permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->where(['status'=>'done'])->get();
+            foreach($permohonan as $_permohonan){
+                if(isset($_permohonan->penilai->lpj)){
+                    $npw = json_decode($_permohonan->penilai->lpj, true);
+                    $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
+                }
+
+                $dataAdk = [
+                    'jenis_agunan'      => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                    'alamat_agunan'     => $_permohonan->documents->map(function ($document) {
+                        return formatAlamat($document);
+                    })->unique()->implode(', '),
+                    'nama_pemilik'      => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+                    'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
+                    'nama_penilai'      => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+                    'nilai_likuidasi'   => $_permohonan->nilai_liquidasi,
+                    'nilai_pasar_wajar' => str_replace('.', '', $npw),
+                    'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
+                        return $document->detail->map(function ($detail) {
+                            return $detail->jenisLegalitasJaminan->name ?? null;
+                        });
+                    })->filter()->unique()->implode(', '),
+                ];
+
+                LaporanAdminKredit::updateOrCreate([
+                    'debiture_id' => $_permohonan->debiture_id,
+                ],$dataAdk);
+            }
+
+
+            $laporans = LaporanAdminKredit::with('debiture')->paginate(10);
+            return view('lpj::laporan_admin_kredit.index', compact('laporans'));
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('laporan-admin-kredit.view')) {
+                //abort(403, 'Sorry! You are not allowed to view laporan admin kredit.');
+            }
+
+            // Retrieve data from the database
+            $query = LaporanAdminKredit::query();
+
+            if ($request->has('tanggal_awal') && $request->has('tanggal_akhir')) {
+                $query->whereBetween('tanggal_kunjungan', [$request->tanggal_awal, $request->tanggal_akhir]);
+            }
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $search_ = json_decode($search);
+
+                if (isset($search_->search)) {
+                    $query->where(function ($q) use ($search_) {
+                        $q->where('kode_register_t24', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhere('jenis_agunan', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhere('nama_pemilik', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhereHas('debiture', function ($query) use ($search_) {
+                              $query->where('name', 'LIKE', '%' . $search_->search . '%');
+                          });
+                    });
+                }
+
+                if (isset($search_->tanggal_awal) && isset($search_->tanggal_akhir)) {
+                    $query->whereBetween('tanggal_kunjungan', [$search_->tanggal_awal, $search_->tanggal_akhir]);
+                }
+            }
+
+            // 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(['debiture.branch'])->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,
+            ]);
+        }
+
+        public function export()
+        {
+            return Excel::download(new LaporanAdminKreditExport, 'laporan_admin_kredit.xlsx');
+        }
+    }

app/Http/Controllers/PembatalanController.php

@@ -61,12 +61,18 @@
                 // Update Permohonan Pembatalan
                 if($request->status=='approved'){
                     $pembatalan->status = 'approved';
+                    $pembatalan->authorized_at = now();
+                    $pembatalan->authorized_by = auth()->user()->id;
+                    $pembatalan->authorized_status = 1;
                     $pembatalan->save();
 
                     $permohonan->status = 'batal';
                     $permohonan->save();
                 } else{
                     $pembatalan->status = 'rejected';
+                    $pembatalan->authorized_at = now();
+                    $pembatalan->authorized_by = auth()->user()->id;
+                    $pembatalan->authorized_status = 3;
                     $pembatalan->save();
                 }
 

app/Http/Controllers/PenilaianController.php

@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\DB;
 use Modules\Lpj\Http\Requests\PenilaianRequest;
 use Modules\Lpj\Models\Authorization;
 use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\LaporanAdminKredit;
 use Modules\Lpj\Models\Penilaian;
 use Modules\Lpj\Models\PenilaianTeam;
 use Modules\Lpj\Models\Permohonan;
@@ -473,6 +474,7 @@ class PenilaianController extends Controller
         } else {
             $permohonan = Permohonan::find($id);
         }
+
         if (!$permohonan) {
             return response()->json([
                 'message' => 'Data permohonan tidak ditemukan.',
@@ -512,6 +514,35 @@ class PenilaianController extends Controller
                     $status = 'done';
                 }
 
+                if($status=='done'){
+                    $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
+
+                    if(isset($_permohonan->penilai->lpj)){
+                        $npw = json_decode($_permohonan->penilai->lpj, true);
+                        $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
+                    }
+
+                    $dataAdk = [
+                        'debiture_id'       => $_permohonan->debiture_id,
+                        'jenis_agunan'      => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                        'alamat_agunan'     => $_permohonan->documents->map(function ($document) {
+                            return formatAlamat($document);
+                        })->unique()->implode(', '),
+                        'nama_pemilik'      => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+                        'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
+                        'nama_penilai'      => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+                        'nilai_likuidasi'   => $_permohonan->nilai_liquidasi,
+                        'nilai_pasar_wajar' => str_replace('.', '', $npw),
+                        'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
+                            return $document->detail->map(function ($detail) {
+                                return $detail->jenisLegalitasJaminan->name ?? null;
+                            });
+                        })->filter()->unique()->implode(', '),
+
+                    ];
+                    LaporanAdminKredit::create($dataAdk);
+                }
+
                 if ($approvalField) {
                     $this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
                 }