From 56a9bc2bdd1638730e2637e4abd872fc075a3489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 29 Apr 2020 14:33:55 +0200
Subject: [PATCH] [v1] Include validation erorrs for migration (#3660)

* Add

* Fix
---
 resources/views/migration/companies.blade.php       | 4 ++--
 resources/views/migration/endpoint.blade.php        | 2 ++
 resources/views/migration/includes/errors.blade.php | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/views/migration/companies.blade.php b/resources/views/migration/companies.blade.php
index d521a80ec0b1..4882b8d877eb 100644
--- a/resources/views/migration/companies.blade.php
+++ b/resources/views/migration/companies.blade.php
@@ -18,8 +18,8 @@
                     
                 @foreach($companies as $company)
                 <div class="form-check">
-                    <input class="form-check-input" type="checkbox" name="companies[{{ $company->id }}][id]" id="company1" value="{{ $company->id }}" checked>
-                    <label class="form-check-label" for="company1">
+                    <input class="form-check-input" id="company_{{ $company->id }}" type="checkbox" name="companies[{{ $company->id }}][id]" id="company1" value="{{ $company->id }}" checked>
+                    <label class="form-check-label" for="company_{{ $company->id }}">
                         Name: {{ $company->settings->name }} ID: {{ $company->id }}
                     </label>
                 </div>
diff --git a/resources/views/migration/endpoint.blade.php b/resources/views/migration/endpoint.blade.php
index 3ff3162a4702..05f799359dfb 100644
--- a/resources/views/migration/endpoint.blade.php
+++ b/resources/views/migration/endpoint.blade.php
@@ -4,6 +4,8 @@
     @parent
     @include('accounts.nav', ['selected' => ACCOUNT_MANAGEMENT])
 
+    @include('migration.includes.errors')
+
     <div class="panel panel-default">
         <div class="panel-heading">
             <h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3>
diff --git a/resources/views/migration/includes/errors.blade.php b/resources/views/migration/includes/errors.blade.php
index 88a540f0e135..0488520b425c 100644
--- a/resources/views/migration/includes/errors.blade.php
+++ b/resources/views/migration/includes/errors.blade.php
@@ -4,4 +4,12 @@
         <p>{!! $error !!}</p>
     @endforeach
 </div>
+@endif
+
+@if($errors->any())
+<div class="alert alert-danger">
+    @foreach($errors->all() as $error)
+        <p>{!! $error !!}</p>
+    @endforeach
+</div>
 @endif
\ No newline at end of file