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

Merge branch 'master' of https://github.com/bagisto/bagisto into patch-5

This commit is contained in:
Shubham Mehrotra 2020-08-01 19:37:17 +05:30
parent 19414309e4 e9fd421847
commit 7d87d63b6c
9 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=c18e7d7ccfb80712f078",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=36aea00f600c674a2a60"
"/css/velocity.css": "/css/velocity.css?id=a7528cf631c6c6b99654"
}

2
packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
View File

@ -77,7 +77,7 @@ class ContentDataGrid extends DataGrid
'type' => 'string',
'sortable' => true,
'searchable' => true,
'filterable' => true,
'filterable' => false,
'wrapper' => function($value) {
if ($value->content_type == 'category') {
return 'Category Slug';

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

@ -116,7 +116,7 @@ class ConfigurationController extends Controller
// update row
$product = $this->velocityMetaDataRepository->update($params, $id);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Velocity Theme']));
session()->flash('success', trans('admin::app.response.update-success', ['name' => trans('velocity::app.admin.meta-data.title')]));
return redirect()->route($this->_config['redirect'], ['locale' => $this->locale]);
}

4
packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php
View File

@ -96,7 +96,7 @@ class ContentController extends Controller
$this->contentRepository->create($params);
session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Content Page']));
session()->flash('success', trans('admin::app.response.create-success', ['name' => trans('velocity::app.admin.layouts.header-content')]));
return redirect()->route($this->_config['redirect']);
}
@ -131,7 +131,7 @@ class ContentController extends Controller
$content = $this->contentRepository->update($params, $id);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Content']));
session()->flash('success', trans('admin::app.response.update-success', ['name' => trans('velocity::app.admin.layouts.header-content')]));
return redirect()->route($this->_config['redirect']);
}

1
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -8,7 +8,6 @@ import ar from 'vee-validate/dist/locale/ar';
import VeeValidate, { Validator } from 'vee-validate';
import axios from 'axios';
window.axios = axios;
window.VeeValidate = VeeValidate;
window.jQuery = window.$ = require("jquery");

8
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -984,4 +984,12 @@
}
}
}
#sort-by.sorter select {
top: 2px;
left: 25px;
padding: 0 10px;
position: absolute;
display: inline-block;
}
}

3
packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
View File

@ -14,9 +14,10 @@
type="text"
id="page_link"
class="control"
value="{{ $pageTarget }}"
name="{{$locale}}[page_link]"
v-validate="'required|max:150'"
value="{{ $pageTarget }}"
@input="$event.target.value=$event.target.value.toLowerCase()"
data-vv-as=""{{ __('velocity::app.admin.contents.content.category-slug') }}"" />
<span class="control-error" v-if="errors.has('{!!$locale!!}[page_link]')">

22
packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php
View File

@ -96,17 +96,17 @@
</div>
<div class="col-4">
<a
class="unset"
href="{{
$toolbarHelper->isOrderCurrent('name-asc')
? $toolbarHelper->getOrderUrl('name-asc')
: $toolbarHelper->getOrderUrl('name-desc')
}}">
<div class="sorter" id="sort-by">
<i class="material-icons">sort_by_alpha</i>
<span>{{ __('shop::app.products.sort-by') }}</span>
</a>
<select class="selective-div no-border" onchange="window.location.href = this.value">
@foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
<option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
{{ __('shop::app.products.' . $order) }}
</option>
@endforeach
</select>
</div>
</div>
<div class="col-4">
@ -154,7 +154,7 @@
methods: {
toggleLayeredNavigation: function ({event, actionType}) {
this.layeredNavigation = !this.layeredNavigation;
}
},
}
})
})()