Merge branch 'refs/heads/develop'

Author: snipe

app/controllers/admin/AssetsController.php

@@ -273,7 +273,7 @@ public function postEdit($assetId = null)
 
 
 		// Redirect to the asset management page with error
-		return Redirect::to("assets/$assetId/edit")->with('error', Lang::get('admin/hardware/message.update.error'));
+		return Redirect::to("hardware/$assetId/edit")->with('error', Lang::get('admin/hardware/message.update.error'));
 
 	}
 
@@ -320,7 +320,7 @@ public function getCheckout($assetId)
 		}
 
 		// Get the dropdown of users and then pass it to the checkout view
-		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->lists('full_name', 'id');
+		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
 		//print_r($users);
 		return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
@@ -386,7 +386,7 @@ public function postCheckout($assetId)
 		}
 
 		// Redirect to the asset management page with error
-		return Redirect::to("assets/$assetId/checkout")->with('error', Lang::get('admin/hardware/message.checkout.error'));
+		return Redirect::to("hardware/$assetId/checkout")->with('error', Lang::get('admin/hardware/message.checkout.error'));
 	}
 
 

app/controllers/admin/LicensesController.php

@@ -239,7 +239,7 @@ public function getCheckout($seatId)
 		}
 
 		// Get the dropdown of users and then pass it to the checkout view
-		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->lists('full_name', 'id');
+		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
 		//print_r($users);
 		return View::make('backend/licenses/checkout', compact('licenseseat'))->with('users_list',$users_list);

app/controllers/admin/ModelsController.php

@@ -40,12 +40,12 @@ public function getCreate()
 		// Show the page
 		$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
 		$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-		$category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
+		$category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
 		$view = View::make('backend/models/edit');
 		$view->with('category_list',$category_list);
 		$view->with('depreciation_list',$depreciation_list);
 		$view->with('manufacturer_list',$manufacturer_list);
-		$view->with('model',new Model); 
+		$view->with('model',new Model);
 		return $view;
 	}
 
@@ -81,7 +81,7 @@ public function postCreate()
 			if($model->save())
 			{
 				// Redirect to the new model  page
-				return Redirect::to("assets/models")->with('success', Lang::get('admin/models/message.create.success'));
+				return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success'));
 			}
 		}
 		else
@@ -92,7 +92,7 @@ public function postCreate()
 		}
 
 		// Redirect to the model create page
-		return Redirect::to('assets/models/create')->with('error', Lang::get('admin/models/message.create.error'));
+		return Redirect::to('hardware/models/create')->with('error', Lang::get('admin/models/message.create.error'));
 
 	}
 
@@ -156,7 +156,7 @@ public function postEdit($modelId = null)
 			if($model->save())
 			{
 				// Redirect to the new model  page
-				return Redirect::to("assets/models/$modelId/edit")->with('success', Lang::get('admin/models/message.update.success'));
+				return Redirect::to("hardware/models/$modelId/edit")->with('success', Lang::get('admin/models/message.update.success'));
 			}
 		}
 		else
@@ -167,7 +167,7 @@ public function postEdit($modelId = null)
 		}
 
 		// Redirect to the model create page
-		return Redirect::to("assets/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
+		return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
 
 	}
 
@@ -183,19 +183,19 @@ public function getDelete($modelId)
 		if (is_null($model = Model::find($modelId)))
 		{
 			// Redirect to the blogs management page
-			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.not_found'));
+			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.not_found'));
 		}
 
 		if ($model->assets->count() > 0) {
 			// Throw an error that this model is associated with assets
-			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.assoc_users'));
+			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.assoc_users'));
 
 		} else {
 			// Delete the model
 			$model->delete();
 
 			// Redirect to the models management page
-			return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success'));
+			return Redirect::to('hardware/models')->with('success', Lang::get('admin/models/message.delete.success'));
 		}
 	}
 

app/models/Model.php

@@ -7,6 +7,7 @@ class Model extends Elegant {
 		'name'   => 'required|alpha_space|min:3',
 		'modelno'   => 'alpha_space|min:1',
 		'category_id'   => 'required|integer',
+		'manufacturer_id'   => 'required|integer',
 	);
 
 	public function assets()

app/views/backend/hardware/checkin.blade.php

@@ -60,7 +60,7 @@
 						@else
 						<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
 						@endif
-						<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i>@lang('general.checkin')</button>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i>@lang('general.checkin')</button>
 					</div>
 				</div>
 

app/views/backend/hardware/checkout.blade.php

@@ -77,10 +77,12 @@
 					@else
 					<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
 					@endif
-					<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
+					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
 				</div>
 			</div>
 
+
+
 </form>
 
 </div>

app/views/backend/hardware/edit.blade.php

@@ -117,22 +117,12 @@
 				</div>
 			</div>
 
-			<!-- Depreciation -->
-			<div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
-				<label for="parent" class="col-md-2 control-label">Depreciation</label>
-					<div class="col-md-7">
-						{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }}
-						{{ $errors->first('depreciation_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
-					</div>
-			</div>
-
-
 			<!-- Status -->
 			<div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
-				<label for="parent" class="col-md-2 control-label">Status</label>
+				<label for="status_id" class="col-md-2 control-label">Status</label>
 					<div class="col-md-7">
 						{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }}
-						{{ $errors->first('depreciation_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+						{{ $errors->first('status_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 			</div>