diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php index 577eb2d6c..9921d02fe 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php @@ -50,19 +50,22 @@ -
+
- + + @{{ errors.first('latitude') }}
-
+
- + + @{{ errors.first('longitude') }}
-
+
- + + @{{ errors.first('priority') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php index 1dd58ad15..4b70cc89e 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php @@ -52,19 +52,22 @@
-
+
- + + @{{ errors.first('latitude') }}
-
+
- + + @{{ errors.first('longitude') }}
-
+
- + + @{{ errors.first('priority') }}
diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 3b8c9917a..fa568f1f2 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -3,19 +3,20 @@ namespace Webkul\Inventory\Http\Controllers; use Illuminate\Support\Facades\Event; +use Webkul\Inventory\Http\Requests\InventorySourceRequest; use Webkul\Inventory\Repositories\InventorySourceRepository; class InventorySourceController extends Controller { /** - * Contains route related configuration + * Contains route related configuration. * * @var array */ protected $_config; /** - * InventorySourceRepository object + * Inventory source repository instance. * * @var \Webkul\Inventory\Repositories\InventorySourceRepository */ @@ -59,24 +60,11 @@ class InventorySourceController extends Controller * * @return \Illuminate\Http\Response */ - public function store() + public function store(InventorySourceRequest $inventorySourceRequest) { - $this->validate(request(), [ - 'code' => ['required', 'unique:inventory_sources,code', new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required', - 'contact_name' => 'required', - 'contact_email' => 'required|email', - 'contact_number' => 'required', - 'street' => 'required', - 'country' => 'required', - 'state' => 'required', - 'city' => 'required', - 'postcode' => 'required', - ]); + $data = $inventorySourceRequest->all(); - $data = request()->all(); - - $data['status'] = !isset($data['status']) ? 0 : 1; + $data['status'] = ! isset($data['status']) ? 0 : 1; Event::dispatch('inventory.inventory_source.create.before'); @@ -108,24 +96,11 @@ class InventorySourceController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function update($id) + public function update(InventorySourceRequest $inventorySourceRequest, $id) { - $this->validate(request(), [ - 'code' => ['required', 'unique:inventory_sources,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required', - 'contact_name' => 'required', - 'contact_email' => 'required|email', - 'contact_number' => 'required', - 'street' => 'required', - 'country' => 'required', - 'state' => 'required', - 'city' => 'required', - 'postcode' => 'required', - ]); + $data = $inventorySourceRequest->all(); - $data = request()->all(); - - $data['status'] = !isset($data['status']) ? 0 : 1; + $data['status'] = ! isset($data['status']) ? 0 : 1; Event::dispatch('inventory.inventory_source.update.before', $id); @@ -163,11 +138,11 @@ class InventorySourceController extends Controller return response()->json(['message' => true], 200); } catch (\Exception $e) { report($e); - + session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Inventory source'])); } } return response()->json(['message' => false], 400); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Inventory/src/Http/Requests/InventorySourceRequest.php b/packages/Webkul/Inventory/src/Http/Requests/InventorySourceRequest.php new file mode 100644 index 000000000..383d3d0c3 --- /dev/null +++ b/packages/Webkul/Inventory/src/Http/Requests/InventorySourceRequest.php @@ -0,0 +1,50 @@ + ['required', $uniqueCode, new Code], + 'name' => ['required'], + 'latitude' => ['numeric', 'between:-90,90'], + 'longitude' => ['numeric', 'between:-180,180'], + 'priority' => ['numeric'], + 'contact_name' => ['required', new AlphaNumericSpace], + 'contact_email' => ['required', 'email'], + 'contact_number' => ['required', new PhoneNumber], + 'street' => ['required', new Address], + 'country' => ['required', new AlphaNumericSpace], + 'state' => ['required', new AlphaNumericSpace], + 'city' => ['required', new AlphaNumericSpace], + 'postcode' => ['required'], + ]; + } +}