Merge branch 'master' of /home/administrator/utils/gitea/git/repositories/willaengine-project/willaengine

app/Http/Kernel.php

@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\FindLanguage::class,
     ];
 
     /**

app/Http/Middleware/FindLanguage.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use WM\Core\Infrastructures\Enumerations\Language;
+
+class FindLanguage
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($language = $request->header('accept-language')) {
+            app()->setLocale($language);
+        }
+        return $next($request);
+    }
+}

resources/js/Global/plugins/chart/apexhart/type/bar.js

@@ -41,10 +41,13 @@ export default class extends chart {
     setOptions() {
         switch (this.type) {
             case 'weekly':
+            case 'cost-weekly':
                 return this.setWeekly();
             case 'monthly':
+            case 'cost-monthly':
                 return this.setMonthly();
             case 'daily':
+            case 'cost-daily':
                 return this.setDaily();
         }
     }