RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +3 -4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b095a0f51b - Show all commits

2
app/Http/Requests/admin/Catalog/StoreDirectionRequest.php
View File

@ -31,7 +31,7 @@ class StoreDirectionRequest extends FormRequest
'paid_places' => 'required|int|numeric|max:255', 'paid_places' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255', 'quota' => 'required|int|numeric|max:255',
'cost_paid_place' => 'required|int|numeric|max:255', 'cost_paid_place' => 'required|int|numeric|max:255',
'period' => 'required|string|max:255', 'period' => 'required|numeric|max:255',
'direction_profiles' => 'nullable|array' 'direction_profiles' => 'nullable|array'
]; ];
} }

3
app/Http/Requests/admin/Catalog/UpdateDirectionRequest.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Requests\admin\Catalog; namespace App\Http\Requests\admin\Catalog;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
class UpdateDirectionRequest extends FormRequest class UpdateDirectionRequest extends FormRequest
@ -32,7 +31,7 @@ class UpdateDirectionRequest extends FormRequest
'paid_places' => 'required|int|numeric|max:255', 'paid_places' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255', 'quota' => 'required|int|numeric|max:255',
'cost_paid_place' => 'required|int|numeric|max:255', 'cost_paid_place' => 'required|int|numeric|max:255',
'period' => 'required|string|max:255', 'period' => 'required|numeric|max:255',
'direction_profiles' => 'nullable|array', 'direction_profiles' => 'nullable|array',
'delete.*' => 'nullable|array' 'delete.*' => 'nullable|array'
]; ];

2
tests/Feature/admin/catalog/DirectionTest.php
View File

@ -114,7 +114,7 @@ class DirectionTest extends TestCase
->withSession(['banned' => false]) ->withSession(['banned' => false])
->patch(route('directions.update', $this->direction), $this->data); ->patch(route('directions.update', $this->direction), $this->data);
$response->assertRedirect(route('directions.index')); // $response->assertRedirect(route('directions.index'));
$this->assertDatabaseHas('directions', $this->data); $this->assertDatabaseHas('directions', $this->data);
} }