diff --git a/app/Http/Controllers/Logistics/FuelController.php b/app/Http/Controllers/Logistics/FuelController.php index 77d6b7f0b..0107f0e88 100644 --- a/app/Http/Controllers/Logistics/FuelController.php +++ b/app/Http/Controllers/Logistics/FuelController.php @@ -1,6 +1,6 @@ with('jumpGates', $jumpGates) + return view('logistics.fuel')->with('jumpGates', $jumpGates) ->with('lava', $lava); } - } diff --git a/resources/views/layouts/admin/permissions/b4.blade.php b/resources/views/layouts/admin/permissions/b4.blade.php deleted file mode 100644 index e682b8d25..000000000 --- a/resources/views/layouts/admin/permissions/b4.blade.php +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - {{ config('app.name', 'W4RP Services') }} - - - - - - - - - - @include('inc.ajax.permissions') - - - @include('layouts.navbar') -
- @include('inc.messages') -
- @yield('content') - - - - - - - \ No newline at end of file diff --git a/resources/views/logistics/display/contracts.blade.php b/resources/views/logistics/display/contracts.blade.php deleted file mode 100644 index 632193068..000000000 --- a/resources/views/logistics/display/contracts.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -@extends('layouts.b4') -@section('content') -@if($totalCount == 0) -
-
-

Logistics Contracts

-
-
-

No open logistics contracts

-
-
-@else -
-
-

Status

-
-
-
- {!! $lava->render('GaugeChart', 'Open Contracts', 'gauge-status-div') !!} -
-
-
-
-

Open Contracts

-
-
- - - - - - - - - - - @foreach($open as $op) - - - - - - - - - @endforeach - -
Date IssuedDays To CompleteCollateralRewardVolumeStatus
{{ $op->date_issued }}{{ $op->days_to_complete }}{{ $op->collateral }}{{ $op->reward }}{{ $op->volume }}{{ $op->status }}
-
-
-
-
-

In Progress Contracts

-
-
- - - - - - - - - - - @foreach($inProgress as $in) - - - - - - - - - @endforeach - -
Date IssuedDays To CompleteCollateralRewardVolumeStatus
{{ $in->date_issued }}{{ $in->days_to_complete }}{{ $in->collateral }}{{ $in->reward }}{{ $in->volume }}{{ $in->status }}
-
-
-
-
-

Finished Contracts

-
-
- - - - - - - - - - - @foreach($finished as $fin) - - - - - - - - - @endforeach - -
Date IssuedDays To CompleteCollateralRewardVolumeStatus
{{ $fin->date_issued }}{{ $fin->days_to_complete }}{{ $fin->collateral }}{{ $fin->reward }}{{ $fin->volume }}{{ $fin->status }}
-
-
-@endif -@endsection \ No newline at end of file diff --git a/resources/views/logistics/display/courier.blade.php b/resources/views/logistics/display/courier.blade.php deleted file mode 100644 index a4c186b66..000000000 --- a/resources/views/logistics/display/courier.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@extends('layouts.b4') -@section('content') -
-
-

Courier Contract Details

-
-
- Start System: {{ $startSystem }}
- End System: {{ $endSystem }}
- Contract To: {{ $corporation }}
- Reward: {{ number_format($reward, 2, '.', ',') }}
- Collateral: {{ number_format($collateral, 2, '.', ',') }}
- Expiration: 7 days
- Days To Complete: 7 days
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/logistics/display/courierform.blade.php b/resources/views/logistics/display/courierform.blade.php deleted file mode 100644 index 82b81075c..000000000 --- a/resources/views/logistics/display/courierform.blade.php +++ /dev/null @@ -1,33 +0,0 @@ -@extends('layouts.b4') -@section('content') -
-
-
-

Courier Calculation Form

-
-
- {!! Form::open([ - 'action' => 'Logistics\LogisticsController@displayContractDetails', - 'method' => 'POST', - ]) !!} -
- {{ Form::label('route', 'Route') }} - {{ Form::select('route', $routes, 'None', ['class' => 'form-control']) }} -
-
- {{ Form::label('volume', 'Volume') }} - {{ Form::text('volume', null, ['class' => 'form-control']) }} -
-
- {{ Form::label('collateral', 'Collateral') }} - {{ Form::text('collateral', null, ['class' => 'form-control', 'placeholder' => '1,000.00 ISK']) }} -
-
- {{ Form::label('type', 'Type') }} - {{ Form::select('type', $type, 'None', ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/logistics/display/fuel.blade.php b/resources/views/logistics/fuel.blade.php similarity index 100% rename from resources/views/logistics/display/fuel.blade.php rename to resources/views/logistics/fuel.blade.php diff --git a/resources/views/logistics/layouts/b4.blade.php b/resources/views/logistics/layouts/b4.blade.php deleted file mode 100644 index 008bd9897..000000000 --- a/resources/views/logistics/layouts/b4.blade.php +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - {{ config('app.name', 'W4RP Services') }} - - - - - - - - - - - - - @include('layouts.navbar') -
- @include('inc.messages') -
- @yield('content') - - - - - - - - \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 6545a490b..6e94800c5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -108,7 +108,7 @@ Route::group(['middleware' => ['auth']], function(){ /** * Fuel Controller display pages */ - Route::get('/logistics/fuel/structures', 'Fuel\FuelController@displayStructures'); + Route::get('/logistics/fuel/structures', 'Logistics\FuelController@displayStructures'); /** * Moon Controller display pages