DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add warranty months. Also fix a merge issue where things reverted back to comment instead of log.

Browse source
This commit is contained in:
Daniel Meltzer 2016-05-25 21:13:26 -05:00
parent e353df588f
commit 891c37b2ed
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Console/Commands/ObjectImportCommand.php
View file

@ -347,24 +347,25 @@ class ObjectImportCommand extends Command {
return; return;
foreach ($this->status_labels as $tempstatus) { foreach ($this->status_labels as $tempstatus) {
if ($tempstatus->name === $asset_statuslabel_name) { if ($tempstatus->name === $asset_statuslabel_name) {
$this->comment('A matching Status ' . $asset_statuslabel_name . ' already exists'); $this->log('A matching Status ' . $asset_statuslabel_name . ' already exists');
return $tempstatus; return $tempstatus;
} }
} }
$status = new Statuslabel(); $status = new Statuslabel();
$status->name = $asset_statuslabel_name; $status->name = $asset_statuslabel_name;
$this->status_labels->add($status);
if(!$this->option('testrun')) { if(!$this->option('testrun')) {
if ($status->save()) { if ($status->save()) {
$this->comment('Status ' . $asset_statuslabel_name . ' was created'); $this->status_labels->add($status);
$this->log('Status ' . $asset_statuslabel_name . ' was created');
return $status; return $status;
} else { } else {
$this->comment('Something went wrong! Status ' . $asset_statuslabel_name . ' was NOT created'); $this->error('Status: ' . $status->getErrors());
return $status; return $status;
} }
} else { } else {
$this->status_labels->add($status);
return $status; return $status;
} }
} }
@ -602,6 +603,10 @@ class ObjectImportCommand extends Command {
$asset_serial = $this->array_smart_fetch($row, "serial number"); $asset_serial = $this->array_smart_fetch($row, "serial number");
$asset_tag = $this->array_smart_fetch($row, "asset tag"); $asset_tag = $this->array_smart_fetch($row, "asset tag");
$asset_image = $this->array_smart_fetch($row, "image"); $asset_image = $this->array_smart_fetch($row, "image");
$asset_warranty_months = intval($this->array_smart_fetch($row, "warranty months"));
if(empty($asset_warranty_months)) {
$asset_warranty_months = NULL;
}
// Check for the asset model match and create it if it doesn't exist // Check for the asset model match and create it if it doesn't exist
$asset_model = $this->createOrFetchAssetModel($row, $item["category"], $item["manufacturer"]); $asset_model = $this->createOrFetchAssetModel($row, $item["category"], $item["manufacturer"]);
$supplier = $this->createOrFetchSupplier($row); $supplier = $this->createOrFetchSupplier($row);
@ -621,7 +626,7 @@ class ObjectImportCommand extends Command {
} }
if(empty($item["status_label"])) { if(empty($item["status_label"])) {
$this->comment("No status field found, defaulting to id 1."); $this->log("No status field found, defaulting to id 1.");
$status_id = 1; $status_id = 1;
} else { } else {
$status_id = $item["status_label"]->id; $status_id = $item["status_label"]->id;