diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index aa857784b7..0651df197b 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -180,8 +180,8 @@ class CheckoutableListener $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint); $notification->success()->sendMessage($message[0], $message[1]); // Send the message to Microsoft Teams } else { - Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint) - ->notify($this->getCheckinNotification($event)); + Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint) + ->notify($this->getCheckinNotification($event)); } } } catch (ClientException $e) { diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.php index 5ffd3b1f4d..1296dbd106 100644 --- a/app/Livewire/Importer.php +++ b/app/Livewire/Importer.php @@ -117,44 +117,45 @@ class Importer extends Component public function updatingTypeOfImport($type) { - // go through each header, find a matching field to try and map it to. + + // go through each header, find a matching field to try and map it to. foreach ($this->headerRow as $i => $header) { - // do we have something mapped already? - if (array_key_exists($i, $this->field_map)) { - // yes, we do. Is it valid for this type of import? - // (e.g. the import type might have been changed...?) + // do we have something mapped already? + if (array_key_exists($i, $this->field_map)) { + // yes, we do. Is it valid for this type of import? + // (e.g. the import type might have been changed...?) if (array_key_exists($this->field_map[$i], $this->columnOptions[$type])) { - //yes, this key *is* valid. Continue on to the next field. - continue; - } else { - //no, this key is *INVALID* for this import type. Better set it to null - // and we'll hope that the $aliases_fields or something else picks it up. - $this->field_map[$i] = null; // fingers crossed! But it's not likely, tbh. - } // TODO - strictly speaking, this isn't necessary here I don't think. - } - // first, check for exact matches + //yes, this key *is* valid. Continue on to the next field. + continue; + } else { + //no, this key is *INVALID* for this import type. Better set it to null + // and we'll hope that the $aliases_fields or something else picks it up. + $this->field_map[$i] = null; // fingers crossed! But it's not likely, tbh. + } // TODO - strictly speaking, this isn't necessary here I don't think. + } + // first, check for exact matches foreach ($this->columnOptions[$type] as $v => $text) { - if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose! + if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose! $this->field_map[$i] = $v; - continue 2; //don't bother with the alias check, go to the next header - } + continue 2; //don't bother with the alias check, go to the next header } - // if you got here, we didn't find a match. Try the $aliases_fields - foreach ($this->aliases_fields as $key => $alias_values) { - foreach ($alias_values as $alias_value) { - if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE! - // Make *absolutely* sure that this key actually _exists_ in this import type - - // you can trigger this by importing accessories with a 'Warranty' column (which don't exist - // in "Accessories"!) + } + // if you got here, we didn't find a match. Try the $aliases_fields + foreach ($this->aliases_fields as $key => $alias_values) { + foreach ($alias_values as $alias_value) { + if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE! + // Make *absolutely* sure that this key actually _exists_ in this import type - + // you can trigger this by importing accessories with a 'Warranty' column (which don't exist + // in "Accessories"!) if (array_key_exists($key, $this->columnOptions[$type])) { - $this->field_map[$i] = $key; - continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header - } + $this->field_map[$i] = $key; + continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header } } } - // and if you got here, we got nothing. Let's recommend 'null' - $this->field_map[$i] = null; // Booooo :( + } + // and if you got here, we got nothing. Let's recommend 'null' + $this->field_map[$i] = null; // Booooo :( } } @@ -552,7 +553,6 @@ class Importer extends Component $this->field_map = null; foreach ($this->headerRow as $element) { - if (isset($this->activeFile->field_map[$element])) { $this->field_map[] = $this->activeFile->field_map[$element]; } else { @@ -585,18 +585,16 @@ class Importer extends Component if (Storage::delete('private_uploads/imports/' . $import->file_path)) { $import->delete(); - $this->message = trans('admin/hardware/message.import.file_delete_success'); - $this->message_type = 'success'; + $this->message = trans('admin/hardware/message.import.file_delete_success'); + $this->message_type = 'success'; unset($this->files); - return; + return; } $this->message = trans('admin/hardware/message.import.file_delete_error'); $this->message_type = 'danger'; - - } public function clearMessage() @@ -620,7 +618,7 @@ class Importer extends Component public function render() { return view('livewire.importer') - ->extends('layouts.default') - ->section('content'); + ->extends('layouts.default') + ->section('content'); } } diff --git a/app/Livewire/SlackSettingsForm.php b/app/Livewire/SlackSettingsForm.php index 7678387896..8d330bafbe 100644 --- a/app/Livewire/SlackSettingsForm.php +++ b/app/Livewire/SlackSettingsForm.php @@ -117,6 +117,9 @@ class SlackSettingsForm extends Component public function updatedwebhookEndpoint() { $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows'); } + public function updatedwebhookEndpoint() { + $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows'); + } private function isButtonDisabled() { if (empty($this->webhook_endpoint)) { diff --git a/database/factories/ImportFactory.php b/database/factories/ImportFactory.php index ca6608a804..e7f8d692ea 100644 --- a/database/factories/ImportFactory.php +++ b/database/factories/ImportFactory.php @@ -145,6 +145,7 @@ class ImportFactory extends Factory } + /** * Create an asset model import type. *