diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index ef4371b475..0c4a5f0859 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -117,12 +117,17 @@ class AssetsController extends Controller $asset_tags = $request->input('asset_tags'); $success = false; + $serials = $request->input('serials'); + for ($a = 1; $a <= count($asset_tags); $a++) { $asset = new Asset(); $asset->model()->associate(AssetModel::find($request->input('model_id'))); $asset->name = $request->input('name'); - $asset->serial = $request->input('serial'); + // Check for a corresponding serial + if (($serials) && (array_key_exists($a, $serials))) { + $asset->serial = $serials[$a]; + } $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); $asset->model_id = $request->input('model_id'); $asset->order_number = $request->input('order_number'); diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 7768db45a9..035edf6f69 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -34,9 +34,9 @@ @endif - {!! $errors->first('asset_tag', ' :message') !!} + {!! $errors->first('asset_tags', ' :message') !!} - @include ('partials.forms.edit.serial', ['translated_serial' => trans('admin/hardware/form.serial')]) + @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
diff --git a/resources/views/partials/forms/edit/serial.blade.php b/resources/views/partials/forms/edit/serial.blade.php index 008dd95976..b0e6f87e47 100644 --- a/resources/views/partials/forms/edit/serial.blade.php +++ b/resources/views/partials/forms/edit/serial.blade.php @@ -1,8 +1,8 @@
- +
- + {!! $errors->first('serial', ' :message') !!}
-
\ No newline at end of file +