lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased

Browse source
This commit is contained in:
Brady Wetherington 2023-03-08 13:57:21 -08:00
commit 087fe19ae7
1 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/Http/Livewire/ImporterFile.php
View file

@ -106,8 +106,36 @@ class ImporterFile extends Component
//array of "real fieldnames" to a list of aliases for that field
static $aliases = [
'model_number' => ['model', 'model no','model no.','model number', 'model num', 'model num.'],
'warranty_months' => ['Warranty', 'Warranty Months']
'model_number' =>
[
'model',
'model no',
'model no.',
'model number',
'model num',
'model num.'
],
'warranty_months' =>
[
'Warranty',
'Warranty Months'
],
'qty' =>
[
'QTY',
'Quantity'
],
'min_amt' =>
[
'Min Amount',
'Min QTY'
],
'next_audit_date' =>
[
'Next Audit',
],
];
private function getColumns($type)
@ -191,12 +219,12 @@ class ImporterFile extends Component
public function mount()
{
$this->importTypes = [
'asset' => 'Assets', // TODO - translate!
'accessory' => 'Accessories',
'consumable' => 'Consumables',
'component' => 'Components',
'license' => 'Licenses',
'user' => 'Users'
'asset' => trans('general.assets'),
'accessory' => trans('general.accessories'),
'consumable' => trans('general.consumables'),
'component' => trans('general.components'),
'license' => trans('general.licenses'),
'user' => trans('general.users'),
];
$this->columnOptions[''] = $this->getColumns(''); //blank mode? I don't know what this is supposed to mean
@ -215,7 +243,7 @@ class ImporterFile extends Component
return false;
}
$this->statusType = 'pending';
$this->statusText = "Processing...";
$this->statusText = trans('admin/hardware/form.processing_spinner');
}