merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration changes

This commit is contained in:
rahul shukla 2019-01-31 17:04:32 +05:30
parent e00ca5808f
commit 41d3f74fc1
5 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
View File

@ -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']);
}

8
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -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 {

10
packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
View File

@ -165,7 +165,9 @@
?>
@if ($result)
<img src="{{ $src }}" class="configuration-image"/>
<a href="{{ $src }}" target="_blank">
<img src="{{ $src }}" class="configuration-image"/>
</a>
@endif
<input type="file" 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;{{ $field['name'] }}&quot;" style="padding-top: 5px;">
@ -189,6 +191,12 @@
$path = end($src);
?>
@if ($result)
<a href="{{ route('admin.configuration.download', [request()->route('slug'), request()->route('slug2'), $path]) }}">
<i class="icon sort-down-icon download"></i>
</a>
@endif
<input type="file" 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;{{ $field['name'] }}&quot;" style="padding-top: 5px;">
@if ($result)

30
packages/Webkul/Core/src/Database/Migrations/2019_01_31_164117_update_value_column_type_to_text_in_core_config_table.php Normal file
View File

@ -0,0 +1,30 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateValueColumnTypeToTextInCoreConfigTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('core_config', function (Blueprint $table) {
$table->text('value')->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}

2
public/installer/Classes/Requirement.php
View File

@ -79,7 +79,7 @@ class Requirement {
*
* @var _minPhpVersion
*/
$_minPhpVersion = '7.0.0';
$_minPhpVersion = '7.1.17';
$currentPhpVersion = $this->getPhpVersionInfo();
$supported = false;