diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 35f3779cc2..770b82ee03 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -814,7 +814,7 @@ class UsersController extends Controller 'phone' => trim(e($row[5])), 'jobtitle' => trim(e($row[6])), 'employee_num' => trim(e($row[7])), - //'company_id' => Company::getIdForUser($row[8]), + 'company_id' => Company::getIdForUser($row[8]), 'permissions' => '{"user":1}', 'notes' => 'Imported user' ); diff --git a/resources/views/users/import.blade.php b/resources/views/users/import.blade.php index 0a249b683f..b99b906b4e 100644 --- a/resources/views/users/import.blade.php +++ b/resources/views/users/import.blade.php @@ -32,9 +32,9 @@ Create a User

Upload a CSV file with one or more users. Passwords will be auto-generated. The CSV should have the first fields as:

-

firstName,lastName, username, email, location_id, phone, jobtitle, employee_num.

+

firstName,lastName, username, email, location_id, phone, jobtitle, employee_num, company_id.

-

Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address. +

Any additional fields to the right of those fields will be ignored. Email is optional, however users will not be able to recover their passwords or receive EULAs if you do not provide an email address. If you wish to include a company association, you must reference the ID number of an existing company - companies will not be created on the fly.

@if (config('app.lock_passwords'))