Merge branch 'staging' into feature/senior-officer

app/Models/KJPP.php

@@ -2,9 +2,10 @@
 
 namespace Modules\Lpj\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Location\Models\Province;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\KJPPFactory;
 
@@ -19,4 +20,9 @@ class KJPP extends Model
      * The attributes that are mass assignable.
      */
     protected $guarded = ['id'];
+
+    public function PenawaranDetailTender(): HasMany
+    {
+        return $this->hasMany(PenawaranDetailTender::class, 'kjpp_rekanan_id', 'id');
+    }
 }

app/Models/PenawaranDetailTender.php

@@ -27,4 +27,9 @@ class PenawaranDetailTender extends Model
     {
         return $this->belongsTo(KJPP::class, 'kjpp_rekanan_id', 'id');
     }
+
+    public function emailTenderLog(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranEmailTenderLog::class, 'penawaran_id', 'id', PenawaranTender::class);
+    }
 }

app/Models/PenawaranEmailTenderLog.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\PenawaranEmailTenderLogFactory;
+
+class PenawaranEmailTenderLog extends Model
+{
+    use HasFactory;
+
+    protected $table = 'penawaran_email_tender_log';
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $guarded = ['id'];
+}

app/Models/Permohonan.php

@@ -1,150 +1,156 @@
 <?php
 
-namespace Modules\Lpj\Models;
+    namespace Modules\Lpj\Models;
 
-use Illuminate\Support\Facades\Storage;
-use Modules\Lpj\Database\Factories\PermohonanFactory;
-use Modules\Lpj\Services\PermohonanHistoryService;
-use Modules\Usermanagement\Models\User;
+    use Illuminate\Support\Facades\Storage;
+    use Modules\Lpj\Database\Factories\PermohonanFactory;
+    use Modules\Lpj\Services\PermohonanHistoryService;
+    use Modules\Usermanagement\Models\User;
 
-class Permohonan extends Base
-{
-    protected $table    = 'permohonan';
-    protected $fillable = [
-        'nomor_registrasi',
-        'tanggal_permohonan',
-        'user_id',
-        'branch_id',
-        'tujuan_penilaian_id',
-        'debiture_id',
-        'keterangan',
-        'dokumen',
-        'jenis_fasilitas_kredit_id',
-        'nilai_plafond_id',
-        'status',
-        'authorized_at',
-        'authorized_status',
-        'authorized_by',
-        // andy add
-        'registrasi_catatan',
-        'registrasi_by',
-        'registrasi_at',
-        'jenis_penilaian_id',
-        'region_id',
-        // andy add
-        'status_bayar',
-        'nilai_njop',
-        // andy add
-        'registrasi_catatan',
-        'registrasi_by',
-        'registrasi_at',
-        'jenis_penilaian_id',
-        'region_id',
-    ];
-
-    protected static function boot()
+    class Permohonan extends Base
     {
-        parent::boot();
+        protected $table    = 'permohonan';
+        protected $fillable = [
+            'nomor_registrasi',
+            'tanggal_permohonan',
+            'user_id',
+            'branch_id',
+            'tujuan_penilaian_id',
+            'debiture_id',
+            'keterangan',
+            'dokumen',
+            'jenis_fasilitas_kredit_id',
+            'nilai_plafond_id',
+            'status',
+            'authorized_at',
+            'authorized_status',
+            'authorized_by',
+            // andy add
+            'registrasi_catatan',
+            'registrasi_by',
+            'registrasi_at',
+            'jenis_penilaian_id',
+            'region_id',
+            // andy add
+            'status_bayar',
+            'nilai_njop',
+            // andy add
+            'registrasi_catatan',
+            'registrasi_by',
+            'registrasi_at',
+            'jenis_penilaian_id',
+            'region_id',
+        ];
 
-        static::creating(function ($permohonan) {
-            static::handleFileUpload($permohonan);
-        });
+        protected static function boot()
+        {
+            parent::boot();
 
-        static::updating(function ($permohonan) {
-            static::handleFileUpload($permohonan);
-        });
+            static::creating(function ($permohonan) {
+                static::handleFileUpload($permohonan);
+            });
 
-        static::created(function ($permohonan) {
-            static::createHistory($permohonan, 'created');
-        });
+            static::updating(function ($permohonan) {
+                static::handleFileUpload($permohonan);
+            });
 
-        static::updated(function ($permohonan) {
-            static::createHistory($permohonan, 'updated');
-        });
-    }
+            static::created(function ($permohonan) {
+                static::createHistory($permohonan, 'created');
+            });
 
-    protected static function handleFileUpload($permohonan)
-    {
-        if (request()->hasFile('attachment')) {
-            $file = request()->file('attachment');
-            $fileName = time() . '_' . $file->getClientOriginalName();
-            $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+            static::updated(function ($permohonan) {
+                static::createHistory($permohonan, 'updated');
+            });
+        }
 
-            $permohonan->dokumen = $filePath;
+        protected static function handleFileUpload($permohonan)
+        {
+            if (request()->hasFile('attachment')) {
+                $file     = request()->file('attachment');
+                $fileName = time() . '_' . $file->getClientOriginalName();
+                $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+
+                $permohonan->dokumen = $filePath;
+            }
+        }
+
+        protected static function createHistory($permohonan, $action)
+        {
+            $historyService = app(PermohonanHistoryService::class);
+
+            $status        = $permohonan->status;
+            $keterangan    = request()->input('keterangan'); // Get keterangan from request
+            $beforeRequest = $action === 'updated' ? $permohonan->getOriginal() : [];
+            $afterRequest  = $permohonan->toArray();
+            $file          = $permohonan->dokumen ?? null;
+
+            $historyService->createHistory(
+                $permohonan,
+                $status,
+                $keterangan,
+                $beforeRequest,
+                $afterRequest,
+                $file,
+            );
+        }
+
+        public function user()
+        {
+            return $this->belongsTo(User::class);
+        }
+
+        public function branch()
+        {
+            return $this->belongsTo(Branch::class);
+        }
+
+        public function tujuanPenilaian()
+        {
+            return $this->belongsTo(TujuanPenilaian::class);
+        }
+
+        public function debiture()
+        {
+            return $this->belongsTo(Debiture::class);
+        }
+
+        public function documents()
+        {
+            return $this->hasMany(DokumenJaminan::class);
+        }
+
+        public function nilaiPlafond()
+        {
+            return $this->belongsTo(NilaiPlafond::class);
+        }
+
+        public function jenisFasilitasKredit()
+        {
+            return $this->belongsTo(JenisFasilitasKredit::class);
+        }
+
+        public function penilaian()
+        {
+            return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
+        }
+
+        public function penawaranTender()
+        {
+            return $this->hasMany(PenawaranTender::class, 'nomor_registrasi');
+        }
+
+        public function region()
+        {
+            return $this->belongsTo(Regions::class, 'region_id');
+        }
+
+        public function penawaran()
+        {
+            return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
+        }
+
+        public function histories()
+        {
+            return $this->hasMany(PermohonanHistory::class, 'permohonan_id', 'id')->orderBy('created_at', 'desc');
         }
     }
-
-    protected static function createHistory($permohonan, $action)
-    {
-        $historyService = app(PermohonanHistoryService::class);
-
-        $status = $permohonan->status;
-        $keterangan = request()->input('keterangan'); // Get keterangan from request
-        $beforeRequest = $action === 'updated' ? $permohonan->getOriginal() : [];
-        $afterRequest = $permohonan->toArray();
-        $file = $permohonan->dokumen ? Storage::disk('public')->path($permohonan->dokumen) : null;
-
-        $historyService->createHistory(
-            $permohonan,
-            $status,
-            $keterangan,
-            $beforeRequest,
-            $afterRequest,
-            $file
-        );
-    }
-
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    public function branch()
-    {
-        return $this->belongsTo(Branch::class);
-    }
-
-    public function tujuanPenilaian()
-    {
-        return $this->belongsTo(TujuanPenilaian::class);
-    }
-
-    public function debiture()
-    {
-        return $this->belongsTo(Debiture::class);
-    }
-
-    public function documents()
-    {
-        return $this->hasMany(DokumenJaminan::class);
-    }
-
-    public function nilaiPlafond()
-    {
-        return $this->belongsTo(NilaiPlafond::class);
-    }
-
-    public function jenisFasilitasKredit()
-    {
-        return $this->belongsTo(JenisFasilitasKredit::class);
-    }
-
-    public function penilaian()
-    {
-        return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
-    }
-
-    public function penawaranTender()
-    {
-        return $this->hasMany(PenawaranTender::class, 'nomor_registrasi');
-    }
-
-    public function region()
-    {
-        return $this->belongsTo(Regions::class,  'region_id');
-    }
-
-    public function penawaran(){
-        return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
-    }
-}

app/Models/PermohonanHistory.php

@@ -4,6 +4,8 @@ namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Usermanagement\Models\User;
+
 // use Modules\Lpj\Database\Factories\PermohonanHistoryFactory;
 
 class PermohonanHistory extends Base