clean up
- optimized imports - remove unused variable - extract a method - flatten code
This commit is contained in:
parent
e6e12ae601
commit
9f039cb9a5
|
|
@ -2,13 +2,10 @@
|
||||||
|
|
||||||
namespace Webkul\Admin\Http\Controllers;
|
namespace Webkul\Admin\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Http\Response;
|
|
||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Webkul\Admin\Facades\Configuration;
|
use Webkul\Admin\Facades\Configuration;
|
||||||
use Webkul\Core\Repositories\CoreConfigRepository as CoreConfig;
|
use Webkul\Core\Repositories\CoreConfigRepository as CoreConfig;
|
||||||
use Webkul\Core\Tree;
|
use Webkul\Core\Tree;
|
||||||
use Webkul\Admin\Http\Requests\ConfigurationForm;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -98,32 +95,18 @@ class ConfigurationController extends Controller
|
||||||
*/
|
*/
|
||||||
public function getDefaultConfigSlugs()
|
public function getDefaultConfigSlugs()
|
||||||
{
|
{
|
||||||
$slugs = [];
|
|
||||||
|
|
||||||
if (! request()->route('slug')) {
|
if (! request()->route('slug')) {
|
||||||
$firstItem = current($this->configTree->items);
|
$firstItem = current($this->configTree->items);
|
||||||
$secondItem = current($firstItem['children']);
|
$secondItem = current($firstItem['children']);
|
||||||
|
|
||||||
$temp = explode('.', $secondItem['key']);
|
return $this->getSlugs($secondItem);
|
||||||
|
|
||||||
$slugs = [
|
|
||||||
'slug' => current($temp),
|
|
||||||
'slug2' => end($temp)
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
if (! request()->route('slug2')) {
|
|
||||||
$secondItem = current($this->configTree->items[request()->route('slug')]['children']);
|
|
||||||
|
|
||||||
$temp = explode('.', $secondItem['key']);
|
|
||||||
|
|
||||||
$slugs = [
|
|
||||||
'slug' => current($temp),
|
|
||||||
'slug2' => end($temp)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $slugs;
|
if (! request()->route('slug2')) {
|
||||||
|
$secondItem = current($this->configTree->items[request()->route('slug')]['children']);
|
||||||
|
|
||||||
|
return $this->getSlugs($secondItem);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -160,4 +143,16 @@ class ConfigurationController extends Controller
|
||||||
|
|
||||||
return Storage::download($config['value']);
|
return Storage::download($config['value']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param $secondItem
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getSlugs($secondItem): array
|
||||||
|
{
|
||||||
|
$temp = explode('.', $secondItem['key']);
|
||||||
|
|
||||||
|
return ['slug' => current($temp), 'slug2' => end($temp)];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue