From 25edb1386a2c91c954691dc659fc3e1faa8e972c Mon Sep 17 00:00:00 2001 From: farid saravi Date: Sun, 18 Oct 2020 20:00:18 +0330 Subject: [PATCH 1/2] feat: add find language --- app/Http/Kernel.php | 1 + app/Http/Middleware/FindLanguage.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 app/Http/Middleware/FindLanguage.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a3d8c48..7ace88e 100644 --- a/app/Http/Kernel.php +++ b/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, ]; /** diff --git a/app/Http/Middleware/FindLanguage.php b/app/Http/Middleware/FindLanguage.php new file mode 100644 index 0000000..ffba8bd --- /dev/null +++ b/app/Http/Middleware/FindLanguage.php @@ -0,0 +1,24 @@ +header('accept-language')) { + app()->setLocale($language); + } + return $next($request); + } +} From 4021f51f2acb8e81bbfdf37dfce5b4fc1a00cae7 Mon Sep 17 00:00:00 2001 From: Saeid Date: Sun, 18 Oct 2020 20:23:05 +0330 Subject: [PATCH 2/2] feat: feat cost-daily in chart --- resources/js/Global/plugins/chart/apexhart/type/bar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/js/Global/plugins/chart/apexhart/type/bar.js b/resources/js/Global/plugins/chart/apexhart/type/bar.js index 1e8be62..97d66b8 100644 --- a/resources/js/Global/plugins/chart/apexhart/type/bar.js +++ b/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(); } }