Merge branch 'hotfix/2.1.0.e'

daveroverts · Jan 5, 2021 · fe7735a · fe7735a
2 parents 57321ad + 6ad8cfe
commit fe7735a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [v2.1.0.c](https://github.com/daveroverts/bmac/compare/v2.1.0.b...v2.1.0.c) - 2021-01-05
+## [v2.1.0.e](https://github.com/daveroverts/bmac/compare/v2.1.0.d...v2.1.0.e) - 2021-01-05
+
+### Changed
+
+- Fix for times not showing in 'views.booking.edit' view.
+
+## [v2.1.0.d](https://github.com/daveroverts/bmac/compare/v2.1.0.c...v2.1.0.d) - 2021-01-05
 
 ### Added
 - Added '/ddev' to .gitignore.

diff --git a/resources/views/booking/edit.blade.php b/resources/views/booking/edit.blade.php
@@ -41,19 +41,19 @@ class="form-control{{ $errors->has('callsign') ? ' is-invalid' : '' }}"
                         </div>
 
                         @if($booking->event->uses_times)
-                            @if($booking->getRawOriginal('ctot'))
+                            @if($flight->getRawOriginal('ctot'))
                                 {{--CTOT--}}
                                 <div class="form-group row">
                                     <label for="ctot" class="col-md-4 col-form-label text-md-right"> CTOT</label>
 
                                     <div class="col-md-6">
-                                        <div class="form-control-plaintext"><strong>{{ $flight->FormattedCtot }}</strong></div>
+                                        <div class="form-control-plaintext"><strong>{{ $flight->formattedCtot }}</strong></div>
 
                                     </div>
                                 </div>
                             @endif
 
-                            @if($booking->getRawOriginal('eta'))
+                            @if($flight->getRawOriginal('eta'))
                                 {{--ETA--}}
                                 <div class="form-group row">
                                     <label for="eta" class="col-md-4 col-form-label text-md-right"> ETA</label>