Import/export expenses #194

resources/views/admin/aircraft/import.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Aircraft')
 @section('content')
-    @include('admin.shared.import', ['route' => 'admin.aircraft.import'])
+    @include('admin.common.import', ['route' => 'admin.aircraft.import'])
 @endsection

resources/views/admin/airports/import.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Airports')
 @section('content')
-    @include('admin.shared.import', ['route' => 'admin.airports.import'])
+    @include('admin.common.import', ['route' => 'admin.airports.import'])
 @endsection

resources/views/admin/common/import.blade.php

@@ -0,0 +1,37 @@
+<div class="card border-blue-bottom">
+    <div class="content">
+        <div class="row">
+
+            {{ Form::open(['method' => 'post', 'route' => $route, 'files' => true]) }}
+            <div class="form-group col-12">
+                {{ Form::label('csv_file', 'Chose a CSV file to import') }}
+                {{ Form::file('csv_file', ['accept' => '.csv']) }}
+                <p class="text-danger">{{ $errors->first('csv_file') }}</p>
+            </div>
+
+            <div class="form-group col-md-12">
+                <div class="text-right">
+                    {{ Form::button('Start Import', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+                </div>
+            </div>
+
+            {{ Form::close() }}
+
+            <div class="form-group col-md-12">
+                @if($logs['success'])
+                    <h4>Logs</h4>
+                    @foreach($logs['success'] as $line)
+                        <p>{{ $line }}</p>
+                    @endforeach
+                @endif
+
+                @if($logs['errors'])
+                    <h4>Errors</h4>
+                    @foreach($logs['errors'] as $line)
+                        <p>{{ $line }}</p>
+                    @endforeach
+                @endif
+            </div>
+        </div>
+    </div>
+</div>

resources/views/admin/expenses/import.blade.php

@@ -0,0 +1,6 @@
+@extends('admin.app')
+@section('title', 'Import Expenses')
+
+@section('content')
+    @include('admin.common.import', ['route' => 'admin.expenses.import'])
+@endsection

resources/views/admin/expenses/index.blade.php

@@ -1,12 +1,10 @@
 @extends('admin.app')
-
 @section('title', 'Expenses')
+
 @section('actions')
-    <li>
-        <a href="{{ route('admin.expenses.create') }}">
-            <i class="ti-plus"></i>
-            Add New</a>
-    </li>
+    <li><a href="{{ route('admin.expenses.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+    <li><a href="{{ route('admin.expenses.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+    <li><a href="{{ route('admin.expenses.create') }}"><i class="ti-plus"></i>Add New</a></li>
 @endsection
 
 @section('content')

resources/views/admin/flights/import.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Flights')
 @section('content')
-    @include('admin.shared.import', ['route' => 'admin.flights.import'])
+    @include('admin.common.import', ['route' => 'admin.flights.import'])
 @endsection

resources/views/admin/shared/import.blade.php

@@ -1,32 +0,0 @@
-<div class="card border-blue-bottom">
-    <div class="content">
-        {{ Form::open(['method' => 'post', 'route' => $route, 'files' => true]) }}
-
-        <div class="row">
-            <div class="form-group col-12">
-                {{ Form::label('csv_file', 'Chose a CSV file to import') }}
-                {{ Form::file('csv_file', ['accept' => '.csv']) }}
-            </div>
-
-            <div class="form-group col-md-12">
-                <div class="text-right">
-                    {{ Form::button('Start Import', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                </div>
-            </div>
-
-        {{ Form::close() }}
-
-            <div class="form-group col-md-12">
-                <h4>Logs</h4>
-                @foreach($logs['success'] as $line)
-                    <p>{{ $line }}</p>
-                @endforeach
-
-                <h4>Errors</h4>
-                @foreach($logs['failed'] as $line)
-                    <p>{{ $line }}</p>
-                @endforeach
-            </div>
-        </div>
-    </div>
-</div>

resources/views/admin/subfleets/import.blade.php

@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Subfleets')
 @section('content')
-    @include('admin.shared.import', ['route' => 'admin.subfleets.import'])
+    @include('admin.common.import', ['route' => 'admin.subfleets.import'])
 @endsection