From 951521dc8111baeeca9fff64ea4bef3a91f2de3e Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 13 Sep 2023 15:20:55 -0500
Subject: [PATCH] push

---
 app/Http/Livewire/Importer.php | 5 +++--
 app/Importer/ItemImporter.php  | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php
index 488187ec72..6fd86c0491 100644
--- a/app/Http/Livewire/Importer.php
+++ b/app/Http/Livewire/Importer.php
@@ -194,7 +194,8 @@ class Importer extends Component
         ];
 
         $this->assets_fields = [
-            'asset_eol_date' => trans('general.eol'),
+            //'asset_eol_date' => trans('general.eol'),
+            'asset_eol_date' => 'asset_eol_date',
             'company' => trans('general.company'),
             'location' => trans('general.location'),
             'item_name' => trans('general.item_name_var', ['item' => trans('general.asset')]),
@@ -216,7 +217,7 @@ class Importer extends Component
             'manufacturer' => trans('general.manufacturer'),
             'order_number' => trans('general.order_number'),
             'image' => trans('general.importer.image_filename'),
-            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
+            //'asset_eol_date' => trans('admin/hardware/form.eol_date'),
             /**
              * Checkout fields:
              * Assets can be checked out to other assets, people, or locations, but we currently
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 0a03ae8b86..0d17ecaedb 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -99,7 +99,14 @@ class ItemImporter extends Importer
                     $this->log('Unable to parse date: '.$csvMatch);
                 }
         } elseif ($this->createOrFetchAssetModel($row) != null) {
-                if($eol = AssetModel::find($this->createOrFetchAssetModel($row))->eol) {
+                if(AssetModel::find($this->createOrFetchAssetModel($row))->eol && $this->findCsvMatch($row, 'purchase_date') != '') {
+                    $eol = AssetModel::find($this->createOrFetchAssetModel($row))->eol;
+                    $months = CarbonImmutable::parse($this->findCsvMatch($row, 'asset_eol_date'))->diffInMonths($this->findCsvMatch($row, 'purchase_date'));
+                    if($months != $eol) {
+                        $this->item['eol_explicit'] = true;
+                    } else {
+                        $this->item['eol_explicit'] = false;
+                    }
                     $this->item['asset_eol_date'] = CarbonImmutable::parse($this->findCsvMatch($row, 'purchase_date'))->addMonths($eol)->format('Y-m-d');
                 }
         }