RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Bram Wubs 2022-10-09 21:11:00 +02:00
parent b7aba93281
commit c1800dc0f9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/StoreJournalEntryRequest.php
View File

@ -18,7 +18,6 @@ class StoreJournalEntryRequest extends FormRequest
*/ */
public function rules(): array public function rules(): array
{ {
// dd($this->all());
return [ return [
'ingredients.date' => ['required', 'array', new ArrayNotEmpty], 'ingredients.date' => ['required', 'array', new ArrayNotEmpty],
'ingredients.date.*' => ['nullable', 'date', 'required_with:ingredients.id.*'], 'ingredients.date.*' => ['nullable', 'date', 'required_with:ingredients.id.*'],
@ -29,7 +28,11 @@ class StoreJournalEntryRequest extends FormRequest
new InArray(Auth::user()->meals_enabled->pluck('value')->toArray()) new InArray(Auth::user()->meals_enabled->pluck('value')->toArray())
], ],
'ingredients.amount' => ['required', 'array', new ArrayNotEmpty], 'ingredients.amount' => ['required', 'array', new ArrayNotEmpty],
'ingredients.amount.*' => ['required_with:ingredients.id.*', 'nullable', new StringIsPositiveDecimalOrFraction], 'ingredients.amount.*' => [
'required_with:ingredients.id.*',
'nullable',
new StringIsPositiveDecimalOrFraction
],
'ingredients.unit' => ['required', 'array'], 'ingredients.unit' => ['required', 'array'],
'ingredients.unit.*' => ['required_with:ingredients.id.*'], 'ingredients.unit.*' => ['required_with:ingredients.id.*'],
'ingredients.id.*' => 'required_with:ingredients.amount.*|nullable', 'ingredients.id.*' => 'required_with:ingredients.amount.*|nullable',