diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index 3a8257506..f67954c8f 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -150,11 +150,13 @@ class ConfigurationController extends Controller * * @return \Illuminate\Http\Response */ - public function download(Request $request) + public function download() { - $id = request()->route()->parameters()['id']; + $path = request()->route()->parameters()['path']; - $config = $this->coreConfig->findOneByField('id', $id); + $fileName = 'configuration/'. $path; + + $config = $this->coreConfig->findOneByField('value', $fileName); return Storage::download($config['value']); } diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index ad00c291d..0843358bd 100755 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -568,7 +568,13 @@ body { margin-right: 5px; } - +.download { + position: relative; + height: 24px !important; + width: 24px !important; + top: 12px; + margin-right: 10px; +} // css for rtl start here .rtl { 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 a64ad847e..395cc59f6 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 @@ -165,7 +165,9 @@ ?> @if ($result) - + + + @endif @@ -189,6 +191,12 @@ $path = end($src); ?> + @if ($result) + + + + @endif + @if ($result) diff --git a/packages/Webkul/Core/src/Database/Migrations/2019_01_31_164117_update_value_column_type_to_text_in_core_config_table.php b/packages/Webkul/Core/src/Database/Migrations/2019_01_31_164117_update_value_column_type_to_text_in_core_config_table.php new file mode 100644 index 000000000..8b6786020 --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2019_01_31_164117_update_value_column_type_to_text_in_core_config_table.php @@ -0,0 +1,30 @@ +text('value')->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + + } +} diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php index 357910d1a..f961df41d 100755 --- a/public/installer/Classes/Requirement.php +++ b/public/installer/Classes/Requirement.php @@ -79,7 +79,7 @@ class Requirement { * * @var _minPhpVersion */ - $_minPhpVersion = '7.0.0'; + $_minPhpVersion = '7.1.17'; $currentPhpVersion = $this->getPhpVersionInfo(); $supported = false;