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

app/Exports/LaporanPenilaianJaminanExport.php

@@ -0,0 +1,126 @@
+<?php
+
+    namespace Modules\Lpj\Exports;
+
+    use Maatwebsite\Excel\Concerns\FromCollection;
+    use Maatwebsite\Excel\Concerns\WithHeadings;
+    use Maatwebsite\Excel\Concerns\WithMapping;
+    use Modules\Lpj\Models\Permohonan;
+    use Illuminate\Support\Facades\Auth;
+
+    class LaporanPenilaianJaminanExport implements FromCollection, WithHeadings, WithMapping
+    {
+        protected $request;
+
+        public function __construct($request)
+        {
+            $this->request = $request;
+        }
+
+        public function collection()
+        {
+            $query = Permohonan::query();
+            $query = $query->where('status', 'done');
+
+            // Apply date range filter if provided
+            if ($this->request->has('start_date') || $this->request->has('end_date')) {
+                $query->whereBetween('tanggal_permohonan', [
+                    $this->request->start_date ?? '1900-01-01',
+                    $this->request->end_date ?? now()->toDateString()
+                ]);
+            }
+
+            // Apply branch filter if provided
+            if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                $query->where('branch_id', $this->request->branch_id);
+            }
+
+            // Apply search filter if provided
+            if ($this->request->has('search') && !empty($this->request->search)) {
+                $search = $this->request->search;
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Default ordering
+            $query->orderBy('nomor_registrasi', 'asc');
+
+            return $query->with(['debiture.branch'])->get();
+        }
+
+        public function map($permohonan): array
+        {
+            $luas_tanah = 0;
+            $luas_bangunan = 0;
+            $nilai_tanah = 0;
+            $nilai_bangunan = 0;
+            $npw = 0;
+            $nilai_liquidasi = 0;
+
+            if (isset($permohonan->penilai->lpj)) {
+                $lpj = json_decode($permohonan->penilai->lpj, true);
+                $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+                $luas_tanah = $lpj['luas_tanah'] ?? 0;
+                $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+                $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+                $nilai_bangunan = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+                $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+            }
+
+            return [
+                $permohonan->id,
+                $permohonan->nomor_registrasi,
+                $permohonan->tanggal_permohonan,
+                $permohonan->debiture->branch->name,
+                $permohonan->debiture->name,
+                $permohonan->creator->name,
+                $permohonan->tujuanPenilaian->name,
+                $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                $permohonan->documents->map(function ($document) {
+                    return formatAlamat($document);
+                })->unique()->implode(', '),
+                $luas_tanah . ' m²',
+                formatRupiah($nilai_tanah, 2),
+                $luas_bangunan . ' m²',
+                formatRupiah($nilai_bangunan, 2),
+                '', // tanggal_laporan
+                '', // tanggal_review
+                formatRupiah($npw, 2),
+                formatRupiah($nilai_liquidasi, 2),
+                $permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+            ];
+        }
+
+        public function headings(): array
+        {
+            return [
+                'ID',
+                'Nomor Registrasi',
+                'Tanggal Permohonan',
+                'Cabang',
+                'Nama Debitur',
+                'Pemohon',
+                'Tujuan Penilaian',
+                'Jenis Agunan',
+                'Alamat Agunan',
+                'Luas Tanah',
+                'Nilai Tanah',
+                'Luas Bangunan',
+                'Nilai Bangunan',
+                'Tanggal Laporan',
+                'Tanggal Review',
+                'Nilai Pasar Wajar',
+                'Nilai Likuidasi',
+                'Nama Penilai',
+            ];
+        }
+    }

app/Exports/LaporanPermohonanExport.php

@@ -19,8 +19,7 @@
 
         public function collection()
         {
-            $query = Permohonan::with(['user', 'branch', 'tujuanPenilaian', 'jenisFasilitasKredit', 'jenisPenilaian'])
-                               ->select('permohonan.*');
+            $query = Permohonan::query();
 
             // Apply role-based filtering
             if (!Auth::user()->hasAnyRole(['administrator'])) {

app/Http/Controllers/LaporanAdminKreditController.php

@@ -19,12 +19,7 @@
          */
         public function index()
         {
-            $permohonan = Permohonan::with([
-                'documents.jenisJaminan',
-                'penilaian._user_penilai',
-                'penilai',
-                'documents.detail.jenisLegalitasJaminan'
-            ])->where(['status' => 'done'])->get();
+            $permohonan = Permohonan::where(['status' => 'done'])->get();
             foreach ($permohonan as $_permohonan) {
                 $npw = 0;
                 if (isset($_permohonan->penilai->lpj)) {

app/Http/Controllers/LaporanPenilaianJaminanController.php

@@ -0,0 +1,155 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Modules\Lpj\Exports\LaporanPenilaianJaminanExport;
+    use Modules\Lpj\Models\Permohonan;
+    use Maatwebsite\Excel\Facades\Excel;
+
+    class LaporanPenilaianJaminanController extends Controller
+    {
+        public $user;
+
+        /**
+         * Display a listing of the resource.
+         */
+        public function index()
+        {
+            return view('lpj::laporan_penilaian_jaminan.index');
+        }
+
+        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 = Permohonan::query();
+            $query = $query->where('status', 'done');
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = json_decode($request->get('search'));
+
+                if (isset($search->start_date) || isset($search->end_date)) {
+                    $query->whereBetween('tanggal_permohonan', [
+                        $search->start_date ?? '1900-01-01',
+                        $search->end_date ?? now()->toDateString()
+                    ]);
+                }
+
+                // Filter by branch if provided
+                if (isset($search->branch_id) && !empty($search->branch_id)) {
+                    $query->where('branch_id', $search->branch_id);
+                }
+
+                if (isset($search->search)) {
+
+                    $query->where(function ($q) use ($search) {
+                        $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('status', 'LIKE', '%' . $search->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(['debiture.branch'])->get();
+
+            $data = $data->map(function ($permohonan) {
+                $luas_tanah    = 0;
+                $luas_bangunan = 0;
+                $nilai_tanah     = 0;
+                $nilai_bangunan  = 0;
+                $npw = 0;
+                $nilai_liquidasi = 0;
+                if (isset($permohonan->penilai->lpj)) {
+                    $lpj = json_decode($permohonan->penilai->lpj, true);
+                    $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+                    $luas_tanah    = $lpj['luas_tanah'] ?? 0;
+                    $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+                    // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
+                    $nilai_tanah     = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+
+                    $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+                    $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+                }
+
+                return [
+                    'id'                => $permohonan->id,
+                    'nomor_registrasi'  => $permohonan->nomor_registrasi,
+                    'tanggal_permohonan' => $permohonan->tanggal_permohonan,
+                    'branch'            => $permohonan->debiture->branch->name,
+                    'name'              => $permohonan->debiture->name,
+                    'pemohon'           => $permohonan->creator->name,
+                    'tujuan_penilaian'  => $permohonan->tujuanPenilaian->name,
+                    'jenis_agunan'      => $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                    'alamat_agunan'     => $permohonan->documents->map(function ($document) {
+                        return formatAlamat($document);
+                    })->unique()->implode(', '),
+                    'luas_tanah'        => $luas_tanah . ' m²',
+                    'nilai_tanah'       => formatRupiah($nilai_tanah,2),
+                    'luas_bangunan'     => $luas_bangunan . ' m²',
+                    'nilai_bangunan'    => formatRupiah($nilai_bangunan,2),
+                    'tanggal_laporan'   => '',
+                    'tanggal_review'    => '',
+                    'nilai_pasar_wajar' => formatRupiah($npw,2),
+                    'nilai_likuidasi'   => formatRupiah($nilai_liquidasi,2),
+                    'nama_penilai'      => $permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+                ];
+            });
+
+            // 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(Request $request)
+        {
+            return Excel::download(new LaporanPenilaianJaminanExport($request), 'laporan_penilaian_jaminan.xlsx');
+        }
+    }

app/Http/Controllers/PermohonanController.php

@@ -65,10 +65,6 @@ class PermohonanController extends Controller
                 // Save to database
                 $permohonan = Permohonan::create($validate);
 
-                $user_ = User::find($permohonan->created_by);
-                $user_->notify(new PermohonanNotif($permohonan));
-
-
                 // Create history
                 $this->historyService->createHistory(
                     $permohonan,

app/Notifications/PermohonanNotif.php

@@ -1,50 +1,58 @@
 <?php
 
-namespace Modules\Lpj\Notifications;
+	namespace Modules\Lpj\Notifications;
 
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
+	use Illuminate\Bus\Queueable;
+	use Illuminate\Contracts\Queue\ShouldQueue;
+	use Illuminate\Notifications\Messages\MailMessage;
+	use Illuminate\Notifications\Notification;
 
-class PermohonanNotif extends Notification
-{
-    use Queueable;
-    protected $permohonan;
-    /**
-     * Create a new notification instance.
-     */
-    public function __construct($permohonan)
-    {
-        $this->permohonan = $permohonan;
-    }
+	class PermohonanNotif extends Notification
+	{
+		use Queueable;
 
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        return ['mail','database'];
-    }
+		protected $permohonan;
+		protected $message;
 
-    /**
-     * Get the mail representation of the notification.
-     */
-    public function toMail($notifiable): MailMessage
-    {
-        return (new MailMessage)
-            ->line('The introduction to the notification.')
-            ->action('Notification Action', 'https://laravel.com')
-            ->line('Thank you for using our application!');
-    }
+		/**
+		 * Create a new notification instance.
+		 */
+		public function __construct($permohonan, $message)
+		{
+			$this->permohonan = $permohonan;
+			$this->message    = $message;
+		}
 
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        return [
-            'data' => $this->permohonan,
-        ];
-    }
-}
+		/**
+		 * Get the notification's delivery channels.
+		 */
+		public function via($notifiable)
+		: array
+		{
+			return ['mail', 'database'];
+		}
+
+		/**
+		 * Get the mail representation of the notification.
+		 */
+		public function toMail($notifiable)
+		: MailMessage
+		{
+			return (new MailMessage)
+				->line('The introduction to the notification.')
+				->action('Notification Action', 'https://laravel.com')
+				->line('Thank you for using our application!');
+		}
+
+		/**
+		 * Get the array representation of the notification.
+		 */
+		public function toArray($notifiable)
+		: array
+		{
+			return [
+				'data'    => $this->permohonan,
+				'message' => $this->message,
+			];
+		}
+	}

app/Services/PermohonanHistoryService.php

@@ -4,6 +4,8 @@ namespace Modules\Lpj\Services;
 
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\PermohonanHistory;
+use Modules\Lpj\Notifications\PermohonanNotif;
+use Modules\Usermanagement\Models\User;
 
 class PermohonanHistoryService
 {
@@ -21,6 +23,8 @@ class PermohonanHistoryService
                 'user_id' => auth()->id(),
             ]);
 
+            $this->createNotification($permohonan, $status, $beforeRequest, $afterRequest);
+
         } catch (\Exception $e) {
             // Log the error
             \Log::error('Error creating PermohonanHistory: ' . $e->getMessage());
@@ -34,4 +38,25 @@ class PermohonanHistoryService
             throw new \Exception('Failed to create PermohonanHistory: ' . $e->getMessage());
         }
     }
+
+    private function createNotification(Permohonan $permohonan, string $status, array $beforeRequest, array $afterRequest)
+    {
+        $beforeStatus = '';
+        if(!empty($beforeRequest)){
+            $beforeStatus = $beforeRequest['status'] ?? '';
+        }
+
+        if($beforeStatus !== $status){
+            if($status === 'order'){
+                $users = User::where(['branch_id' => $permohonan->branch_id])->whereHas('roles',function($q){
+                    $q->where('name', 'pemohon-eo');
+                })->get();
+
+                foreach ($users as $user) {
+                    $message = "telah diorder oleh {$permohonan->creator->name}, Mohon Lakukan konfirmasi";
+                    $user->notify(new PermohonanNotif($permohonan,$message));
+                }
+            }
+        }
+    }
 }