diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index cf13d24fc..c1c46538d 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -38,6 +38,7 @@ class AssetModelsController extends Controller 'image', 'name', 'model_number', + 'min_amt', 'eol', 'notes', 'created_at', @@ -52,6 +53,7 @@ class AssetModelsController extends Controller 'models.image', 'models.name', 'model_number', + 'min_amt', 'eol', 'requestable', 'models.notes', diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index dbefb2e7b..99188f27f 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -76,6 +76,7 @@ class AssetModelsController extends Controller $model->depreciation_id = $request->input('depreciation_id'); $model->name = $request->input('name'); $model->model_number = $request->input('model_number'); + $model->min_amt = $request->input('min_amt'); $model->manufacturer_id = $request->input('manufacturer_id'); $model->category_id = $request->input('category_id'); $model->notes = $request->input('notes'); @@ -153,6 +154,7 @@ class AssetModelsController extends Controller $model->eol = $request->input('eol'); $model->name = $request->input('name'); $model->model_number = $request->input('model_number'); + $model->min_amt = $request->input('min_amt'); $model->manufacturer_id = $request->input('manufacturer_id'); $model->category_id = $request->input('category_id'); $model->notes = $request->input('notes'); diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index f3a658c87..ff0a13048 100644 --- a/app/Http/Transformers/AssetModelsTransformer.php +++ b/app/Http/Transformers/AssetModelsTransformer.php @@ -47,6 +47,7 @@ class AssetModelsTransformer ] : null, 'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null, 'model_number' => e($assetmodel->model_number), + 'min_amt' => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null, 'depreciation' => ($assetmodel->depreciation) ? [ 'id' => (int) $assetmodel->depreciation->id, 'name'=> e($assetmodel->depreciation->name), diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php index aed1b925e..e0b056fc9 100755 --- a/app/Models/AssetModel.php +++ b/app/Models/AssetModel.php @@ -29,6 +29,7 @@ class AssetModel extends SnipeModel protected $rules = [ 'name' => 'required|min:1|max:255', 'model_number' => 'max:255|nullable', + 'min_amt' => 'integer|min:0|nullable', 'category_id' => 'required|integer|exists:categories,id', 'manufacturer_id' => 'integer|exists:manufacturers,id|nullable', 'eol' => 'integer:min:0|max:240|nullable', @@ -65,6 +66,7 @@ class AssetModel extends SnipeModel 'fieldset_id', 'image', 'manufacturer_id', + 'min_amt', 'model_number', 'name', 'notes', diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php index 8da192ebb..e661b1ab8 100644 --- a/app/Presenters/AssetModelPresenter.php +++ b/app/Presenters/AssetModelPresenter.php @@ -65,6 +65,14 @@ class AssetModelPresenter extends Presenter 'title' => trans('admin/models/table.modelnumber'), 'visible' => true, ], + [ + 'field' => 'min_amt', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('mail.min_QTY'), + 'visible' => true, + ], [ 'field' => 'assets_count', 'searchable' => false, diff --git a/database/migrations/2023_08_21_181742_add_min_amt_to_models_table.php b/database/migrations/2023_08_21_181742_add_min_amt_to_models_table.php new file mode 100644 index 000000000..5f0bb85f9 --- /dev/null +++ b/database/migrations/2023_08_21_181742_add_min_amt_to_models_table.php @@ -0,0 +1,32 @@ +integer('min_amt')->after('model_number')->default(null);; + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models', function (Blueprint $table) { + $table->dropColumn('min_amt'); + }); + } +} diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index 74d3c1b83..e6bf3deda 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -15,6 +15,7 @@ @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id']) @include ('partials.forms.edit.model_number') @include ('partials.forms.edit.depreciation') +@include ('partials.forms.edit.minimum_quantity')