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

Merge remote-tracking branch 'upstream/master' into address-delete-issue

This commit is contained in:
devansh bawari 2021-09-07 09:59:52 +05:30
parent eca31e3123 797916ccf4
commit e44a73af10
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Core/src/Repositories/CoreConfigRepository.php
View File

@ -91,7 +91,9 @@ class CoreConfigRepository extends Repository
]);
} else {
foreach ($coreConfigValue as $coreConfig) {
Storage::delete($coreConfig['value']);
if (request()->hasFile($fieldName)) {
Storage::delete($coreConfig['value']);
}
if (isset($value['delete'])) {
$this->model->destroy($coreConfig['id']);

6
packages/Webkul/Ui/src/DataGrid/Traits/ProvideCollection.php
View File

@ -140,6 +140,10 @@ trait ProvideCollection
*/
private function sortCollection($collection, $info)
{
$availableOptions = ['asc', 'desc'];
$selectedSortOption = strtolower(array_values($info)[0]);
$countKeys = count(array_keys($info));
if ($countKeys > 1) {
@ -150,7 +154,7 @@ trait ProvideCollection
$collection->orderBy(
$columnName[1],
array_values($info)[0]
in_array($selectedSortOption, $availableOptions) ? $selectedSortOption : 'asc'
);
}

2
packages/Webkul/Velocity/src/Resources/views/shop/cms/page.blade.php
View File

@ -19,7 +19,7 @@
@endsection
@section('content-wrapper')
<div class="cms-page-container cart-details row offset-1">
<div class="cms-page-container cart-details row">
{!! DbView::make($page)->field('html_content')->render() !!}
</div>
@endsection