.'/uploads/models/'.$model->image.')
' : '',
- 'modelnumber' => $model->modelno,
+ 'modelnumber' => $model->model_number,
'numassets' => $model->assets->count(),
'depreciation' => (($model->depreciation)&&($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : trans('general.no_depreciation'),
'category' => ($model->category) ? $model->category->name : '',
diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index f3cc630f9..8ad41b9cc 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -124,7 +124,7 @@ class AssetsController extends Controller
$view->with('statuslabel_list', $statuslabel_list);
$view->with('assigned_to', $assigned_to);
$view->with('location_list', $location_list);
- $view->with('asset', new Asset);
+ $view->with('item', new Asset);
$view->with('manufacturer', $manufacturer_list);
$view->with('category', $category_list);
$view->with('statuslabel_types', $statuslabel_types);
@@ -290,10 +290,10 @@ class AssetsController extends Controller
{
// Check if the asset exists
- if (!$asset = Asset::find($assetId)) {
+ if (!$item = Asset::find($assetId)) {
// Redirect to the asset management page
return redirect()->to('hardware')->with('error', trans('admin/hardware/message.does_not_exist'));
- } elseif (!Company::isCurrentUserHasAccess($asset)) {
+ } elseif (!Company::isCurrentUserHasAccess($item)) {
return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions'));
}
@@ -308,7 +308,7 @@ class AssetsController extends Controller
$assigned_to = Helper::usersList();
$statuslabel_types =Helper::statusTypeList();
- return View::make('hardware/edit', compact('asset'))
+ return View::make('hardware/edit', compact('item'))
->with('model_list', $model_list)
->with('supplier_list', $supplier_list)
->with('company_list', $company_list)
@@ -1038,7 +1038,7 @@ class AssetsController extends Controller
->with('statuslabel_list', $statuslabel_list)
->with('statuslabel_types', $statuslabel_types)
->with('assigned_to', $assigned_to)
- ->with('asset', $asset)
+ ->with('item', $asset)
->with('location_list', $location_list)
->with('manufacturer', $manufacturer_list)
->with('category', $category_list)
@@ -1798,7 +1798,7 @@ class AssetsController extends Controller
'asset_tag' => ''.e($asset->asset_tag).'',
'serial' => e($asset->serial),
'model' => ($asset->model) ? (string)link_to('/hardware/models/'.$asset->model->id.'/view', e($asset->model->name)) : 'No model',
- 'model_number' => ($asset->model && $asset->model->modelno) ? (string)$asset->model->modelno : '',
+ 'model_number' => ($asset->model && $asset->model->model_number) ? (string)$asset->model->model_number : '',
'status_label' => ($asset->assigneduser) ? 'Deployed' : ((e($asset->assetstatus)) ? e($asset->assetstatus->name) : ''),
'assigned_to' => ($asset->assigneduser) ? (string)link_to(config('app.url').'/admin/users/'.$asset->assigned_to.'/view', e($asset->assigneduser->fullName())) : '',
'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? (string)link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/view', e($asset->assigneduser->userloc->name)) : (($asset->defaultLoc!='') ? (string)link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/view', e($asset->defaultLoc->name)) : ''),
diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php
index 600336e80..f08cd3b2a 100755
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -53,7 +53,7 @@ class CategoriesController extends Controller
{
// Show the page
$category_types= Helper::categoryTypeList();
- return View::make('categories/edit')->with('category', new Category)
+ return View::make('categories/edit')->with('item', new Category)
->with('category_types', $category_types);
}
@@ -109,7 +109,7 @@ class CategoriesController extends Controller
public function getEdit($categoryId = null)
{
// Check if the category exists
- if (is_null($category = Category::find($categoryId))) {
+ if (is_null($item = Category::find($categoryId))) {
// Redirect to the blogs management page
return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.does_not_exist'));
}
@@ -120,7 +120,7 @@ class CategoriesController extends Controller
$category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
$category_types= Helper::categoryTypeList();
- return View::make('categories/edit', compact('category'))
+ return View::make('categories/edit', compact('item'))
->with('category_options', $category_options)
->with('category_types', $category_types);
}
diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php
index 9d05c39fe..093ba8415 100644
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -38,7 +38,7 @@ final class CompaniesController extends Controller
*/
public function getCreate()
{
- return View::make('companies/edit')->with('company', new Company);
+ return View::make('companies/edit')->with('item', new Company);
}
/**
@@ -74,11 +74,11 @@ final class CompaniesController extends Controller
*/
public function getEdit($companyId)
{
- if (is_null($company = Company::find($companyId))) {
+ if (is_null($item = Company::find($companyId))) {
return redirect()->to('admin/settings/companies')
->with('error', trans('admin/companies/message.does_not_exist'));
} else {
- return View::make('companies/edit')->with('company', $company);
+ return View::make('companies/edit')->with('item', $item);
}
}
diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php
index 998558d4c..1bba51ca6 100644
--- a/app/Http/Controllers/ComponentsController.php
+++ b/app/Http/Controllers/ComponentsController.php
@@ -61,7 +61,7 @@ class ComponentsController extends Controller
$location_list = Helper::locationsList();
return View::make('components/edit')
- ->with('component', new Component)
+ ->with('item', new Component)
->with('category_list', $category_list)
->with('company_list', $company_list)
->with('location_list', $location_list);
@@ -89,7 +89,7 @@ class ComponentsController extends Controller
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
$component->order_number = e(Input::get('order_number'));
$component->min_amt = e(Input::get('min_amt'));
- $component->serial_number = e(Input::get('serial_number'));
+ $component->serial = e(Input::get('serial'));
if (e(Input::get('purchase_date')) == '') {
$component->purchase_date = null;
@@ -103,7 +103,7 @@ class ComponentsController extends Controller
$component->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
}
- $component->total_qty = e(Input::get('total_qty'));
+ $component->qty = e(Input::get('qty'));
$component->user_id = Auth::user()->id;
// Was the component created?
@@ -130,10 +130,10 @@ class ComponentsController extends Controller
public function getEdit($componentId = null)
{
// Check if the component exists
- if (is_null($component = Component::find($componentId))) {
+ if (is_null($item = Component::find($componentId))) {
// Redirect to the blogs management page
return redirect()->to('admin/components')->with('error', trans('admin/components/message.does_not_exist'));
- } elseif (!Company::isCurrentUserHasAccess($component)) {
+ } elseif (!Company::isCurrentUserHasAccess($item)) {
return redirect()->to('admin/components')->with('error', trans('general.insufficient_permissions'));
}
@@ -141,7 +141,7 @@ class ComponentsController extends Controller
$company_list = Helper::companyList();
$location_list = Helper::locationsList();
- return View::make('components/edit', compact('component'))
+ return View::make('components/edit', compact('item'))
->with('category_list', $category_list)
->with('company_list', $company_list)
->with('location_list', $location_list);
@@ -174,8 +174,8 @@ class ComponentsController extends Controller
$component->location_id = e(Input::get('location_id'));
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
$component->order_number = e(Input::get('order_number'));
- $component->min_amt = e(Input::get('min_amt'));
- $component->serial_number = e(Input::get('serial_number'));
+ $component->min_amt = e(Input::get('min_amt'));
+ $component->serial = e(Input::get('serial'));
if (e(Input::get('purchase_date')) == '') {
$component->purchase_date = null;
@@ -189,7 +189,7 @@ class ComponentsController extends Controller
$component->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
}
- $component->total_qty = e(Input::get('total_qty'));
+ $component->qty = e(Input::get('qty'));
// Was the component created?
if ($component->save()) {
@@ -424,7 +424,7 @@ class ComponentsController extends Controller
$limit = 50;
}
- $allowed_columns = ['id','name','min_amt','order_number','serial_number','purchase_date','purchase_cost','companyName','category','total_qty'];
+ $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','companyName','category','total_qty'];
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
@@ -472,9 +472,9 @@ class ComponentsController extends Controller
'checkbox' =>'',
'id' => $component->id,
'name' => (string)link_to('admin/components/'.$component->id.'/view', e($component->name)),
- 'serial_number' => $component->serial_number,
+ 'serial_number' => $component->serial,
'location' => ($component->location) ? e($component->location->name) : '',
- 'total_qty' => e($component->total_qty),
+ 'qty' => e($component->qty),
'min_amt' => e($component->min_amt),
'category' => ($component->category) ? e($component->category->name) : 'Missing category',
'order_number' => e($component->order_number),
diff --git a/app/Http/Controllers/ConsumablesController.php b/app/Http/Controllers/ConsumablesController.php
index e05310746..92673ac45 100644
--- a/app/Http/Controllers/ConsumablesController.php
+++ b/app/Http/Controllers/ConsumablesController.php
@@ -59,7 +59,7 @@ class ConsumablesController extends Controller
$manufacturer_list = Helper::manufacturerList();
return View::make('consumables/edit')
- ->with('consumable', new Consumable)
+ ->with('item', new Consumable)
->with('category_list', $category_list)
->with('company_list', $company_list)
->with('location_list', $location_list)
@@ -85,7 +85,7 @@ class ConsumablesController extends Controller
$consumable->order_number = e(Input::get('order_number'));
$consumable->min_amt = e(Input::get('min_amt'));
$consumable->manufacturer_id = e(Input::get('manufacturer_id'));
- $consumable->model_no = e(Input::get('model_no'));
+ $consumable->model_number = e(Input::get('model_number'));
$consumable->item_no = e(Input::get('item_no'));
if (e(Input::get('purchase_date')) == '') {
@@ -127,10 +127,10 @@ class ConsumablesController extends Controller
public function getEdit($consumableId = null)
{
// Check if the consumable exists
- if (is_null($consumable = Consumable::find($consumableId))) {
+ if (is_null($item = Consumable::find($consumableId))) {
// Redirect to the blogs management page
return redirect()->to('admin/consumables')->with('error', trans('admin/consumables/message.does_not_exist'));
- } elseif (!Company::isCurrentUserHasAccess($consumable)) {
+ } elseif (!Company::isCurrentUserHasAccess($item)) {
return redirect()->to('admin/consumables')->with('error', trans('general.insufficient_permissions'));
}
@@ -139,7 +139,7 @@ class ConsumablesController extends Controller
$location_list = Helper::locationsList();
$manufacturer_list = Helper::manufacturerList();
- return View::make('consumables/edit', compact('consumable'))
+ return View::make('consumables/edit', compact('item'))
->with('category_list', $category_list)
->with('company_list', $company_list)
->with('location_list', $location_list)
@@ -171,7 +171,7 @@ class ConsumablesController extends Controller
$consumable->order_number = e(Input::get('order_number'));
$consumable->min_amt = e(Input::get('min_amt'));
$consumable->manufacturer_id = e(Input::get('manufacturer_id'));
- $consumable->model_no = e(Input::get('model_no'));
+ $consumable->model_number = e(Input::get('model_number'));
$consumable->item_no = e(Input::get('item_no'));
if (e(Input::get('purchase_date')) == '') {
@@ -412,7 +412,7 @@ class ConsumablesController extends Controller
$limit = 50;
}
- $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','companyName','category','model_no', 'item_no', 'manufacturer'];
+ $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','companyName','category','model_number', 'item_no', 'manufacturer'];
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
@@ -466,7 +466,7 @@ class ConsumablesController extends Controller
'min_amt' => e($consumable->min_amt),
'qty' => e($consumable->qty),
'manufacturer' => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
- 'model_no' => e($consumable->model_no),
+ 'model_number' => e($consumable->model_number),
'item_no' => e($consumable->item_no),
'category' => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
'order_number' => e($consumable->order_number),
diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php
index 59dc78d08..f3fba5495 100755
--- a/app/Http/Controllers/DepreciationsController.php
+++ b/app/Http/Controllers/DepreciationsController.php
@@ -46,7 +46,7 @@ class DepreciationsController extends Controller
public function getCreate()
{
// Show the page
- return View::make('depreciations/edit')->with('depreciation', new Depreciation);
+ return View::make('depreciations/edit')->with('item', new Depreciation);
}
@@ -94,12 +94,12 @@ class DepreciationsController extends Controller
public function getEdit($depreciationId = null)
{
// Check if the depreciation exists
- if (is_null($depreciation = Depreciation::find($depreciationId))) {
+ if (is_null($item = Depreciation::find($depreciationId))) {
// Redirect to the blogs management page
return redirect()->to('admin/settings/depreciations')->with('error', trans('admin/depreciations/message.does_not_exist'));
}
- return View::make('depreciations/edit', compact('depreciation'));
+ return View::make('depreciations/edit', compact('item'));
}
diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php
index 9c04518e7..fdc7a22df 100755
--- a/app/Http/Controllers/LicensesController.php
+++ b/app/Http/Controllers/LicensesController.php
@@ -70,7 +70,7 @@ class LicensesController extends Controller
->with('maintained_list', $maintained_list)
->with('company_list', Helper::companyList())
->with('manufacturer_list', Helper::manufacturerList())
- ->with('license', new License);
+ ->with('item', new License);
}
@@ -139,6 +139,7 @@ class LicensesController extends Controller
$license->depreciation_id = e(Input::get('depreciation_id'));
$license->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
$license->expiration_date = e(Input::get('expiration_date'));
+ $license->termination_date = e(Input::get('termination_date'));
$license->user_id = Auth::user()->id;
if (($license->purchase_date == "") || ($license->purchase_date == "0000-00-00")) {
@@ -190,26 +191,26 @@ class LicensesController extends Controller
public function getEdit($licenseId = null)
{
// Check if the license exists
- if (is_null($license = License::find($licenseId))) {
+ if (is_null($item = License::find($licenseId))) {
// Redirect to the blogs management page
return redirect()->to('admin/licenses')->with('error', trans('admin/licenses/message.does_not_exist'));
- } elseif (!Company::isCurrentUserHasAccess($license)) {
+ } elseif (!Company::isCurrentUserHasAccess($item)) {
return redirect()->to('admin/licenses')->with('error', trans('general.insufficient_permissions'));
}
- if ($license->purchase_date == "0000-00-00") {
- $license->purchase_date = null;
+ if ($item->purchase_date == "0000-00-00") {
+ $item->purchase_date = null;
}
- if ($license->purchase_cost == "0.00") {
- $license->purchase_cost = null;
+ if ($item->purchase_cost == "0.00") {
+ $item->purchase_cost = null;
}
// Show the page
$license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->pluck('name', 'id');
$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
- return View::make('licenses/edit', compact('license'))
+ return View::make('licenses/edit', compact('item'))
->with('license_options', $license_options)
->with('depreciation_list', Helper::depreciationList())
->with('supplier_list', Helper::suppliersList())
@@ -786,7 +787,7 @@ class LicensesController extends Controller
->with('license_options', $license_options)
->with('depreciation_list', $depreciation_list)
->with('supplier_list', $supplier_list)
- ->with('license', $license)
+ ->with('item', $license)
->with('maintained_list', $maintained_list)
->with('company_list', $company_list)
->with('manufacturer_list', Helper::manufacturerList());
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index e8589b62c..cee02f7a8 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -61,7 +61,7 @@ class LocationsController extends Controller
return View::make('locations/edit')
->with('location_options', $location_options)
- ->with('location', new Location);
+ ->with('item', new Location);
}
@@ -159,7 +159,7 @@ class LocationsController extends Controller
public function getEdit($locationId = null)
{
// Check if the location exists
- if (is_null($location = Location::find($locationId))) {
+ if (is_null($item = Location::find($locationId))) {
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
}
@@ -169,7 +169,7 @@ class LocationsController extends Controller
$location_options = Location::flattenLocationsArray($location_options_array);
$location_options = array('' => 'Top Level') + $location_options;
- return View::make('locations/edit', compact('location'))->with('location_options', $location_options);
+ return View::make('locations/edit', compact('item'))->with('location_options', $location_options);
}
diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index 640ae891d..eba506f52 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -46,7 +46,7 @@ class ManufacturersController extends Controller
*/
public function getCreate()
{
- return View::make('manufacturers/edit')->with('manufacturer', new Manufacturer);
+ return View::make('manufacturers/edit')->with('item', new Manufacturer);
}
@@ -84,13 +84,13 @@ class ManufacturersController extends Controller
public function getEdit($manufacturerId = null)
{
// Check if the manufacturer exists
- if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
+ if (is_null($item = Manufacturer::find($manufacturerId))) {
// Redirect to the manufacturer page
return redirect()->to('admin/settings/manufacturers')->with('error', trans('admin/manufacturers/message.does_not_exist'));
}
// Show the page
- return View::make('manufacturers/edit', compact('manufacturer'));
+ return View::make('manufacturers/edit', compact('item'));
}
@@ -521,7 +521,7 @@ class ManufacturersController extends Controller
'min_amt' => e($consumable->min_amt),
'qty' => e($consumable->qty),
'manufacturer' => ($consumable->manufacturer) ? (string) link_to('/admin/settings/manufacturers/'.$consumable->manufacturer_id.'/view', $consumable->manufacturer->name): '',
- 'model_no' => e($consumable->model_no),
+ 'model_number' => e($consumable->model_number),
'item_no' => e($consumable->item_no),
'category' => ($consumable->category) ? (string) link_to('/admin/settings/categories/'.$consumable->category_id.'/view', $consumable->category->name) : 'Missing category',
'order_number' => e($consumable->order_number),
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index b0927c1c5..faad723fe 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -152,7 +152,7 @@ class ReportsController extends Controller
$asset->asset_tag,
($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
($asset->model) ? $asset->model->name : '',
- ($asset->model->modelno) ? $asset->model->modelno : '',
+ ($asset->model->model_number) ? $asset->model->model_number : '',
($asset->name) ? $asset->name : '',
($asset->serial) ? $asset->serial : '',
($asset->assetstatus) ? e($asset->assetstatus->name) : '',
@@ -610,7 +610,7 @@ class ReportsController extends Controller
}
if (e(Input::get('model')) == '1') {
$row[] = '"' . e($asset->model->name) . '"';
- $row[] = '"' . e($asset->model->modelno) . '"';
+ $row[] = '"' . e($asset->model->model_number) . '"';
}
if (e(Input::get('category')) == '1') {
$row[] = '"' .e($asset->model->category->name) . '"';
diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php
index f680ec569..08a3df65f 100755
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -87,11 +87,11 @@ class StatuslabelsController extends Controller
public function getCreate()
{
// Show the page
- $statuslabel = new Statuslabel;
- $use_statuslabel_type = $statuslabel->getStatuslabelType();
+ $item = new Statuslabel;
+ $use_statuslabel_type = $item->getStatuslabelType();
$statuslabel_types = Helper::statusTypeList();
- return View::make('statuslabels/edit', compact('statuslabel_types', 'statuslabel'))->with('use_statuslabel_type', $use_statuslabel_type);
+ return View::make('statuslabels/edit', compact('statuslabel_types', 'item'))->with('use_statuslabel_type', $use_statuslabel_type);
}
@@ -169,16 +169,16 @@ class StatuslabelsController extends Controller
public function getEdit($statuslabelId = null)
{
// Check if the Statuslabel exists
- if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
+ if (is_null($item = Statuslabel::find($statuslabelId))) {
// Redirect to the blogs management page
return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.does_not_exist'));
}
- $use_statuslabel_type = $statuslabel->getStatuslabelType();
+ $use_statuslabel_type = $item->getStatuslabelType();
$statuslabel_types = array('' => trans('admin/hardware/form.select_statustype')) + array('undeployable' => trans('admin/hardware/general.undeployable')) + array('pending' => trans('admin/hardware/general.pending')) + array('archived' => trans('admin/hardware/general.archived')) + array('deployable' => trans('admin/hardware/general.deployable'));
- return View::make('statuslabels/edit', compact('statuslabel', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+ return View::make('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
}
diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php
index 23ecc16f9..d6114c2b0 100755
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -45,7 +45,7 @@ class SuppliersController extends Controller
*/
public function getCreate()
{
- return View::make('suppliers/edit')->with('supplier', new Supplier);
+ return View::make('suppliers/edit')->with('item', new Supplier);
}
@@ -125,13 +125,13 @@ class SuppliersController extends Controller
public function getEdit($supplierId = null)
{
// Check if the supplier exists
- if (is_null($supplier = Supplier::find($supplierId))) {
+ if (is_null($item = Supplier::find($supplierId))) {
// Redirect to the supplier page
return redirect()->to('admin/settings/suppliers')->with('error', trans('admin/suppliers/message.does_not_exist'));
}
// Show the page
- return View::make('suppliers/edit', compact('supplier'));
+ return View::make('suppliers/edit', compact('item'));
}
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index e6ac13a83..43d0fddaf 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -2,6 +2,7 @@
namespace App\Models;
use App\Models\Loggable;
+use App\Models\SnipeModel;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait;
@@ -11,7 +12,7 @@ use Watson\Validating\ValidatingTrait;
*
* @version v1.0
*/
-class Accessory extends Model
+class Accessory extends SnipeModel
{
use CompanyableTrait;
use Loggable;
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 2e7e43b0d..42addbf9e 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -400,6 +400,11 @@ class Asset extends Depreciable
}
}
+ public function getDisplayNameAttribute()
+ {
+ return $this->showAssetName();
+ }
+
public function warrantee_expires()
{
$date = date_create($this->purchase_date);
@@ -788,7 +793,7 @@ public function checkin_email()
$query->where(function ($query) use ($search) {
$query->where('categories.name', 'LIKE', '%'.$search.'%')
->orWhere('models.name', 'LIKE', '%'.$search.'%')
- ->orWhere('models.modelno', 'LIKE', '%'.$search.'%');
+ ->orWhere('models.model_number', 'LIKE', '%'.$search.'%');
});
});
})->orWhereHas('model', function ($query) use ($search) {
@@ -856,7 +861,7 @@ public function checkin_email()
*/
public function scopeOrderModelNumber($query, $order)
{
- return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.modelno', $order);
+ return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order);
}
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index 2c2594807..7462b1845 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -2,6 +2,7 @@
namespace App\Models;
use App\Models\Requestable;
+use App\Models\SnipeModel;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait;
@@ -12,7 +13,7 @@ use Watson\Validating\ValidatingTrait;
*
* @version v1.0
*/
-class AssetModel extends Model
+class AssetModel extends SnipeModel
{
use SoftDeletes;
use Requestable;
@@ -22,7 +23,7 @@ class AssetModel extends Model
// Declare the rules for the model validation
protected $rules = array(
'name' => 'required|min:1|max:255',
- 'modelno' => 'min:1|max:255',
+ 'model_number' => 'min:1|max:255',
'category_id' => 'required|integer',
'manufacturer_id' => 'required|integer',
'eol' => 'integer:min:0|max:240',
@@ -92,8 +93,8 @@ class AssetModel extends Model
public function displayModelName()
{
$name = $this->manufacturer->name.' '.$this->name;
- if ($this->modelno) {
- $name .=" / ".$this->modelno;
+ if ($this->model_number) {
+ $name .=" / ".$this->model_number;
}
return $name;
}
@@ -161,7 +162,7 @@ class AssetModel extends Model
{
return $query->where('name', 'LIKE', "%$search%")
- ->orWhere('modelno', 'LIKE', "%$search%")
+ ->orWhere('model_number', 'LIKE', "%$search%")
->orWhere(function ($query) use ($search) {
$query->whereHas('depreciation', function ($query) use ($search) {
$query->where('name', 'LIKE', '%'.$search.'%');
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 9354833f7..52ffe2a27 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -1,10 +1,11 @@
'required|min:3|max:255',
- 'total_qty' => 'required|integer|min:1',
+ 'qty' => 'required|integer|min:1',
'category_id' => 'required|integer',
'company_id' => 'integer',
'purchase_date' => 'date',
@@ -100,7 +101,7 @@ class Component extends Model
}
- $total = $this->total_qty;
+ $total = $this->qty;
$remaining = $total - $checkedout;
return $remaining;
}
@@ -141,7 +142,7 @@ class Component extends Model
});
})->orWhere('components.name', 'LIKE', '%'.$search.'%')
->orWhere('components.order_number', 'LIKE', '%'.$search.'%')
- ->orWhere('components.serial_number', 'LIKE', '%'.$search.'%')
+ ->orWhere('components.serial', 'LIKE', '%'.$search.'%')
->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%')
->orWhere('components.purchase_date', 'LIKE', '%'.$search.'%');
}
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index a94f8f416..e65e89cb9 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -7,12 +7,13 @@ use App\Models\Company;
use App\Models\ConsumableAssignment;
use App\Models\Location;
use App\Models\Loggable;
+use App\Models\SnipeModel;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait;
-class Consumable extends Model
+class Consumable extends SnipeModel
{
use CompanyableTrait;
use Loggable;
diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php
index d5e367047..ee12a6506 100644
--- a/app/Models/Depreciable.php
+++ b/app/Models/Depreciable.php
@@ -1,10 +1,11 @@
'required|min:3|max:255|unique_undeleted',
'city' => 'min:3|max:255',
- 'state' => 'min:2|max:32',
- 'country' => 'min:2|max:2|max:2',
+ 'state' => 'min:0|max:2',
+ 'country' => 'min:2|max:2',
'address' => 'min:5|max:80',
'address2' => 'min:2|max:80',
'zip' => 'min:3|max:10',
diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php
index c5d5b8e04..27919726a 100755
--- a/app/Models/Manufacturer.php
+++ b/app/Models/Manufacturer.php
@@ -1,11 +1,12 @@
name;
+ }
+}
diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php
index e710608ee..20c67558d 100755
--- a/app/Models/Statuslabel.php
+++ b/app/Models/Statuslabel.php
@@ -1,12 +1,13 @@
'required|min:3|max:255|unique_undeleted',
- 'address' => 'min:3|max:255',
- 'address2' => 'min:2|max:255',
+ 'address' => 'min:3|max:50',
+ 'address2' => 'min:2|max:50',
'city' => 'min:3|max:255',
- 'state' => 'min:0|max:32',
+ 'state' => 'min:0|max:2',
'country' => 'min:0|max:2',
'fax' => 'min:7|max:20',
'phone' => 'min:7|max:20',
- 'contact' => 'min:0|max:255',
+ 'contact' => 'min:0|max:100',
'notes' => 'min:0|max:255',
'email' => 'email|min:5|max:150',
'zip' => 'min:0|max:10',
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d9bca2529..3715449be 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -64,6 +64,11 @@ class AppServiceProvider extends ServiceProvider
}
});
+
+ // Share common variables with all views.
+ view()->composer('*', function ($view) {
+ $view->with('snipeSettings', \App\Models\Setting::getSettings());
+ });
}
/**
diff --git a/codeception.yml b/codeception.yml
index 216cf7bcb..43d70c38f 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -12,13 +12,6 @@ settings:
extensions:
enabled:
- Codeception\Extension\RunFailed
-modules:
- config:
- Db:
- dsn: ''
- user: ''
- password: ''
- dump: tests/_data/dump.sql
coverage:
enabled: true
include:
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index b8acc76e8..53eaef823 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -35,7 +35,7 @@ $factory->defineAs(App\Models\AssetModel::class, 'assetmodel', function (Faker\G
'name' => $faker->catchPhrase,
'manufacturer_id' => $faker->numberBetween(1,10),
'category_id' => $faker->numberBetween(1,9),
- 'modelno' => $faker->numberBetween(1000000,50000000),
+ 'model_number' => $faker->numberBetween(1000000,50000000),
'eol' => 1,
];
});
@@ -95,7 +95,7 @@ $factory->defineAs(App\Models\Component::class, 'component', function (Faker\Gen
return [
'name' => $faker->text(20),
'category_id' => $faker->numberBetween(21,25),
- 'total_qty' => $faker->numberBetween(3, 10),
+ 'qty' => $faker->numberBetween(3, 10),
'min_amt' => $faker->numberBetween($min = 1, $max = 2),
'company_id' => \App\Models\Company::inRandomOrder()->first()->id
];
@@ -332,7 +332,7 @@ $factory->defineAs(App\Models\Actionlog::class, 'consumable-checkout', function
});
$factory->defineAs(App\Models\Actionlog::class, 'component-checkout', function (Faker\Generator $faker) {
- $company = \App\Models\Company::has('users')->has('components')->inRandomOrder()->first();
+ $company = \App\Models\Company::has('users')->has('components')->inRandomOrder()->first();
return [
'user_id' => $company->users()->inRandomOrder()->first()->id,
diff --git a/database/migrations/2016_10_16_015024_rename_modelno_to_model_number.php b/database/migrations/2016_10_16_015024_rename_modelno_to_model_number.php
new file mode 100644
index 000000000..28a0c3dce
--- /dev/null
+++ b/database/migrations/2016_10_16_015024_rename_modelno_to_model_number.php
@@ -0,0 +1,34 @@
+renameColumn('modelno', 'model_number');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('models', function (Blueprint $table) {
+ //
+ $table->renameColumn('model_number', 'modelno');
+
+ });
+ }
+}
diff --git a/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php b/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php
new file mode 100644
index 000000000..daf93c3ac
--- /dev/null
+++ b/database/migrations/2016_10_16_015211_rename_consumable_modelno_to_model_number.php
@@ -0,0 +1,33 @@
+renameColumn('model_no', 'model_number');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('consumables', function (Blueprint $table) {
+ //
+ $table->renameColumn('model_number', 'model_no');
+ });
+ }
+}
diff --git a/database/migrations/2016_10_16_143235_rename_model_note_to_notes.php b/database/migrations/2016_10_16_143235_rename_model_note_to_notes.php
new file mode 100644
index 000000000..7a7668b14
--- /dev/null
+++ b/database/migrations/2016_10_16_143235_rename_model_note_to_notes.php
@@ -0,0 +1,33 @@
+renameColumn('note', 'notes');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('models', function (Blueprint $table) {
+ //
+ $table->renameColumn('notes', 'note');
+ });
+ }
+}
diff --git a/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php b/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php
new file mode 100644
index 000000000..1aba51ce9
--- /dev/null
+++ b/database/migrations/2016_10_16_165052_rename_component_total_qty_to_qty.php
@@ -0,0 +1,33 @@
+renameColumn('total_qty', 'qty');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('components', function (Blueprint $table) {
+ //
+ $table->renameColumn('qty', 'total_qty');
+ });
+ }
+}
diff --git a/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php b/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php
new file mode 100644
index 000000000..b1cde650e
--- /dev/null
+++ b/database/migrations/2016_11_13_020954_rename_component_serial_number_to_serial.php
@@ -0,0 +1,31 @@
+renameColumn('serial_number', 'serial');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('components', function ($table) {
+ $table->renameColumn('serial', 'serial_number');
+ });
+ }
+}
diff --git a/public/uploads/.gitkeep b/public/uploads/.gitkeep
old mode 100644
new mode 100755
diff --git a/public/uploads/assets/.gitkeep b/public/uploads/assets/.gitkeep
old mode 100644
new mode 100755
diff --git a/public/uploads/barcodes/.gitkeep b/public/uploads/barcodes/.gitkeep
old mode 100644
new mode 100755
diff --git a/resources/lang/en/admin/accessories/general.php b/resources/lang/en/admin/accessories/general.php
index f6ed2fe3a..22771aff0 100644
--- a/resources/lang/en/admin/accessories/general.php
+++ b/resources/lang/en/admin/accessories/general.php
@@ -5,18 +5,14 @@ return array(
'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
'accessory_category' => 'Accessory Category',
'accessory_name' => 'Accessory Name',
- 'cost' => 'Purchase Cost',
'checkout' => 'Checkout Accessory',
'checkin' => 'Checkin Accessory',
'create' => 'Create Accessory',
- 'date' => 'Purchase Date',
'edit' => 'Edit Accessory',
'eula_text' => 'Category EULA',
'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
'require_acceptance' => 'Require users to confirm acceptance of assets in this category.',
'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
- 'order' => 'Order Number',
- 'qty' => 'QTY',
'total' => 'Total',
'remaining' => 'Avail',
'update' => 'Update Accessory',
diff --git a/resources/lang/en/admin/asset_maintenances/table.php b/resources/lang/en/admin/asset_maintenances/table.php
index 49d5efa0f..f3a6be60f 100644
--- a/resources/lang/en/admin/asset_maintenances/table.php
+++ b/resources/lang/en/admin/asset_maintenances/table.php
@@ -3,7 +3,6 @@
return [
'title' => 'Asset Maintenance',
'asset_name' => 'Asset Name',
- 'supplier_name' => 'Supplier Name',
'is_warranty' => 'Warranty',
'dl_csv' => 'Download CSV'
];
diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php
index 58967eda6..2a00f82a6 100644
--- a/resources/lang/en/admin/categories/general.php
+++ b/resources/lang/en/admin/categories/general.php
@@ -1,8 +1,8 @@
'About Asset Categories',
- 'about_categories' => 'Asset categories help you organize your assets. Some example categories might be "Desktops", "Laptops", "Mobile Phones", "Tablets", and so on, but you can use asset categories any way that makes sense for you.',
+ 'about_categories_title' => 'About Categories',
+ 'about_categories' => 'Categories help you organize your items. Some example categories might be "Desktops", "Laptops", "Mobile Phones", "Tablets", and so on, but you can use categories any way that makes sense for you.',
'asset_categories' => 'Asset Categories',
'category_name' => 'Category Name',
'checkin_email' => 'Send email to user on checkin.',
diff --git a/resources/lang/en/admin/companies/general.php b/resources/lang/en/admin/companies/general.php
index 9d58ccb58..9a4796897 100644
--- a/resources/lang/en/admin/companies/general.php
+++ b/resources/lang/en/admin/companies/general.php
@@ -1,4 +1,6 @@
'About Companies',
+ 'about_companies_text' => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
'select_company' => 'Select Company',
];
diff --git a/resources/lang/en/admin/consumables/general.php b/resources/lang/en/admin/consumables/general.php
index 89656e4df..53a69f8c0 100644
--- a/resources/lang/en/admin/consumables/general.php
+++ b/resources/lang/en/admin/consumables/general.php
@@ -5,11 +5,8 @@ return array(
'about_consumables_text' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
'checkout' => 'Checkout Consumable to User',
'consumable_name' => 'Consumable Name',
- 'cost' => 'Purchase Cost',
'create' => 'Create Consumable',
- 'date' => 'Purchase Date',
'item_no' => 'Item No.',
- 'order' => 'Order Number',
'remaining' => 'Remaining',
'total' => 'Total',
'update' => 'Update Consumable',
diff --git a/resources/lang/en/admin/depreciations/general.php b/resources/lang/en/admin/depreciations/general.php
index d5796ff9f..1fca0e2cb 100644
--- a/resources/lang/en/admin/depreciations/general.php
+++ b/resources/lang/en/admin/depreciations/general.php
@@ -4,9 +4,9 @@ return array(
'about_asset_depreciations' => 'About Asset Depreciations',
'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
'asset_depreciations' => 'Asset Depreciations',
- 'create_depreciation' => 'Create Depreciation',
+ 'create' => 'Create Depreciation',
'depreciation_name' => 'Depreciation Name',
'number_of_months' => 'Number of Months',
- 'update_depreciation' => 'Update Depreciation',
+ 'update' => 'Update Depreciation',
);
diff --git a/resources/lang/en/admin/groups/titles.php b/resources/lang/en/admin/groups/titles.php
index 12c333a66..99e8cc1f6 100644
--- a/resources/lang/en/admin/groups/titles.php
+++ b/resources/lang/en/admin/groups/titles.php
@@ -1,10 +1,11 @@
'About Groups',
+ 'about_groups' => 'Groups are used to generalize user permissions.',
'group_management' => 'Group Management',
- 'create_group' => 'Create New Group',
- 'edit_group' => 'Edit Group',
+ 'create' => 'Create New Group',
+ 'update' => 'Edit Group',
'group_name' => 'Group Name',
'group_admin' => 'Group Admin',
'allow' => 'Allow',
diff --git a/resources/lang/en/admin/hardware/form.php b/resources/lang/en/admin/hardware/form.php
index 4428e8f22..abded281f 100644
--- a/resources/lang/en/admin/hardware/form.php
+++ b/resources/lang/en/admin/hardware/form.php
@@ -15,7 +15,6 @@ return array(
'create' => 'Create Asset',
'date' => 'Purchase Date',
'depreciates_on' => 'Depreciates On',
- 'depreciation' => 'Depreciation',
'default_location' => 'Default Location',
'eol_date' => 'EOL Date',
'eol_rate' => 'EOL Rate',
@@ -35,7 +34,6 @@ return array(
'select_statustype' => 'Select Status Type',
'serial' => 'Serial',
'status' => 'Status',
- 'supplier' => 'Supplier',
'tag' => 'Asset Tag',
'update' => 'Asset Update',
'warranty' => 'Warranty',
diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index 6674ea0c9..f7644eb73 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -1,6 +1,8 @@
'About Assets',
+ 'about_assets_text' => 'Assets are items tracked by serial number or asset tag. They tend to be higher value items where identifying a specific item matters.',
'archived' => 'Archived',
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
diff --git a/resources/lang/en/admin/licenses/form.php b/resources/lang/en/admin/licenses/form.php
index 2e97ae2ad..ce2916787 100644
--- a/resources/lang/en/admin/licenses/form.php
+++ b/resources/lang/en/admin/licenses/form.php
@@ -4,23 +4,16 @@ return array(
'asset' => 'Asset',
'checkin' => 'Checkin',
- 'cost' => 'Purchase Cost',
'create' => 'Create License',
- 'date' => 'Purchase Date',
- 'depreciation' => 'Depreciation',
'expiration' => 'Expiration Date',
'license_key' => 'Product Key',
'maintained' => 'Maintained',
'name' => 'Software Name',
'no_depreciation' => 'Do Not Depreciate',
- 'notes' => 'Notes',
- 'order' => 'Order No.',
'purchase_order' => 'Purchase Order Number',
'reassignable' => 'Reassignable',
'remaining_seats' => 'Remaining Seats',
'seats' => 'Seats',
- 'serial' => 'Serial',
- 'supplier' => 'Supplier',
'termination_date' => 'Termination Date',
'to_email' => 'Licensed to Email',
'to_name' => 'Licensed to Name',
diff --git a/resources/lang/en/admin/licenses/general.php b/resources/lang/en/admin/licenses/general.php
index 808d75a34..25a536ec5 100644
--- a/resources/lang/en/admin/licenses/general.php
+++ b/resources/lang/en/admin/licenses/general.php
@@ -1,7 +1,8 @@
'About Licenses',
+ 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals',
'checkin' => 'Checkin License Seat',
'checkout_history' => 'Checkout History',
'checkout' => 'Checkout License Seat',
diff --git a/resources/lang/en/admin/locations/table.php b/resources/lang/en/admin/locations/table.php
index 8360ef19b..e171d4dd4 100644
--- a/resources/lang/en/admin/locations/table.php
+++ b/resources/lang/en/admin/locations/table.php
@@ -1,18 +1,20 @@
'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
- 'assets_checkedout' => 'Assets Assigned',
- 'id' => 'ID',
- 'city' => 'City',
- 'state' => 'State',
- 'country' => 'Country',
- 'create' => 'Create Location',
- 'update' => 'Update Location',
- 'name' => 'Location Name',
- 'address' => 'Address',
- 'zip' => 'Postal Code',
- 'locations' => 'Locations',
- 'parent' => 'Parent',
- 'currency' => 'Location Currency',
-);
+ 'about_locations_title' => 'About Locations',
+ 'about_locations' => 'Locations are used to track location information for users, assets, and other items',
+ 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+ 'assets_checkedout' => 'Assets Assigned',
+ 'id' => 'ID',
+ 'city' => 'City',
+ 'state' => 'State',
+ 'country' => 'Country',
+ 'create' => 'Create Location',
+ 'update' => 'Update Location',
+ 'name' => 'Location Name',
+ 'address' => 'Address',
+ 'zip' => 'Postal Code',
+ 'locations' => 'Locations',
+ 'parent' => 'Parent',
+ 'currency' => 'Location Currency',
+ );
diff --git a/resources/lang/en/admin/manufacturers/table.php b/resources/lang/en/admin/manufacturers/table.php
index 1861ee7c5..f66320fe8 100644
--- a/resources/lang/en/admin/manufacturers/table.php
+++ b/resources/lang/en/admin/manufacturers/table.php
@@ -1,7 +1,8 @@
'About manufacturers',
+ 'about_manufacturers_text' => 'Manufacturers make all the magic items we consume.',
'asset_manufacturers' => 'Asset Manufacturers',
'create' => 'Create Manufacturer',
'id' => 'ID',
diff --git a/resources/lang/en/admin/models/general.php b/resources/lang/en/admin/models/general.php
index 08677c553..e0da09f78 100644
--- a/resources/lang/en/admin/models/general.php
+++ b/resources/lang/en/admin/models/general.php
@@ -1,7 +1,8 @@
'About Asset Models',
+ 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
'deleted' => 'This model has been deleted. Click here to restore it.',
'restore' => 'Restore Model',
'requestable' => 'Users may request this model',
diff --git a/resources/lang/en/admin/suppliers/table.php b/resources/lang/en/admin/suppliers/table.php
index 88adfc692..2a7b07ca9 100644
--- a/resources/lang/en/admin/suppliers/table.php
+++ b/resources/lang/en/admin/suppliers/table.php
@@ -1,6 +1,8 @@
'About Suppliers',
+ 'about_suppliers_text' => 'Suppliers are used to track the source of items',
'address' => 'Supplier Address',
'assets' => 'Assets',
'city' => 'City',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 5aaa8359e..170f6fa46 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -113,6 +113,7 @@
'no_results' => 'No Results.',
'no' => 'No',
'notes' => 'Notes',
+ 'order_number' => 'Order Number',
'page_menu' => 'Showing _MENU_ items',
'pagination_info' => 'Showing _START_ to _END_ of _TOTAL_ items',
'pending' => 'Pending',
@@ -121,6 +122,8 @@
'previous' => 'Previous',
'processing' => 'Processing',
'profile' => 'Your profile',
+ 'purchase_cost' => 'Purchase Cost',
+ 'purchase_date' => 'Purchase Date',
'qty' => 'QTY',
'quantity' => 'Quantity',
'ready_to_deploy' => 'Ready to Deploy',
@@ -151,6 +154,7 @@
'state' => 'State',
'status_labels' => 'Status Labels',
'status' => 'Status',
+ 'supplier' => 'Supplier',
'suppliers' => 'Suppliers',
'submit' => 'Submit',
'total_assets' => 'total assets',
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 38a382444..55ee7c013 100755
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -1,211 +1,23 @@
-@extends('layouts/default')
-
-{{-- Page title --}}
-@section('title')
- @if ($accessory->id)
- {{ trans('admin/accessories/general.update') }}
- @else
- {{ trans('admin/accessories/general.create') }}
- @endif
-@parent
-@stop
-
-@section('header_right')
-
- {{ trans('general.back') }}
-
-
-
-@stop
+@extends('layouts/edit-form', [
+ 'createText' => trans('admin/accessories/general.create') ,
+ 'updateText' => trans('admin/accessories/general.update'),
+ 'helpTitle' => trans('admin/accessories/general.about_accessories_title'),
+ 'helpText' => trans('admin/accessories/general.about_accessories_text')
+])
{{-- Page content --}}
-@section('content')
+@section('inputFields')
-
-| {{ trans('general.location') }} | {{ trans('admin/accessories/general.total') }} | -{{ trans('admin/accessories/general.date') }} | -{{ trans('admin/accessories/general.cost') }} | -{{ trans('admin/accessories/general.order') }} | +{{ trans('general.purchase_date') }} | +{{ trans('general.purchase_cost') }} | +{{ trans('general.order_number') }} | {{ trans('general.min_amt') }} | {{ trans('admin/accessories/general.remaining') }} | {{ trans('table.actions') }} | @@ -54,48 +54,7 @@ @section('moar_scripts') - - - - - - - +@include ('partials.bootstrap-table', ['exportFile' => 'accessories-export', 'search' => true]) @stop diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 1f742d295..82f87b6b6 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -46,7 +46,7 @@
|---|
| {{ trans('admin/hardware/table.asset_model') }} | - @if (\App\Models\Setting::getSettings()->display_asset_name) -{{ trans('admin/hardware/form.name') }} | + @if ($snipeSettings->display_asset_name) +{{ trans('admin/hardware/form.name') }} | @endif{{ trans('admin/hardware/table.serial') }} | {{ trans('admin/hardware/table.location') }} | @@ -53,20 +53,18 @@ {{ csrf_field() }}{{ $asset->model->name }} | - @if (\App\Models\Setting::getSettings()->display_asset_name) -{{ $asset->name }} | + @if ($snipeSettings->display_asset_name) +{{ $asset->name }} | @endif{{ $asset->serial }} | @if ($asset->assigneduser && $asset->assetloc) - {{ $asset->assetloc->name }} + {{ $asset->assetloc->name }} @elseif ($asset->defaultLoc) - {{ $asset->defaultLoc->name }} - + {{ $asset->defaultLoc->name }} @endif - | @if ($asset->assigned_to != '' && $asset->assigned_to > 0)Checked out | diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php index ea7b5a1ac..4272f21a0 100644 --- a/resources/views/asset_maintenances/edit.blade.php +++ b/resources/views/asset_maintenances/edit.blade.php @@ -53,25 +53,10 @@ - -
|---|