diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php index 098cf925dd..dfd20bd2f6 100644 --- a/app/Importer/Importer.php +++ b/app/Importer/Importer.php @@ -63,6 +63,10 @@ abstract class Importer 'full_name' => 'full name', 'email' => 'email', 'username' => 'username', + 'address' => 'address', + 'city' => 'city', + 'state' => 'state', + 'country' => 'country', 'jobtitle' => 'job title', 'employee_num' => 'employee number', 'phone_number' => 'phone number', diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index bd5bbc1d5b..761efe69bb 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -47,6 +47,10 @@ class UserImporter extends ItemImporter $this->item['email'] = $this->findCsvMatch($row, 'email'); $this->item['phone'] = $this->findCsvMatch($row, 'phone_number'); $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle'); + $this->item['address'] = $this->findCsvMatch($row, 'address'); + $this->item['city'] = $this->findCsvMatch($row, 'city'); + $this->item['state'] = $this->findCsvMatch($row, 'state'); + $this->item['country'] = $this->findCsvMatch($row, 'country'); $this->item['activated'] = ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0; \Log::debug('UserImporter.php Activated: '.$this->findCsvMatch($row, 'activated')); diff --git a/public/js/build/all.js b/public/js/build/all.js index 1c98f6573c..97e3483cab 100644 Binary files a/public/js/build/all.js and b/public/js/build/all.js differ diff --git a/public/js/build/vue.js b/public/js/build/vue.js index 44e08f8a33..15472ee4dc 100644 Binary files a/public/js/build/vue.js and b/public/js/build/vue.js differ diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map index 297760b87d..85e92cc512 100644 Binary files a/public/js/build/vue.js.map and b/public/js/build/vue.js.map differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 07b42ebbf8..450dce89c6 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 4206528575..b31c6118a5 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/vue.js": "/js/build/vue.js?id=461ae9803574a5a52d43", + "/js/build/vue.js": "/js/build/vue.js?id=aff26ce7202625817ca1", "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545", "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/overrides.css": "/css/overrides.css?id=d1fe6296eb548247a5ad", @@ -18,7 +18,7 @@ "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438", - "/js/build/vue.js.map": "/js/build/vue.js.map?id=1760ae00d44238e44172", + "/js/build/vue.js.map": "/js/build/vue.js.map?id=41a870ef3b9b5c6688ca", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b", @@ -38,7 +38,7 @@ "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e", "/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d", - "/js/dist/all.js": "/js/dist/all.js?id=4513ccdd4533b52922a8", + "/js/dist/all.js": "/js/dist/all.js?id=5ac062af7b26fb838213", "/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d", - "/js/build/all.js": "/js/build/all.js?id=4513ccdd4533b52922a8" + "/js/build/all.js": "/js/build/all.js?id=5ac062af7b26fb838213" } diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue index 27c578284e..cabc1d3095 100644 --- a/resources/assets/js/components/importer/importer-file.vue +++ b/resources/assets/js/components/importer/importer-file.vue @@ -169,6 +169,10 @@ {id: 'manager_first_name', text: 'Manager First Name' }, {id: 'manager_last_name', text: 'Manager Last Name' }, {id: 'activated', text: 'Activated' }, + {id: 'address', text: 'Address' }, + {id: 'city', text: 'City' }, + {id: 'state', text: 'State' }, + {id: 'country', text: 'Country' }, ], customFields: this.customFields,