From 9777e22eab4562b3bc7097e0ed7a63111f39646c Mon Sep 17 00:00:00 2001 From: IceToast Date: Thu, 16 Jun 2022 12:04:52 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20Added=20billing=5Fperiod=20?= =?UTF-8?q?to=20validation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ProductController.php | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 5e9157d9..53b1c7de 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -57,21 +57,22 @@ class ProductController extends Controller public function store(Request $request) { $request->validate([ - 'name' => 'required|max:30', - 'price' => 'required|numeric|max:1000000|min:0', - 'memory' => 'required|numeric|max:1000000|min:5', - 'cpu' => 'required|numeric|max:1000000|min:0', - 'swap' => 'required|numeric|max:1000000|min:0', - 'description' => 'required|string|max:191', - 'disk' => 'required|numeric|max:1000000|min:5', - 'minimum_credits' => 'required|numeric|max:1000000|min:-1', - 'io' => 'required|numeric|max:1000000|min:0', - 'databases' => 'required|numeric|max:1000000|min:0', - 'backups' => 'required|numeric|max:1000000|min:0', - 'allocations' => 'required|numeric|max:1000000|min:0', - 'nodes.*' => 'required|exists:nodes,id', - 'eggs.*' => 'required|exists:eggs,id', - 'disabled' => 'nullable', + "name" => "required|max:30", + "price" => "required|numeric|max:1000000|min:0", + "memory" => "required|numeric|max:1000000|min:5", + "cpu" => "required|numeric|max:1000000|min:0", + "swap" => "required|numeric|max:1000000|min:0", + "description" => "required|string|max:191", + "disk" => "required|numeric|max:1000000|min:5", + "minimum_credits" => "required|numeric|max:1000000|min:-1", + "io" => "required|numeric|max:1000000|min:0", + "databases" => "required|numeric|max:1000000|min:0", + "backups" => "required|numeric|max:1000000|min:0", + "allocations" => "required|numeric|max:1000000|min:0", + "nodes.*" => "required|exists:nodes,id", + "eggs.*" => "required|exists:eggs,id", + "disabled" => "nullable", + "billing_period" => "required|in:hourly,daily,monthly", ]); $disabled = ! is_null($request->input('disabled')); @@ -123,21 +124,22 @@ class ProductController extends Controller public function update(Request $request, Product $product): RedirectResponse { $request->validate([ - 'name' => 'required|max:30', - 'price' => 'required|numeric|max:1000000|min:0', - 'memory' => 'required|numeric|max:1000000|min:5', - 'cpu' => 'required|numeric|max:1000000|min:0', - 'swap' => 'required|numeric|max:1000000|min:0', - 'description' => 'required|string|max:191', - 'disk' => 'required|numeric|max:1000000|min:5', - 'io' => 'required|numeric|max:1000000|min:0', - 'minimum_credits' => 'required|numeric|max:1000000|min:-1', - 'databases' => 'required|numeric|max:1000000|min:0', - 'backups' => 'required|numeric|max:1000000|min:0', - 'allocations' => 'required|numeric|max:1000000|min:0', - 'nodes.*' => 'required|exists:nodes,id', - 'eggs.*' => 'required|exists:eggs,id', - 'disabled' => 'nullable', + "name" => "required|max:30", + "price" => "required|numeric|max:1000000|min:0", + "memory" => "required|numeric|max:1000000|min:5", + "cpu" => "required|numeric|max:1000000|min:0", + "swap" => "required|numeric|max:1000000|min:0", + "description" => "required|string|max:191", + "disk" => "required|numeric|max:1000000|min:5", + "io" => "required|numeric|max:1000000|min:0", + "minimum_credits" => "required|numeric|max:1000000|min:-1", + "databases" => "required|numeric|max:1000000|min:0", + "backups" => "required|numeric|max:1000000|min:0", + "allocations" => "required|numeric|max:1000000|min:0", + "nodes.*" => "required|exists:nodes,id", + "eggs.*" => "required|exists:eggs,id", + "disabled" => "nullable", + "billing_period" => "required|in:hourly,daily,monthly", ]); $disabled = ! is_null($request->input('disabled'));