DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10812 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime_develop

Browse source 
Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string develop
This commit is contained in:
snipe 2022-03-10 10:40:33 -08:00 committed by GitHub
parent d06ef4bdef cdc0805fc4
commit 8984b3a59d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Importer/AssetImporter.php
View file

@ -97,10 +97,12 @@ class AssetImporter extends ItemImporter
$item['rtd_location_id'] = $this->item['location_id']; $item['rtd_location_id'] = $this->item['location_id'];
} }
$item['last_audit_date'] = null;
if (isset($this->item['last_audit_date'])) { if (isset($this->item['last_audit_date'])) {
$item['last_audit_date'] = $this->item['last_audit_date']; $item['last_audit_date'] = $this->item['last_audit_date'];
} }
$item['next_audit_date'] = null;
if (isset($this->item['next_audit_date'])) { if (isset($this->item['next_audit_date'])) {
$item['next_audit_date'] = $this->item['next_audit_date']; $item['next_audit_date'] = $this->item['next_audit_date'];
} }

12
app/Importer/LicenseImporter.php
View file

@ -47,14 +47,22 @@ class LicenseImporter extends ItemImporter
$license = new License; $license = new License;
} }
$asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset. $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset.
$this->item['expiration_date'] = $this->findCsvMatch($row, 'expiration_date');
$this->item['expiration_date'] = null;
if ($this->findCsvMatch($row, 'expiration_date') != '') {
$this->item['expiration_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'expiration_date')));
}
$this->item['license_email'] = $this->findCsvMatch($row, 'license_email'); $this->item['license_email'] = $this->findCsvMatch($row, 'license_email');
$this->item['license_name'] = $this->findCsvMatch($row, 'license_name'); $this->item['license_name'] = $this->findCsvMatch($row, 'license_name');
$this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
$this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
$this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
$this->item['seats'] = $this->findCsvMatch($row, 'seats'); $this->item['seats'] = $this->findCsvMatch($row, 'seats');
$this->item['termination_date'] = $this->findCsvMatch($row, 'termination_date');
$this->item['termination_date'] = null;
if ($this->findCsvMatch($row, 'termination_date') != '') {
$this->item['termination_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'termination_date')));
}
if ($editingLicense) { if ($editingLicense) {
$license->update($this->sanitizeItemForUpdating($license)); $license->update($this->sanitizeItemForUpdating($license));