From 43caa255a1f3676abb6b7c5f3a601fef3ce7c91a Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 21 Nov 2024 13:00:28 +0700 Subject: [PATCH] Refactor Models PersetujuanPenawaran dan PenawaranTender Menghapus beberapa use statements yang tidak digunakan lagi di PersetujuanPenawaran.php. Menambahkan fields baru dan memperbarui tipe casting pada beberapa fields yang sudah ada. Mengoreksi relasi belongsTo pada PenawaranTender.php agar sesuai dengan parameter yang benar. --- app/Models/PenawaranTender.php | 2 +- app/Models/PersetujuanPenawaran.php | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Models/PenawaranTender.php b/app/Models/PenawaranTender.php index b27e251..1c2832c 100644 --- a/app/Models/PenawaranTender.php +++ b/app/Models/PenawaranTender.php @@ -57,6 +57,6 @@ class PenawaranTender extends Model } public function persetujuan(){ - return $this->belongsTo(PersetujuanPenawaran::class, 'penawaran_id', 'id'); + return $this->belongsTo(PersetujuanPenawaran::class, 'id', 'penawaran_id'); } } diff --git a/app/Models/PersetujuanPenawaran.php b/app/Models/PersetujuanPenawaran.php index d0658a6..15176de 100644 --- a/app/Models/PersetujuanPenawaran.php +++ b/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', - 'attachment', - 'region_id', + 'file_persetujuan_penawaran', + 'surat_representasi', + 'bukti_bayar', 'status', 'authorized_status', 'authorized_at', 'authorized_by', + 'status', + 'catatan', ]; protected $casts = [ 'tanggal_proposal_penawaran' => 'date', - 'sla_resume' => 'datetime', - 'sla_final' => 'datetime', + 'sla_resume' => 'date', + 'sla_final' => 'date', + 'biaya_final' => 'decimal:2', 'status' => 'boolean', + 'authorized_status' => 'boolean', 'authorized_at' => 'datetime', ];