From 2753c7b1d5aaae1bfb40f31a1cb049b591eb8cae Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Wed, 29 Apr 2020 16:35:04 +0530
Subject: [PATCH] configuration added for favicon in admin

---
 packages/Webkul/Admin/src/Config/system.php                | 6 ++++++
 packages/Webkul/Admin/src/Resources/lang/ar/app.php        | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/en/app.php        | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/fa/app.php        | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/nl/app.php        | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php     | 3 ++-
 .../Admin/src/Resources/views/layouts/master.blade.php     | 7 ++++++-
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index e5c2dc139..71f555aa5 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -99,6 +99,12 @@ return [
                 'type'          => 'image',
                 'channel_based' => true,
                 'validation'    => 'mimes:jpeg,bmp,png,jpg',
+            ], [
+                'name'          => 'favicon',
+                'title'         => 'admin::app.admin.system.favicon',
+                'type'          => 'image',
+                'channel_based' => true,
+                'validation'    => 'mimes:jpeg,bmp,png,jpg',
             ],
         ],
     ], [
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 545db5abe..77d065054 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1304,7 +1304,8 @@ return [
             'all-channels' => 'الكل',
             'all-locales' => 'الكل',
             'invoice-slip-design' => 'Invoice Slip Design',
-            'logo' => 'logo'
+            'logo' => 'logo',
+            'favicon' => 'Favicon'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index db4d43661..5fcd7723f 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1309,7 +1309,8 @@ return [
             'all-channels' => 'All',
             'all-locales' => 'All',
             'invoice-slip-design' => 'Invoice Slip Design',
-            'logo' => 'logo'
+            'logo' => 'logo',
+            'favicon' => 'Favicon'
        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index bb964621a..0a3da78e0 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1310,7 +1310,8 @@ return [
             'all-locales' => 'همه',
             'sandbox' => 'Sandbox',
             'invoice-slip-design' => 'Invoice Slip Design',
-            'logo' => 'logo'
+            'logo' => 'logo',
+            'favicon' => 'Favicon'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 5b839b9d8..b402d567a 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -1309,7 +1309,8 @@ return [
             'all-channels' => 'Alles',
             'all-locales' => 'Alles',
             'invoice-slip-design' => 'Invoice Slip Design',
-            'logo' => 'logo'
+            'logo' => 'logo',
+            'favicon' => 'Favicon'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index 31558f1a3..bb0b0e9fe 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1313,7 +1313,8 @@ return [
             'all-locales' => 'Todos',
             'sandbox' => 'Sandbox',
             'invoice-slip-design' => 'Design da Nota do Pedido',
-            'logo' => 'logo'
+            'logo' => 'logo',
+            'favicon' => 'Favicon'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
index 86512323a..53ce71fd4 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -6,7 +6,12 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="csrf-token" content="{{ csrf_token() }}">
-        <link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
+
+        @if ($favicon = core()->getConfigData('general.design.admin_logo.favicon'))
+            <link rel="icon" sizes="16x16" href="{{ \Illuminate\Support\Facades\Storage::url($favicon) }}" />
+        @else
+            <link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
+        @endif
 
         <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
         <link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">