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 fdd40e854..a0009e1f4 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 @@ -211,21 +211,13 @@ @elseif ($field['type'] == 'boolean') - + getConfigData($name) ?? ''; ?> + + @elseif ($field['type'] == 'image') diff --git a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php index 7a93204b9..cc15a581f 100755 --- a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php +++ b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php @@ -40,7 +40,6 @@ class CoreConfigRepository extends Repository } foreach ($data as $method => $fieldData) { - $recurssiveData = $this->recuressiveArray($fieldData , $method); foreach ($recurssiveData as $fieldName => $value) { diff --git a/packages/Webkul/Payment/src/Config/system.php b/packages/Webkul/Payment/src/Config/system.php index 6fc22a4a2..d528ef7ed 100755 --- a/packages/Webkul/Payment/src/Config/system.php +++ b/packages/Webkul/Payment/src/Config/system.php @@ -30,16 +30,7 @@ return [ ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true @@ -85,16 +76,7 @@ return [ ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true @@ -146,32 +128,14 @@ return [ ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true ], [ 'name' => 'sandbox', 'title' => 'admin::app.admin.system.sandbox', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true diff --git a/packages/Webkul/Shipping/src/Config/system.php b/packages/Webkul/Shipping/src/Config/system.php index ad446e5d4..9d88463d4 100755 --- a/packages/Webkul/Shipping/src/Config/system.php +++ b/packages/Webkul/Shipping/src/Config/system.php @@ -30,16 +30,7 @@ return [ ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true @@ -87,16 +78,7 @@ return [ ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], + 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, 'locale_based' => true