- fixed an error on finance in admin panel

- flight ident now use this format: VA IATA(if empty ICAO) + Flight Number + - + Flight Code (without C) + - + Flight Leg (without L)
- added function __trans_choice in helpers.php for translation
- fixed error in flight edit/insert panel not showing/inserting Tuesday in days
- fixed an error occurring when metar retrieved is empty
- edited now-ui-kit.css to align login fields correctly
- added /public/assets/frontend/js/core/jquery-3.3.1.min.js to fix a missed resource error in authentication pages
- added translations file for en and it locales
- translated all the frontend templates

app/Http/Controllers/Admin/FinanceController.php

@@ -51,7 +51,7 @@ class FinanceController extends Controller
         # group by the airline
         foreach ($airlines as $airline) {
             # Return all the transactions, grouped by the transaction group
-            $transactions = JournalTransaction::groupBy('transaction_group')
+            $transactions = JournalTransaction::groupBy('transaction_group', 'currency')
                 ->selectRaw('transaction_group, currency, 
                              SUM(credit) as sum_credits, 
                              SUM(debit) as sum_debits')

app/Models/Airline.php

@@ -69,7 +69,10 @@ class Airline extends Model
      */
     public function getCodeAttribute()
     {
-        return $this->icao;
+		if ($this->iata && $this->iata !== '')
+			return $this->iata;
+		else
+			return $this->icao;
     }
 
     /**

app/Models/Flight.php

@@ -112,12 +112,12 @@ class Flight extends Model
         $flight_id = $this->airline->code;
         $flight_id .= $this->flight_number;
 
-        if (filled($this->route_leg)) {
-            $flight_id .= '/L'.$this->route_leg;
+        if (filled($this->route_code)) {
+            $flight_id .= '-'.$this->route_code;
         }
 
-        if (filled($this->route_code)) {
-            $flight_id .= '/C'.$this->route_code;
+        if (filled($this->route_leg)) {
+            $flight_id .= '-'.$this->route_leg;
         }
 
         return $flight_id;

app/Services/Metar/AviationWeather.php

@@ -32,7 +32,10 @@ class AviationWeather extends Metar
                 try {
                     $res = Http::get($url, []);
                     $xml = simplexml_load_string($res);
-                    return $xml->data->METAR->raw_text->__toString();
+					if (count($xml->data->METAR->raw_text) == 0)
+						return '';
+					else
+						return $xml->data->METAR->raw_text->__toString();
 
                 } catch (\Exception $e) {
                     return '';

app/Support/Metar.php

@@ -481,9 +481,9 @@ class Metar implements \ArrayAccess
         $time_diff = floor(($now - $local) / 60);
 
         if ($time_diff < 91) {
-            $this->set_result_value('observed_age', $time_diff.' min. ago');
+            $this->set_result_value('observed_age', $time_diff.' '.__trans_choice('min ago', $time_diff));
         } else {
-            $this->set_result_value('observed_age', floor($time_diff / 60).':'.sprintf("%02d", $time_diff % 60).' hr. ago');
+            $this->set_result_value('observed_age', floor($time_diff / 60).':'.sprintf("%02d", $time_diff % 60).' '.__trans_choice('hr ago', floor($time_diff / 60)));
         }
     }
 

app/helpers.php

@@ -221,3 +221,19 @@ if (!function_exists('_fmt')) {
         return $line;
     }
 }
+
+if (!function_exists('__trans_choice')) {
+    /**
+     * Translates the given message based on a count from json key.
+     *
+     * @param $key
+     * @param $number
+     * @param array $replace
+     * @param null $locale
+     * @return string
+     */
+    function __trans_choice($key, $number, array $replace = [], $locale = null)
+    {
+        return trans_choice(__($key), $number, $replace, $locale);
+    }
+}