Skip to content

A free open source IT asset/license management system

Added archived to Livewire field mapper

snipeab519d9f1a78
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 441e108191..fe7f7c105b 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -81,7 +81,7 @@ class AccessoriesController extends Controller
->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'defaultSupplier', 'adminuser', 'orderItems.order.supplier')
->withCount('checkouts as checkouts_count');
- // Archived / soft-deleted scope.
+ // Archived / soft-deleted scope.
switch ($request->input('status')) {
case 'Archived':
$accessories->archived();
diff --git a/app/Importer/AccessoryImporter.php b/app/Importer/AccessoryImporter.php
index 4ac058fc6e..b77cd6dbc9 100644
--- a/app/Importer/AccessoryImporter.php
+++ b/app/Importer/AccessoryImporter.php
@@ -58,6 +58,7 @@ class AccessoryImporter extends ItemImporter
$this->setItemFromCsvIfPresent($row, 'min_amt');
$this->setItemFromCsvIfPresent($row, 'qty', 'quantity');
$this->setItemFromCsvIfPresent($row, 'requestable');
+ $this->setItemFromCsvIfPresent($row, 'archived');
if ($this->csvRowHas($row, 'image')) {
$raw = $this->findCsvMatch($row, 'image');
diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.php
index 79dee9c410..aba9eb4448 100644
--- a/app/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -375,6 +375,7 @@ class Importer extends Component
* These are the item-type specific columns
*/
$this->accessories_fields = [
+ 'archived' => trans('general.archived'),
'category' => trans('general.category'),
'company' => trans('general.company'),
'item_name' => trans('general.item_name_var', ['item' => trans('general.accessory')]),
@@ -387,6 +388,7 @@ class Importer extends Component
'purchase_cost' => trans('general.purchase_cost'),
'purchase_date' => trans('general.purchase_date'),
'quantity' => trans('general.qty'),
+ 'requestable' => trans('general.requestable'),
'supplier' => trans('general.supplier'),
];
@@ -459,6 +461,7 @@ class Importer extends Component
// which does findCsvMatch($row, 'quantity'). A previous rename to
// 'qty' silently broke consumable/component imports (issue #19312).
'quantity' => trans('general.qty'),
+ 'requestable' => trans('general.requestable'),
'supplier' => trans('general.supplier'),
];