Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed problem with cutting image height in category page on 1024px+ screen res - @AdKamil (#3781)
- Fixed null value of search input - @AdKamil (#3778)
- Fixed product sorting - @AdKamil (#3785)
- Fixed sorting on category page and product tile sizing - @andrzejewsky (#3817)
- Redirect from simple product using url_path - @benjick (#3804)


## [1.11.0-rc.2] - 2019.10.31

### Added
Expand Down
2 changes: 1 addition & 1 deletion core/modules/catalog-next/store/category/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const actions: ActionTree<CategoryState, RootState> = {
let filterQr = buildFilterProductsQuery(searchCategory, searchQuery.filters)
const {items, perPage, start, total, aggregations} = await quickSearchByQuery({
query: filterQr,
sort: searchQuery.sort,
sort: searchQuery.sort || 'updated_at:desc',
includeFields: entities.productList.includeFields,
excludeFields: entities.productList.excludeFields,
size: pageSize
Expand Down
7 changes: 4 additions & 3 deletions core/modules/user/test/unit/store/mutations.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ describe('User mutations', () => {

describe('USER_START_SESSION', () => {
it('should assign session_started', () => {
const sessionDate = new Date()

const stateMock = {
session_started: new Date()
session_started: sessionDate
}
const expectedState = {
session_started: new Date()
session_started: sessionDate
}
const wrapper = (mutations: any) => mutations[types.USER_START_SESSION](stateMock)

Expand Down Expand Up @@ -163,5 +165,4 @@ describe('User mutations', () => {
expect(stateMock).toEqual(expectedState)
})
})

})
7 changes: 2 additions & 5 deletions src/themes/default/components/core/ProductTile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,11 @@ $color-white: color(white);

.product-cover {
overflow: hidden;
max-height: 300px;

&__thumb {
padding-bottom: calc(143.88% / (164.5 / 100));
@media screen and (min-width: 768px) {
padding-bottom: calc(250% / (276.5 / 100));
}
@media screen and (min-width: 1024px) {
padding-bottom: calc(200% / (276.5 / 100));
padding-bottom: calc(300% / (276.5 / 100));
}
opacity: 0.8;
will-change: opacity, transform;
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/components/core/SortBy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
value: {
handler () {
const defaultVariant = this.value && this.value.length ? this.value : products.defaultSortBy.attribute
this.sortby = this.sortingVariants.find(variant => variant.id === defaultVariant)
this.sortby = this.sortingVariants.find(variant => variant.id.includes(defaultVariant))
},
immediate: true
}
Expand Down