diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 7dfa01f6..2e751779 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -24,7 +24,6 @@ class ItemController extends Controller $query->where('user_id', $user->id); } }) - ->when($request->has('name') && $request->name != '', function($query) use($request){ $query->where('name', 'LIKE', '%'.$request->name.'%'); }) diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index 75606a13..b3e0a73e 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -26,7 +26,7 @@ class StoreItemRequest extends FormRequest case 'POST': { return [ 'name' => 'required|max:100|unique:items', - 'unique_id' => 'required|max:100|unique:items', + 'unique_id' => 'nullable|max:100|unique:items', 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', @@ -38,7 +38,7 @@ class StoreItemRequest extends FormRequest $Item = $this->route('Item'); return [ 'name' => 'required|max:100|unique:items,name,'.$Item->id, - 'unique_id' => 'required|max:100|unique:items,unique_id,'.$Item->id, + 'unique_id' => 'nullable|max:100|unique:items,unique_id,'.$Item->id, 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php index 3e651755..b89e57c0 100644 --- a/app/Http/Requests/StorePackageRequest.php +++ b/app/Http/Requests/StorePackageRequest.php @@ -26,7 +26,7 @@ class StorePackageRequest extends FormRequest case 'POST': { return [ 'name' => 'required|max:250|unique:packages', - 'unique_id' => 'required|max:250|unique:packages', + 'unique_id' => 'nullable|max:250|unique:packages', 'note' => 'nullable', 'items' => 'required', ]; @@ -37,7 +37,7 @@ class StorePackageRequest extends FormRequest $Package = $this->route('Package'); return [ 'name' => 'required|max:250|unique:packages,name,'.$Package->id, - 'unique_id' => 'required|max:250|unique:packages,unique_id,'.$Package->id, + 'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id, 'note' => 'nullable', 'items' => 'required', ]; diff --git a/resources/js/vue/views/Item/AddEdit.vue b/resources/js/vue/views/Item/AddEdit.vue index 062eb41e..51b56033 100644 --- a/resources/js/vue/views/Item/AddEdit.vue +++ b/resources/js/vue/views/Item/AddEdit.vue @@ -3,7 +3,7 @@ - + - + + - +