diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
index 6967b62f9..23f21269e 100644
--- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
+++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -28,6 +28,8 @@ class ConfigurationForm extends FormRequest
'sales.*.*.title' => 'required',
'sales.*.*.active' => 'required',
'sales.*.*.order_status' => 'required',
+ // 'sales.*.*.Image' => 'image|mimes:jpg,png',
+ // 'sales.*.*.File' => 'mimes:doc,pdf,docx,zip',
];
return $this->rules;
@@ -44,6 +46,8 @@ class ConfigurationForm extends FormRequest
'sales.*.*.title.required' => 'The title field is required.',
'sales.*.*.active.required' => 'The status field is required.',
'sales.*.*.order_status.required' => 'Order Status field is required',
+ // 'sales.*.*.Image.image' => 'Image field must be an image',
+ // 'sales.*.*.Image.mimes' => 'Image must be a file of type: jpg, png',
];
}
}
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index dedef9fd9..46bb05eb5 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -447,6 +447,9 @@ return [
'title' => 'Configuration',
'save-btn-title' => 'Save',
'save-message' => 'Configuration saved successfully',
+ 'yes' => 'Yes',
+ 'no' => 'No',
+ 'delete' => 'Delete',
'tax-categories' => [
'title' => 'Tax Categories',
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 7c88319c4..f2a116d1c 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
@@ -139,6 +139,67 @@
+ @elseif ($field['type'] == 'boolean')
+
+
+
+ @elseif ($field['type'] == 'image')
+
+ getConfigData($name));
+ $result = core()->getConfigData($name);
+ ?>
+
+ @if ($result)
+
+ @endif
+
+
+
+ @if ($result)
+
+
+
+
+
+ {{ __('admin::app.configuration.delete') }}
+
+
+ @endif
+
+ @elseif ($field['type'] == 'file')
+
+ getConfigData($name);
+ ?>
+
+
+
+ @if ($result)
+
+
+
+
+
+ {{ __('admin::app.configuration.delete') }}
+
+
+ @endif
+
@endif
@{{ errors.first('{!! $firstField !!}[{!! $secondField !!}][{!! $thirdField !!}][{!! $field['name'] !!}]') }}
diff --git a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
index 3f6ffd510..0aa3313c4 100755
--- a/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
+++ b/packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
@@ -3,6 +3,7 @@
namespace Webkul\Core\Repositories;
use Webkul\Core\Eloquent\Repository;
+use Illuminate\Support\Facades\Storage;
/**
* Core Config Reposotory
@@ -56,7 +57,9 @@ class CoreConfigRepository extends Repository
}
if (getType($value) == 'array') {
- $value = implode("," , $value);
+ if (!$value['delete']) {
+ $value = implode(",", $value);
+ }
}
if (isset($field['channel_based']) && $field['channel_based']) {
@@ -86,6 +89,11 @@ class CoreConfigRepository extends Repository
}
}
+ if (request()->hasFile($fieldName)) {
+ $dir = 'configuration';
+ $value = request()->file($fieldName)->store($dir);
+ }
+
if (! count($coreConfigValue) > 0) {
$this->model->create([
'code' => $fieldName,
@@ -100,7 +108,13 @@ class CoreConfigRepository extends Repository
$updataData['channel_code'] = $channel_based ? $channel : null;
foreach ($coreConfigValue as $coreConfig) {
- $coreConfig->update($updataData);
+ Storage::delete($coreConfig['value']);
+
+ if(isset($value['delete'])) {
+ $this->model->destroy($coreConfig['id']);
+ } else {
+ $coreConfig->update($updataData);
+ }
}
}
}
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index d4ee7abad..193961b8a 100755
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -1853,7 +1853,7 @@ section.product-detail {
flex-direction: column-reverse;
.thumb-list {
- height: 120px;
+ height: 120px !important;
margin-top: 5px;
flex-direction: row;
overflow-x: scroll;
diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js
index acf0d5b90..cc2d629f2 100755
--- a/packages/Webkul/Shop/webpack.mix.js
+++ b/packages/Webkul/Shop/webpack.mix.js
@@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
-var publicPath = 'publishable/assets';
-// var publicPath = "../../../public/themes/default/assets";
+// var publicPath = 'publishable/assets';
+var publicPath = "../../../public/themes/default/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();