From eaf9b367c19d85e6d6070e8032a036ed98864ebd Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Wed, 5 May 2021 19:25:26 +0200
Subject: [PATCH] Moved email settings in admin panel

Moved email settings from General to Email
---
 packages/Webkul/Admin/src/Config/system.php | 80 +++++++++++----------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index 0e6e1e1de..d6eb00153 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -30,41 +30,6 @@ return [
                 'channel_based' => true
             ],
         ],
-    ], [
-        'key'    => 'general.general.email_settings',
-        'name'   => 'admin::app.admin.system.email-settings',
-        'sort'   => 1,
-        'fields' => [
-            [
-                'name'          => 'sender_name',
-                'title'         => 'admin::app.admin.system.email-sender-name',
-                'type'          => 'text',
-                'validation'    => 'required|max:50',
-                'channel_based' => true,
-                'default_value' => config('mail.from.name'),
-            ],  [
-                'name'          => 'shop_email_from',
-                'title'         => 'admin::app.admin.system.shop-email-from',
-                'type'          => 'text',
-                'validation'    => 'required|email',
-                'channel_based' => true,
-                'default_value' => config('mail.from.address'),
-            ],  [
-                'name'          => 'admin_name',
-                'title'         => 'admin::app.admin.system.admin-name',
-                'type'          => 'text',
-                'validation'    => 'required|max:50',
-                'channel_based' => true,
-                'default_value' => config('mail.admin.name'),
-            ],  [
-                'name'          => 'admin_email',
-                'title'         => 'admin::app.admin.system.admin-email',
-                'type'          => 'text',
-                'validation'    => 'required|email',
-                'channel_based' => true,
-                'default_value' => config('mail.admin.address'),
-            ],
-        ],
     ], [
         'key'  => 'general.content',
         'name' => 'admin::app.admin.system.content',
@@ -424,6 +389,49 @@ return [
         'key'  => 'emails',
         'name' => 'admin::app.admin.emails.email',
         'sort' => 5,
+    ], [
+        'key'  => 'emails.configure',
+        'name' => 'admin::app.admin.system.email-settings',
+        'sort' => 1,
+    ], [
+        'key'    => 'emails.configure.email_settings',
+        'name'   => 'admin::app.admin.system.email-settings',
+        'sort'   => 1,
+        'fields' => [
+            [
+                'name'          => 'sender_name',
+                'title'         => 'admin::app.admin.system.email-sender-name',
+                'type'          => 'text',
+                'info'          => 'This name will be displayed in the customers inbox',
+                'validation'    => 'required|max:50',
+                'channel_based' => true,
+                'default_value' => config('mail.from.name'),
+            ],  [
+                'name'          => 'shop_email_from',
+                'title'         => 'admin::app.admin.system.shop-email-from',
+                'type'          => 'text',
+                'info'          => 'The email address of this channel to send emails to your customers',
+                'validation'    => 'required|email',
+                'channel_based' => true,
+                'default_value' => config('mail.from.address'),
+            ],  [
+                'name'          => 'admin_name',
+                'title'         => 'admin::app.admin.system.admin-name',
+                'type'          => 'text',
+                'info'          => 'This name will be displayed in all admin emails',
+                'validation'    => 'required|max:50',
+                'channel_based' => true,
+                'default_value' => config('mail.admin.name'),
+            ],  [
+                'name'          => 'admin_email',
+                'title'         => 'admin::app.admin.system.admin-email',
+                'type'          => 'text',
+                'info'          => 'The email address of the admin for this channel to receive emails',
+                'validation'    => 'required|email',
+                'channel_based' => true,
+                'default_value' => config('mail.admin.address'),
+            ],
+        ],
     ], [
         'key'  => 'emails.general',
         'name' => 'admin::app.admin.emails.notification_label',
@@ -485,4 +493,4 @@ return [
             ],
         ],
     ],
-];
\ No newline at end of file
+];