From 40fafca93069c43cda1615b970c53e2562f69840 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Tue, 18 Dec 2018 13:41:25 +0530
Subject: [PATCH] Configuration redirect to first config page fixed

---
 .../Controllers/ConfigurationController.php   | 34 +++++++++++++++----
 .../Ui/src/Resources/assets/sass/app.scss     |  1 +
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
index 731225966..e55fd524e 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
@@ -77,9 +77,11 @@ class ConfigurationController extends Controller
      */
     public function index()
     {
-        if(!request()->route('slug') && !request()->route('slug2'))
-            return redirect()->route('admin.configuration.index', $this->getDefaultConfigSlugs());
+        $slugs = $this->getDefaultConfigSlugs();
 
+        if(count($slugs)) {
+            return redirect()->route('admin.configuration.index', $slugs); 
+        }
 
         return view($this->_config['view'], ['config' => $this->configTree]);
     }
@@ -91,12 +93,32 @@ class ConfigurationController extends Controller
      */
     public function getDefaultConfigSlugs()
     {
-        $firstItem = current($this->configTree->items);
-        $secondItem = current($firstItem['children']);
+        $slugs = [];
 
-        $slugs = explode('.', $secondItem['key']);
+        if(!request()->route('slug')) {
+            $firstItem = current($this->configTree->items);
+            $secondItem = current($firstItem['children']);
 
-        return ['slug' => current($slugs), 'slug2' => end($slugs)];
+            $temp = explode('.', $secondItem['key']);
+
+            $slugs = [
+                'slug' => current($temp),
+                'slug2' => end($temp)
+            ];
+        } else {
+            if(!request()->route('slug2')) {
+                $secondItem = current($this->configTree->items[request()->route('slug')]['children']);
+
+                $temp = explode('.', $secondItem['key']);
+
+                $slugs = [
+                    'slug' => current($temp),
+                    'slug2' => end($temp)
+                ];
+            }
+        }
+
+        return $slugs;
     }
 
     /**
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 2546eb135..5e9ff99e1 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -831,6 +831,7 @@ h2 {
 
 .image-wrapper {
     margin-bottom: 20px;
+    margin-top: 10px;
     display: inline-block;
     width: 100%;