min

app/Concerns/HasEffectiveAddress.php

@@ -4,7 +4,6 @@
 
 namespace App\Concerns;
 
-use App\Enums\ResidenceEnvironment;
 use App\Models\Beneficiary;
 use App\Models\BeneficiaryPartner;
 use App\Models\City;
@@ -18,17 +17,12 @@ public function initializeHasEffectiveAddress(): void
         $this->fillable[] = 'legal_residence_county_id';
         $this->fillable[] = 'legal_residence_city_id';
         $this->fillable[] = 'legal_residence_address';
-        $this->fillable[] = 'legal_residence_environment';
 
         $this->fillable[] = 'same_as_legal_residence';
 
         $this->fillable[] = 'effective_residence_county_id';
         $this->fillable[] = 'effective_residence_city_id';
         $this->fillable[] = 'effective_residence_address';
-        $this->fillable[] = 'effective_residence_environment';
-
-        $this->casts['effective_residence_environment'] = ResidenceEnvironment::class;
-        $this->casts['legal_residence_environment'] = ResidenceEnvironment::class;
     }
 
     protected static function bootHasEffectiveAddress(): void

app/Models/Beneficiary.php

@@ -21,6 +21,7 @@
 use App\Enums\Occupation;
 use App\Enums\PresentationMode;
 use App\Enums\ReferralMode;
+use App\Enums\ResidenceEnvironment;
 use App\Enums\Studies;
 use App\Enums\Ternary;
 use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
@@ -59,6 +60,9 @@ class Beneficiary extends Model
         'id_serial',
         'id_number',
 
+        'legal_residence_environment',
+        'effective_residence_environment',
+
         'primary_phone',
         'backup_phone',
         'contact_notes',
@@ -116,6 +120,8 @@ class Beneficiary extends Model
         'civil_status' => CivilStatus::class,
         'criminal_history' => Ternary::class,
         'doesnt_have_children' => 'boolean',
+        'effective_residence_environment' => ResidenceEnvironment::class,
+        'legal_residence_environment' => ResidenceEnvironment::class,
         'elder_care_count' => 'integer',
         'gender' => Gender::class,
         'has_family_doctor' => Ternary::class,