From 3f7388394c8c238cb83f73e09d15f3713922d794 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 31 Jul 2020 16:05:30 +0530
Subject: [PATCH 1/3] Translation Added

---
 packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
index 4611ad6b5..01009ed35 100644
--- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
+++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -46,6 +46,7 @@ class ConfigurationForm extends FormRequest
     {
         return [
             'general.design.admin_logo.logo_image.mimes' => 'Invalid file format. Use only jpeg, bmp, png, jpg.',
+            'general.design.admin_logo.logo_image.max' => ' Image failed to upload.'
         ];
     }
 }

From 9c68a78597d7391bbbe5bce9e2afd62fa3416ef7 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 31 Jul 2020 16:58:49 +0530
Subject: [PATCH 2/3] Attribute Added

---
 .../Admin/src/Http/Requests/ConfigurationForm.php   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
index 01009ed35..fab1907ca 100644
--- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
+++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -46,7 +46,16 @@ class ConfigurationForm extends FormRequest
     {
         return [
             'general.design.admin_logo.logo_image.mimes' => 'Invalid file format. Use only jpeg, bmp, png, jpg.',
-            'general.design.admin_logo.logo_image.max' => ' Image failed to upload.'
         ];
     }
-}
+
+    /**
+     * Set the attribute name.
+     */
+    public function attributes()
+    {
+        return [
+            'general.design.admin_logo.logo_image' => 'Logo Image',
+        ];
+    }
+}
\ No newline at end of file

From 19d8ef05ae4853faea2ebbdcd120bc186b41e62d Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Tue, 4 Aug 2020 10:54:45 +0530
Subject: [PATCH 3/3] Favicon Image Issue Fixed

---
 .../Admin/src/Http/Requests/ConfigurationForm.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
index fab1907ca..3eb339d75 100644
--- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
+++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -29,9 +29,17 @@ class ConfigurationForm extends FormRequest
         if (request()->has('general.design.admin_logo.logo_image')
             && ! request()->input('general.design.admin_logo.logo_image.delete')
         ) {
-            $this->rules = [
-                'general.design.admin_logo.logo_image'  => 'required|mimes:jpeg,bmp,png,jpg',
-            ];
+            $this->rules = array_merge($this->rules, [
+                'general.design.admin_logo.logo_image'  => 'required|mimes:jpeg,bmp,png,jpg|max:5000',
+            ]);
+        }
+
+        if (request()->has('general.design.admin_logo.favicon')
+            && ! request()->input('general.design.admin_logo.favicon.delete')
+        ) {
+            $this->rules = array_merge($this->rules, [
+                'general.design.admin_logo.favicon'  => 'required|mimes:jpeg,bmp,png,jpg|max:5000',
+            ]);
         }
 
         return $this->rules;
@@ -56,6 +64,7 @@ class ConfigurationForm extends FormRequest
     {
         return [
             'general.design.admin_logo.logo_image' => 'Logo Image',
+            'general.design.admin_logo.favicon' => 'Favicon Image'
         ];
     }
 }
\ No newline at end of file