From 9343f92218004570bc8269b347ce117b50dfcfb3 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 7 Aug 2020 14:15:20 +0530
Subject: [PATCH] Default Value Implemented

---
 packages/Webkul/Admin/src/Config/system.php                 | 6 +++++-
 .../src/Resources/views/configuration/field-type.blade.php  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index efad8bd08..419e79d55 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -27,7 +27,7 @@ return [
                         'value' => 'kgs',
                     ],
                 ],
-                'channel_based' => true,
+                'channel_based' => true
             ],
         ],
     ], [
@@ -41,24 +41,28 @@ return [
                 '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'),
             ],
         ],
     ], [
diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 3bf060fcb..9271b8092 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -94,7 +94,7 @@
 
             @if ($field['type'] == 'text')
 
-                <input type="text" v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="{{ old($name) ?: core()->getConfigData($name) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
+                <input type="text" v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="{{ old($name) ?: (core()->getConfigData($name) ? core()->getConfigData($name) : (isset($field['default_value']) ? $field['default_value'] : '')) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
 
             @elseif ($field['type'] == 'password')
 
@@ -212,7 +212,7 @@
             @elseif ($field['type'] == 'boolean')
 
                 <?php $selectedOption = core()->getConfigData($name) ?? ''; ?>
-                                
+
                 <label class="switch">
                     <input type="hidden" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="0" />
                     <input type="checkbox" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="1" {{ $selectedOption ? 'checked' : '' }}>