From 20367eecc9da1279b981980b7a052685b0157939 Mon Sep 17 00:00:00 2001
From: slong753 <spencer@spencerlong.com>
Date: Tue, 18 Jul 2023 08:10:58 -0500
Subject: [PATCH] fix conflicts

---
 app/Models/Asset.php                              |  6 +++++-
 ...and_add_column_for_explicit_date_to_assets.php | 15 ++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index ac06f187b1..c3d1355dea 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -84,9 +84,11 @@ class Asset extends Depreciable
         'location_id'    => 'integer',
         'rtd_company_id' => 'integer',
         'supplier_id'    => 'integer',
+        'byod'           => 'boolean',
         'created_at'     => 'datetime',
         'updated_at'   => 'datetime',
         'deleted_at'  => 'datetime',
+       'eol_explicit' => 'boolean',
     ];
 
     protected $rules = [
@@ -105,7 +107,8 @@ class Asset extends Depreciable
         'serial'          => 'unique_serial|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',
         'supplier_id'     => 'exists:suppliers,id|nullable',
-        'asset_eol_date'  => 'date|max:10|min:10|nullable',
+        'asset_eol_date'  => 'date_format:Y-m-d|nullable',
+        'eol_explicit'    => 'boolean|nullable',
         'byod'            => 'boolean',
     ];
 
@@ -139,6 +142,7 @@ class Asset extends Depreciable
         'asset_eol_date',
         'last_audit_date',
         'next_audit_date',
+        'eol_explicit',
     ];
 
     use Searchable;
diff --git a/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php b/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
index 4e46c1db40..ac2656d8b3 100644
--- a/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
+++ b/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
@@ -16,18 +16,19 @@ class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
     public function up()
     {
         Schema::table('assets', function (Blueprint $table) {
-            $table->date('eol_explicit')->after('asset_eol_date')->nullable();
+            $table->boolean('eol_explicit')->default(false)->after('asset_eol_date');
         });
       
        
         // Update the eol_explicit column with the value from asset_eol_date if it exists and is different from the calculated value
         $assetsWithEolDates = Asset::whereNotNull('asset_eol_date')->get();
         foreach($assetsWithEolDates as $asset) {
-            if($asset->asset_eol_date && $asset->asset_purchase_date) {
-                $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->asset_purchase_date);
+            if($asset->asset_eol_date && $asset->purchase_date) {
+                $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date);
                 if($months != $asset->model->eol) {
-                    Asset::find($asset->id)->update(['eol_explicit' => $asset->asset_eol_date]);
+                    $asset->update(['eol_explicit' => true]);
                 }
+
             }
         }
 
@@ -38,8 +39,8 @@ class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
             if ($model) {
                 $eol = $model->eol;
                 if ($eol) {
-                    $asset_eol_date = Carbon::parse($asset->asset_purchase_date)->addMonths($eol)->format('Y-m-d');
-                    Asset::fine($asset->id)->update(['asset_eol_date' => $asset_eol_date]);
+                    $asset_eol_date = Carbon::parse($asset->purchase_date)->addMonths($eol)->format('Y-m-d');
+                    $asset->update(['asset_eol_date' => $asset_eol_date]);
                 }
             }
         }
@@ -53,7 +54,7 @@ class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
     public function down()
     {
         Schema::table('assets', function (Blueprint $table) {
-            //
+                $table->dropColumn('eol_explicit');
         });
     }
 }