';
print_r($userPermissions);
@@ -93,6 +96,7 @@ class UsersController extends AdminController {
return View::make('backend/users/edit', compact('groups', 'userGroups', 'permissions', 'userPermissions'))
->with('location_list', $location_list)
->with('manager_list', $manager_list)
+ ->with('company_list', $company_list)
->with('user', new User);
}
@@ -267,6 +271,7 @@ class UsersController extends AdminController {
$this->encodeAllPermissions($permissions);
$location_list = array('' => '') + Location::lists('name', 'id');
+ $company_list = Company::getSelectList();
$manager_list = array('' => 'Select a User') + DB::table('users')
->select(DB::raw('concat(last_name,", ",first_name," (",email,")") as full_name, id'))
->whereNull('deleted_at')
@@ -285,6 +290,7 @@ class UsersController extends AdminController {
// Show the page
return View::make('backend/users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))
->with('location_list', $location_list)
+ ->with('company_list', $company_list)
->with('manager_list', $manager_list);
}
@@ -357,6 +363,7 @@ class UsersController extends AdminController {
$user->jobtitle = Input::get('jobtitle');
$user->phone = Input::get('phone');
$user->location_id = Input::get('location_id');
+ $user->company_id = Input::get('company_id');
$user->manager_id = Input::get('manager_id');
$user->notes = Input::get('notes');
@@ -845,7 +852,8 @@ class UsersController extends AdminController {
$sort = e(Input::get('sort'));
}
- $users = User::select(array('users.id','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes'))->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc');
+ $users = User::select(array('id','email','username','location_id','manager_id','first_name','last_name','created_at','notes','company_id'))
+ ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company');
switch ($status) {
case 'deleted':
@@ -927,7 +935,8 @@ class UsersController extends AdminController {
'consumables' => $user->consumables->count(),
'groups' => $group_names,
'notes' => $user->notes,
- 'actions' => ($actions) ? $actions : ''
+ 'actions' => ($actions) ? $actions : '',
+ 'companyName' => is_null($user->company) ? '' : e($user->company->name)
);
}
diff --git a/app/database/migrations/2015_11_05_061015_create_companies_table.php b/app/database/migrations/2015_11_05_061015_create_companies_table.php
new file mode 100644
index 0000000000..c026a87787
--- /dev/null
+++ b/app/database/migrations/2015_11_05_061015_create_companies_table.php
@@ -0,0 +1,32 @@
+increments('id');
+ $table->string('name')->unique();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('companies');
+ }
+}
diff --git a/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php b/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php
new file mode 100644
index 0000000000..62360f7d93
--- /dev/null
+++ b/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php
@@ -0,0 +1,35 @@
+integer('company_id')->unsigned()->nullable();
+ $table->foreign('company_id')->references('id')->on('companies');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('consumables', function(Blueprint $table)
+ {
+ $table->dropForeign('consumables_company_id_foreign');
+ $table->dropColumn('company_id');
+ });
+ }
+}
diff --git a/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php b/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php
new file mode 100644
index 0000000000..1d21d9ed8a
--- /dev/null
+++ b/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php
@@ -0,0 +1,35 @@
+integer('company_id')->unsigned()->nullable();
+ $table->foreign('company_id')->references('id')->on('companies');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('accessories', function(Blueprint $table)
+ {
+ $table->dropForeign('accessories_company_id_foreign');
+ $table->dropColumn('company_id');
+ });
+ }
+}
diff --git a/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php b/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php
new file mode 100644
index 0000000000..90cf4bca9c
--- /dev/null
+++ b/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php
@@ -0,0 +1,35 @@
+integer('company_id')->unsigned()->nullable();
+ $table->foreign('company_id')->references('id')->on('companies');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('users', function(Blueprint $table)
+ {
+ $table->dropForeign('users_company_id_foreign');
+ $table->dropColumn('company_id');
+ });
+ }
+}
diff --git a/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php b/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php
new file mode 100644
index 0000000000..ab38db622f
--- /dev/null
+++ b/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php
@@ -0,0 +1,35 @@
+integer('company_id')->unsigned()->nullable();
+ $table->foreign('company_id')->references('id')->on('companies');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('licenses', function(Blueprint $table)
+ {
+ $table->dropForeign('licenses_company_id_foreign');
+ $table->dropColumn('company_id');
+ });
+ }
+}
diff --git a/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php b/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php
new file mode 100644
index 0000000000..14ab5b9a85
--- /dev/null
+++ b/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php
@@ -0,0 +1,35 @@
+integer('company_id')->unsigned()->nullable();
+ $table->foreign('company_id')->references('id')->on('companies');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('assets', function(Blueprint $table)
+ {
+ $table->dropForeign('assets_company_id_foreign');
+ $table->dropColumn('company_id');
+ });
+ }
+}
diff --git a/app/lang/en/admin/companies/message.php b/app/lang/en/admin/companies/message.php
new file mode 100644
index 0000000000..760a08bc91
--- /dev/null
+++ b/app/lang/en/admin/companies/message.php
@@ -0,0 +1,22 @@
+ 'Company does not exist.',
+ 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+
+ 'create' => array(
+ 'error' => 'Company was not created, please try again.',
+ 'success' => 'Company created successfully.'
+ ),
+
+ 'update' => array(
+ 'error' => 'Company was not updated, please try again',
+ 'success' => 'Company updated successfully.'
+ ),
+
+ 'delete' => array(
+ 'confirm' => 'Are you sure you wish to delete this company?',
+ 'error' => 'There was an issue deleting the company. Please try again.',
+ 'success' => 'The Company was deleted successfully.'
+ )
+);
diff --git a/app/lang/en/admin/companies/table.php b/app/lang/en/admin/companies/table.php
new file mode 100644
index 0000000000..b40f460f41
--- /dev/null
+++ b/app/lang/en/admin/companies/table.php
@@ -0,0 +1,10 @@
+ 'Companies',
+ 'create' => 'Create Company',
+ 'title' => 'Company',
+ 'update' => 'Update Company',
+ 'name' => 'Company Name',
+ 'id' => 'ID',
+);
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
index c9ddda5ab5..9d4613a7a0 100755
--- a/app/lang/en/general.php
+++ b/app/lang/en/general.php
@@ -30,6 +30,8 @@
'checkin_from' => 'Checkin from',
'checkout' => 'Checkout',
'city' => 'City',
+ 'companies' => 'Companies',
+ 'company' => 'Company',
'consumable' => 'Consumable',
'consumables' => 'Consumables',
'country' => 'Country',
diff --git a/app/models/Accessory.php b/app/models/Accessory.php
index 0abed13fcb..d389264015 100755
--- a/app/models/Accessory.php
+++ b/app/models/Accessory.php
@@ -10,11 +10,17 @@ class Accessory extends Elegant
* Category validation rules
*/
public $rules = array(
- 'name' => 'required|alpha_space|min:3|max:255',
- 'category_id' => 'required|integer',
- 'qty' => 'required|integer|min:1',
+ 'name' => 'required|alpha_space|min:3|max:255',
+ 'qty' => 'required|integer|min:1',
+ 'category_id' => 'required|integer',
+ 'company_id' => 'required|integer',
);
+ public function company()
+ {
+ return $this->belongsTo('Company', 'company_id');
+ }
+
public function category()
{
return $this->belongsTo('Category', 'category_id')->where('category_type','=','accessory');
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 05424e0811..6ad26d3922 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -11,6 +11,7 @@ class Asset extends Depreciable
'name' => 'alpha_space|min:2|max:255',
'model_id' => 'required',
'status_id' => 'required',
+ 'company_id' => 'required|integer',
'warranty_months' => 'integer|min:0|max:240',
'note' => 'alpha_space',
'notes' => 'alpha_space',
@@ -22,6 +23,11 @@ class Asset extends Depreciable
'status' => 'integer'
];
+ public function company()
+ {
+ return $this->belongsTo('Company', 'company_id');
+ }
+
/**
* Checkout asset
diff --git a/app/models/Company.php b/app/models/Company.php
new file mode 100644
index 0000000000..b616dc7663
--- /dev/null
+++ b/app/models/Company.php
@@ -0,0 +1,14 @@
+ 'required|alpha_space|min:2|max:255|unique:companies,name,{id}'];
+
+ public static function getSelectList()
+ {
+ return array('' => '') + DB::table('companies')->orderBy('name', 'ASC')->lists('name', 'id');
+ }
+}
diff --git a/app/models/Consumable.php b/app/models/Consumable.php
index dad42a771d..c089188e71 100644
--- a/app/models/Consumable.php
+++ b/app/models/Consumable.php
@@ -10,11 +10,17 @@ class Consumable extends Elegant
* Category validation rules
*/
public $rules = array(
- 'name' => 'required|alpha_space|min:3|max:255',
- 'category_id' => 'required|integer',
- 'qty' => 'required|integer|min:0',
+ 'name' => 'required|alpha_space|min:3|max:255',
+ 'qty' => 'required|integer|min:0',
+ 'category_id' => 'required|integer',
+ 'company_id' => 'required|integer',
);
+ public function company()
+ {
+ return $this->belongsTo('Company', 'company_id');
+ }
+
public function category()
{
return $this->belongsTo('Category', 'category_id');
@@ -64,7 +70,7 @@ class Consumable extends Elegant
$remaining = $total - $checkedout;
return $remaining;
}
-
+
/**
* Query builder scope to search on text
*
diff --git a/app/models/License.php b/app/models/License.php
index 08476fe646..3776e2004e 100755
--- a/app/models/License.php
+++ b/app/models/License.php
@@ -10,14 +10,20 @@ class License extends Depreciable
protected $guarded = 'id';
protected $table = 'licenses';
protected $rules = array(
- 'name' => 'required|alpha_space|min:3|max:255',
- 'serial' => 'required|min:5',
- 'seats' => 'required|min:1|max:10000|integer',
- 'license_email' => 'email|min:0|max:120',
- 'license_name' => 'alpha_space|min:0|max:100',
- 'note' => 'alpha_space',
- 'notes' => 'alpha_space|min:0',
- );
+ 'name' => 'required|alpha_space|min:3|max:255',
+ 'serial' => 'required|min:5',
+ 'seats' => 'required|min:1|max:10000|integer',
+ 'license_email' => 'email|min:0|max:120',
+ 'license_name' => 'alpha_space|min:0|max:100',
+ 'note' => 'alpha_space',
+ 'notes' => 'alpha_space|min:0',
+ 'company_id' => 'required|integer',
+ );
+
+ public function company()
+ {
+ return $this->belongsTo('Company', 'company_id');
+ }
/**
* Get the assigned user
diff --git a/app/models/User.php b/app/models/User.php
index 20fa1f9e3d..996a70e690 100755
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -12,6 +12,11 @@ class User extends SentryUserModel
use SoftDeletingTrait;
protected $dates = ['deleted_at'];
+ public function company()
+ {
+ return $this->belongsTo('Company', 'company_id');
+ }
+
/**
* Returns the user full name, it simply concatenates
diff --git a/app/routes.php b/app/routes.php
index b9b87e1cb5..1717faec93 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -356,6 +356,18 @@
Route::get( '/', [ 'as' => 'settings/backups', 'uses' => 'SettingsController@getBackups' ] );
} );
+ # Companies
+ Route::group([ 'prefix' => 'companies' ], function () {
+
+ Route::get('{companyId}/edit', ['as' => 'update/company', 'uses' => 'CompaniesController@getEdit']);
+ Route::get('create', ['as' => 'create/company', 'uses' => 'CompaniesController@getCreate']);
+ Route::get('/', ['as' => 'companies', 'uses' => 'CompaniesController@getIndex']);
+
+ Route::post('{companyId}/delete', ['as' => 'delete/company', 'uses' => 'CompaniesController@postDelete']);
+ Route::post('{companyId}/edit', 'CompaniesController@postEdit');
+ Route::post('create', 'CompaniesController@postCreate');
+ });
+
# Manufacturers
Route::group( [ 'prefix' => 'manufacturers' ], function () {
diff --git a/app/views/backend/accessories/edit.blade.php b/app/views/backend/accessories/edit.blade.php
index 02ce60e0f0..5f23291fc3 100755
--- a/app/views/backend/accessories/edit.blade.php
+++ b/app/views/backend/accessories/edit.blade.php
@@ -35,30 +35,42 @@
+
+
+
+ {{ Form::label('company_id', Lang::get('general.company')) }}
+
+
+
+ {{ Form::select('company_id', $company_list , Input::old('company_id', $accessory->company_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+ {{ $errors->first('company_id', ' :message') }}
+
+
+
{{ Form::label('name', Lang::get('admin/accessories/general.accessory_name')) }}
-
+
{{ $errors->first('name', ' :message') }}
-
+
{{ Form::label('category_id', Lang::get('admin/accessories/general.accessory_category')) }}
-
+
{{ Form::select('category_id', $category_list , Input::old('category_id', $accessory->category_id), array('class'=>'select2', 'style'=>'width:350px')) }}
{{ $errors->first('category_id', ' :message') }}
-
+
@@ -69,7 +81,7 @@
{{ $errors->first('order_number', '
:message') }}
-
+
@@ -81,7 +93,7 @@
{{ $errors->first('purchase_date', '
:message') }}
-
+
@@ -97,13 +109,13 @@
-
+
{{ Form::label('qty', Lang::get('admin/accessories/general.qty')) }}
-
+
@@ -117,7 +129,7 @@
-
+
@lang('button.cancel')
@@ -129,7 +141,7 @@
-
+
@lang('admin/accessories/general.about_accessories_title')
@lang('admin/accessories/general.about_accessories_text')
diff --git a/app/views/backend/accessories/index.blade.php b/app/views/backend/accessories/index.blade.php
index 7837d93aee..6b83ced8fb 100755
--- a/app/views/backend/accessories/index.blade.php
+++ b/app/views/backend/accessories/index.blade.php
@@ -28,6 +28,7 @@
data-cookie-id-table="accessoriesTable">
+ @lang('admin/companies/table.title')
{{Lang::get('admin/accessories/table.title')}}
{{Lang::get('admin/accessories/general.accessory_category')}}
{{Lang::get('admin/accessories/general.total')}}
diff --git a/app/views/backend/companies/edit.blade.php b/app/views/backend/companies/edit.blade.php
new file mode 100644
index 0000000000..86119000f5
--- /dev/null
+++ b/app/views/backend/companies/edit.blade.php
@@ -0,0 +1,94 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+ @if ($company->id)
+ @lang('admin/companies/table.update') ::
+ @else
+ @lang('admin/companies/table.create') ::
+ @endif
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+
+
+
+
+ @lang('general.back')
+
+
+ @if ($company->id)
+ @lang('admin/companies/table.update')
+ @else
+ @lang('admin/companies/table.create')
+ @endif
+
+
+
+
+
+
+@stop
diff --git a/app/views/backend/companies/index.blade.php b/app/views/backend/companies/index.blade.php
new file mode 100644
index 0000000000..3101ec7317
--- /dev/null
+++ b/app/views/backend/companies/index.blade.php
@@ -0,0 +1,95 @@
+@extends('backend/layouts/default')
+
+{{-- Page title --}}
+@section('title')
+@lang('admin/companies/table.companies') ::
+@parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+
+
+
+
+ @lang('general.create')
+
+ @lang('admin/companies/table.companies')
+
+
+
+
+
+@stop
diff --git a/app/views/backend/consumables/edit.blade.php b/app/views/backend/consumables/edit.blade.php
index a33058b7c4..2e829f05f1 100644
--- a/app/views/backend/consumables/edit.blade.php
+++ b/app/views/backend/consumables/edit.blade.php
@@ -35,6 +35,18 @@
+
+
+
+ {{ Form::label('company_id', Lang::get('general.company')) }}
+
+
+
+ {{ Form::select('company_id', $company_list , Input::old('company_id', $consumable->company_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+ {{ $errors->first('company_id', ' :message') }}
+
+
+
@@ -58,7 +70,7 @@
{{ $errors->first('category_id', ' :message') }}
-
+
@@ -69,7 +81,7 @@
{{ $errors->first('order_number', '
:message') }}
-
+
@@ -81,7 +93,7 @@
{{ $errors->first('purchase_date', '
:message') }}
-
+
diff --git a/app/views/backend/consumables/index.blade.php b/app/views/backend/consumables/index.blade.php
index c7c1d6f017..a99c091a70 100644
--- a/app/views/backend/consumables/index.blade.php
+++ b/app/views/backend/consumables/index.blade.php
@@ -29,6 +29,7 @@
@lang('general.id')
+ @lang('admin/companies/table.title')
{{Lang::get('admin/consumables/table.title')}}
{{Lang::get('admin/consumables/general.total')}}
{{Lang::get('admin/consumables/general.remaining')}}
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index d313f3e418..018468c6a6 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -121,6 +121,18 @@
+
+
+
+ {{ Form::label('company_id', Lang::get('general.company')) }}
+
+
+
+ {{ Form::select('company_id', $company_list , Input::old('company_id', $asset->company_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
+ {{ $errors->first('company_id', '
:message') }}
+
+
+
@endif
+ @if ($asset->company)
+
+ @lang('general.company'):
+ {{{ $asset->company->name }}}
+
+ @endif
+
@if ($asset->serial)
@lang('admin/hardware/form.serial'):
{{{ $asset->serial }}}
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index e31cb12d88..eba9fd2ea0 100644
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -199,6 +199,11 @@