DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop

Browse source 
Add Zip field in the User Importer for develop [sc-18556]
This commit is contained in:
snipe 2022-01-26 16:58:37 -08:00 committed by GitHub
parent d0b90bdff9 c86ed892ab
commit b153138d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Importer/UserImporter.php
View file

@ -50,6 +50,7 @@ class UserImporter extends ItemImporter
$this->item['city'] = $this->findCsvMatch($row, 'city'); $this->item['city'] = $this->findCsvMatch($row, 'city');
$this->item['state'] = $this->findCsvMatch($row, 'state'); $this->item['state'] = $this->findCsvMatch($row, 'state');
$this->item['country'] = $this->findCsvMatch($row, 'country'); $this->item['country'] = $this->findCsvMatch($row, 'country');
$this->item['zip'] = $this->findCsvMatch($row, 'zip');
$this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
$this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num'); $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
$this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')); $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department'));

1
resources/assets/js/components/importer/importer-file.vue
View file

@ -183,6 +183,7 @@
{id: 'city', text: 'City' }, {id: 'city', text: 'City' },
{id: 'state', text: 'State' }, {id: 'state', text: 'State' },
{id: 'country', text: 'Country' }, {id: 'country', text: 'Country' },
{id: 'zip', text: 'ZIP' },
], ],
customFields: this.customFields, customFields: this.customFields,