Bump ckeditor4 from 4.14.0 to 4.18.0

Bumps [ckeditor4](https://github.com/ckeditor/ckeditor4-releases) from 4.14.0 to 4.18.0.
- [Release notes](https://github.com/ckeditor/ckeditor4-releases/releases)
- [Changelog](https://github.com/ckeditor/ckeditor4-releases/blob/master/CHANGES.md)
- [Commits](https://github.com/ckeditor/ckeditor4-releases/compare/4.14.0...4.18.0)

---
updated-dependencies:
- dependency-name: ckeditor4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

app/Services/FareService.php

@@ -169,7 +169,7 @@ class FareService extends Service
             }
         }
 
-        // $fare->notes = '';
+        $fare->notes = '';
         $fare->active = true;
 
         return $fare;

app/Services/ImportExport/AirportImporter.php

@@ -18,7 +18,7 @@ class AirportImporter extends ImportExport
      */
     public static $columns = [
         'icao'                 => 'required',
-        'iata'                 => 'nullable',
+        'iata'                 => 'required',
         'name'                 => 'required',
         'location'             => 'nullable',
         'country'              => 'nullable',

app/Support/Money.php

@@ -33,7 +33,7 @@ class Money
     /**
      * Create from a dollar amount
      *
-     * @param mixed $amount The amount in dollar
+     * @param mixed $amount The amount in pennies
      *
      * @throws \UnexpectedValueException
      * @throws \InvalidArgumentException
@@ -52,12 +52,12 @@ class Money
      *
      * @param mixed $amount
      *
-     * @return int
+     * @return float|int
      */
     public static function convertToSubunit($amount)
     {
         $currency = setting('units.currency', 'USD');
-        return (int) ($amount * config('money.'.$currency.'.subunit'));
+        return (int) $amount * config('money.'.$currency.'.subunit');
     }
 
     /**

package-lock.json

@@ -12,7 +12,7 @@
         "bootstrap": "~4.3",
         "bootstrap-sass": "^3.4.1",
         "bootstrap3": "npm:bootstrap@~3.4",
-        "ckeditor4": "4.14.0",
+        "ckeditor4": "4.18.0",
         "cookieconsent": "^3.1.0",
         "cross-env": "^5.1.6",
         "eonasdan-bootstrap-datetimepicker": "^4.17.47",
@@ -54,8 +54,8 @@
         "eslint-plugin-jsx-a11y": "^6.2.3",
         "eslint-plugin-react": "^7.21.5",
         "node-gyp": "~9.1.0",
-        "sass": "^1.32.13",
-        "sass-loader": "^8.0.2",
+        "sass": "^1.54.5",
+        "sass-loader": "^12.1.0",
         "tailwindcss": "^0.5.3",
         "vue-template-compiler": "^2.6.12",
         "webpack-bundle-analyzer": "^3.9.0",
@@ -3548,9 +3548,9 @@
       }
     },
     "node_modules/ckeditor4": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.14.0.tgz",
-      "integrity": "sha512-g5p3bhbxbwB094bE7ss0rOyvG/azYdRjLTyngnPM2+fKZhnPrMVaFDx3SiiWKB+zyvndT3Deu54VTv/z2MQJCA=="
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.18.0.tgz",
+      "integrity": "sha512-O4tnQCH0APKrBsz78L+m48s9Cs90aq0Nsatmh9CUj2YBTh8UZYdYcelBLVA84SlwA1nsx07aC76Zn08vgHqmLQ=="
     },
     "node_modules/clean-css": {
       "version": "5.3.1",
@@ -10241,19 +10241,16 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
       "dev": true,
       "dependencies": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
       },
       "engines": {
-        "node": ">= 8.9.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10261,9 +10258,10 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "sass": "^1.3.0",
-        "webpack": "^4.36.0 || ^5.0.0"
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "fibers": {
@@ -10274,62 +10272,12 @@
         },
         "sass": {
           "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
         }
       }
     },
-    "node_modules/sass-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/sass-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/sass-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/sass-loader/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/schema-utils": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -15092,9 +15040,9 @@
       }
     },
     "ckeditor4": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.14.0.tgz",
-      "integrity": "sha512-g5p3bhbxbwB094bE7ss0rOyvG/azYdRjLTyngnPM2+fKZhnPrMVaFDx3SiiWKB+zyvndT3Deu54VTv/z2MQJCA=="
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/ckeditor4/-/ckeditor4-4.18.0.tgz",
+      "integrity": "sha512-O4tnQCH0APKrBsz78L+m48s9Cs90aq0Nsatmh9CUj2YBTh8UZYdYcelBLVA84SlwA1nsx07aC76Zn08vgHqmLQ=="
     },
     "clean-css": {
       "version": "5.3.1",
@@ -20036,55 +19984,13 @@
       }
     },
     "sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
       "dev": true,
       "requires": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "schema-utils": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.5",
-            "ajv": "^6.12.4",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
       }
     },
     "schema-utils": {

package.json

@@ -17,7 +17,7 @@
     "bootstrap": "~4.3",
     "bootstrap-sass": "^3.4.1",
     "bootstrap3": "npm:bootstrap@~3.4",
-    "ckeditor4": "4.14.0",
+    "ckeditor4": "4.18.0",
     "cookieconsent": "^3.1.0",
     "cross-env": "^5.1.6",
     "eonasdan-bootstrap-datetimepicker": "^4.17.47",

resources/lang/es-es/user.php

@@ -8,6 +8,6 @@ return [
         'rejected'  => 'Rechazado',
         'on_leave'  => 'En excedencia',
         'suspended' => 'Suspendido',
-        'deleted'   => 'Borrado',
+        'deleted'   => 'Borrar',
     ],
 ];

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

@@ -270,7 +270,7 @@
 
 <div class="row">
   <!-- Active Field -->
-  <div class="col-sm-3">
+  <div class="col-sm-4">
     <div class="checkbox">
       <label class="checkbox-inline">
         {{ Form::label('active', 'Active:') }}
@@ -279,17 +279,7 @@
       </label>
     </div>
   </div>
-  <!-- Visible Field -->
-  <div class="col-sm-3">
-    <div class="checkbox">
-      <label class="checkbox-inline">
-        {{ Form::label('visible', 'Visible:') }}
-        <input name="visible" type="hidden" value="0" />
-        {{ Form::checkbox('visible') }}
-      </label>
-    </div>
-  </div>
-  <div class="col-6">
+  <div class="col-8">
     <div class="text-right">
       {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-info']) }}
     </div>

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

@@ -9,7 +9,6 @@
     <th>Arr Time</th>
     <th>Notes</th>
     <th style="text-align: center;">Active</th>
-    <th style="text-align: center;">Visible</th>
     <th colspan="3" style="text-align: right;">Action</th>
     </thead>
     <tbody>
@@ -38,13 +37,6 @@
             <span class="label label-default">@lang('common.inactive')</span>
           @endif
         </td>
-        <td style="text-align: center;">
-          @if($flight->visible == 1)
-            <span class="text-success"><i class="fas fa-check fa2x" title="Visible"></i></span>
-          @else
-            <span class="text-danger"><i class="fas fa-times fa2x" title="Hidden"></i></span>
-          @endif
-        </td>
         <td style="text-align: right;">
           {{ Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) }}
           <a href="{{ route('admin.flights.edit', [$flight->id]) }}" class='btn btn-sm btn-success btn-icon'><i

resources/views/layouts/default/flights/map.blade.php

@@ -12,8 +12,6 @@
       route_points: {!! json_encode($map_features['route_points']) !!},
       planned_route_line: {!! json_encode($map_features['planned_route_line']) !!},
       metar_wms: {!! json_encode(config('map.metar_wms')) !!},
-      circle_color: '#056093',
-      flightplan_route_color: '#8B008B',
     });
   </script>
 @endsection

resources/views/layouts/default/flights/simbrief_briefing.blade.php

@@ -213,16 +213,43 @@
             <h6><i class="fas fa-info-circle"></i>&nbsp;Prefile ATC Flight Plan</h6>
             <div class="form-container-body">
               <div class="row">
-                <div class="col-3" align="center">
-                  <a href="{{ $simbrief->xml->prefile->ivao->link }}" target="_blank" class="btn btn-info">File > IVAO</a>
+                <div class="col-4" align="center">
+                  <form action="https://fpl.ivao.aero/api/fp/load" method="POST" target="_blank">
+                    <input type="hidden" name="CALLSIGN" value="{{ $simbrief->xml->atc->callsign }}"/>
+                    <input type="hidden" name="RULES" value="I"/>
+                    <input type="hidden" name="FLIGHTTYPE" value="N"/>
+                    <input type="hidden" name="NUMBER" value="1"/>
+                    <input type="hidden" name="ACTYPE" value="{{ $simbrief->xml->aircraft->icaocode }}"/>
+                    <input type="hidden" name="WAKECAT" value="{{ $wakecat }}"/>
+                    <input type="hidden" name="EQUIPMENT" value="{{ $equipment }}"/>
+                    <input type="hidden" name="TRANSPONDER" value="{{ $transponder }}"/>
+                    <input type="hidden" name="DEPICAO" value="{{ $simbrief->xml->origin->icao_code}}"/>
+                    <input type="hidden" name="DEPTIME" value="{{ date('Hi', $simbrief->xml->times->est_out->__toString()) }}"/>
+                    <input type="hidden" name="SPEEDTYPE" value="{{ $simbrief->xml->atc->initial_spd_unit }}"/>
+                    <input type="hidden" name="SPEED" value="{{ $simbrief->xml->atc->initial_spd }}"/>
+                    <input type="hidden" name="LEVELTYPE" value="{{ $simbrief->xml->atc->initial_alt_unit }}"/>
+                    <input type="hidden" name="LEVEL" value="{{ $simbrief->xml->atc->initial_alt }}"/>
+                    <input type="hidden" name="ROUTE" value="{{ $simbrief->xml->general->route_ifps }}"/>
+                    <input type="hidden" name="DESTICAO" value="{{ $simbrief->xml->destination->icao_code }}"/>
+                    <input type="hidden" name="EET" value="@secstohhmm($simbrief->xml->times->est_time_enroute)"/>
+                    <input type="hidden" name="ALTICAO" value="{{ $simbrief->xml->alternate->icao_code}}"/>
+                    <input type="hidden" name="ALTICAO2" value="{{ $simbrief->xml->alternate2->icao_code}}"/>
+                    <input type="hidden" name="OTHER" value="{{ $simbrief->xml->atc->section18 }}"/>
+                    <input type="hidden" name="ENDURANCE" value="@secstohhmm($simbrief->xml->times->endurance)"/>
+                    <input type="hidden" name="POB" value="{{ $simbrief->xml->weights->pax_count }}"/>
+                    <input id="ivao_prefile" type="submit" class="btn btn-primary" value="File ATC on IVAO"/>
+                  </form>
                 </div>
-                <div class="col-3" align="center">
-                  <a href="{{ $simbrief->xml->prefile->vatsim->link }}" target="_blank" class="btn btn-info">File > VATSIM</a>
+                <div class="col-4" align="center">
+                  <form action="https://my.vatsim.net/pilots/flightplan" method="GET" target="_blank">
+                    <input type="hidden" name="raw" value="{{ $simbrief->xml->atc->flightplan_text }}">
+                    <input type="hidden" name="fuel_time" value="@secstohhmm($simbrief->xml->times->endurance)">
+                    <input type="hidden" name="speed" value="@if(substr($simbrief->xml->atc->initial_spd,0,1) === '0') {{ substr($simbrief->xml->atc->initial_spd,1) }} @else {{ $simbrief->xml->atc->initial_spd }} @endif">
+                    <input type="hidden" name="altitude" value="{{ $simbrief->xml->general->initial_altitude }}">
+                    <input id="vatsim_prefile" type="submit" class="btn btn-primary" value="File ATC on VATSIM"/>
+                  </form>
                 </div>
-                <div class="col-3" align="center">
-                  <a href="{{ $simbrief->xml->prefile->poscon->link }}" target="_blank" class="btn btn-info">File > POSCON</a>
-                </div>
-                <div class="col-3" align="center">
+                <div class="col-4" align="center">
                   <a
                     href="http://skyvector.com/?chart=304&amp;fpl={{ $simbrief->xml->origin->icao_code}} {{ $simbrief->xml->general->route }} {{ $simbrief->xml->destination->icao_code}}"
                     target="_blank" class="btn btn-info">View Route At SkyVector</a>

resources/views/layouts/default/pireps/show.blade.php

@@ -72,18 +72,16 @@
         </div>
       </div>
 
-      @if(!empty($pirep->distance))
-        <div class="row">
-          <div class="col-12">
-            <div class="progress" style="margin: 20px 0;">
-              <div class="progress-bar progress-bar-success" role="progressbar"
-                  aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"
-                  style="width: {{$pirep->progress_percent}}%;">
-              </div>
+      <div class="row">
+        <div class="col-12">
+          <div class="progress" style="margin: 20px 0;">
+            <div class="progress-bar progress-bar-success" role="progressbar"
+                 aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"
+                 style="width: {{$pirep->progress_percent}}%;">
             </div>
           </div>
         </div>
-      @endif
+      </div>
 
       <div class="row">
         <div class="col-12">

tests/FinanceTest.php

@@ -712,20 +712,20 @@ class FinanceTest extends TestCase
 
         $journalRepo->post(
             $journal,
-            Money::createFromAmount(100.5),
+            Money::createFromAmount(100),
             null,
             $user
         );
 
         $balance = $journalRepo->getBalance($journal);
-        $this->assertEquals(100.5, $balance->getValue());
-        $this->assertEquals(100.5, $journal->balance->getValue());
+        $this->assertEquals(100, $balance->getValue());
+        $this->assertEquals(100, $journal->balance->getValue());
 
         // add another transaction
 
         $journalRepo->post(
             $journal,
-            Money::createFromAmount(24.5),
+            Money::createFromAmount(25),
             null,
             $user
         );
@@ -912,7 +912,7 @@ class FinanceTest extends TestCase
 
         // $this->assertCount(9, $transactions['transactions']);
         $this->assertEquals(3020, $transactions['credits']->getValue());
-        $this->assertEquals(2050.4, $transactions['debits']->getValue());
+        $this->assertEquals(2050.0, $transactions['debits']->getValue());
 
         // Check that all the different transaction types are there
         // test by the different groups that exist
@@ -967,7 +967,7 @@ class FinanceTest extends TestCase
 
 //        $this->assertCount(9, $transactions['transactions']);
         $this->assertEquals(3020, $transactions['credits']->getValue());
-        $this->assertEquals(2050.4, $transactions['debits']->getValue());
+        $this->assertEquals(2050.0, $transactions['debits']->getValue());
 
         // Check that all the different transaction types are there
         // test by the different groups that exist
@@ -1006,7 +1006,7 @@ class FinanceTest extends TestCase
 
         $transactions = $journalRepo->getAllForObject($pirep2);
         $this->assertEquals(3020, $transactions['credits']->getValue());
-        $this->assertEquals(2150.4, $transactions['debits']->getValue());
+        $this->assertEquals(2150.0, $transactions['debits']->getValue());
 
         // Check that all the different transaction types are there
         // test by the different groups that exist
@@ -1115,6 +1115,6 @@ class FinanceTest extends TestCase
 
         //        $this->assertCount(9, $transactions['transactions']);
         $this->assertEquals(3020, $transactions['credits']->getValue());
-        $this->assertEquals(2050.4, $transactions['debits']->getValue());
+        $this->assertEquals(2050.0, $transactions['debits']->getValue());
     }
 }