diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index f7fea069c1..e0f3fe6bf4 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -189,10 +189,10 @@ class AssetsController extends AdminController { // Declare the rules for the form validation $rules = array( - 'name' => 'required|min:3', - 'asset_tag' => 'required|min:3', + 'name' => 'required|alpha_dash|min:3', + 'asset_tag' => 'required|alpha_dash|min:3', 'model_id' => 'required', - 'serial' => 'required|min:3', + 'serial' => 'required|alpha_dash|min:3', 'warranty_months' => 'integer|min:1', ); diff --git a/app/models/Asset.php b/app/models/Asset.php index 43dd6150e1..308dc64bbf 100644 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -8,9 +8,8 @@ class Asset extends Elegant { 'name' => 'required|alpha_dash|min:3', 'asset_tag' => 'required|min:3|unique:assets', 'model_id' => 'required', - 'serial' => 'required|min:3', + 'serial' => 'required|alpha_dash|min:3', 'warranty_months' => 'integer|min:1', - 'purchase_cost' => 'integer|min:1', ); @@ -115,6 +114,30 @@ class Asset extends Elegant { } + public function months_until_depreciated() + { + + $today = date("Y-m-d"); + + // @link http://www.php.net/manual/en/class.datetime.php + $d1 = new DateTime($today); + $d2 = new DateTime($this->depreciated_date()); + + // @link http://www.php.net/manual/en/class.dateinterval.php + $interval = $d1->diff($d2); + return $interval; + + } + + + public function depreciated_date() + { + $date = date_create($this->purchase_date); + date_add($date, date_interval_create_from_date_string($this->depreciation->months.' months')); + return date_format($date, 'Y-m-d'); + } + + public function depreciation() { return $this->belongsTo('Depreciation','id'); diff --git a/app/views/backend/assets/view.blade.php b/app/views/backend/assets/view.blade.php index d69dbe1d81..f37e018e24 100644 --- a/app/views/backend/assets/view.blade.php +++ b/app/views/backend/assets/view.blade.php @@ -102,8 +102,9 @@ View Asset {{ $asset->asset_tag }} ::