Skip to content

Commit

Permalink
Merge views subtree
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Sep 8, 2021
2 parents 00bcf36 + 70e029d commit 90529ff
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
15 changes: 12 additions & 3 deletions template/pages/@/sections/category-retail.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,20 @@ const search = new _.EcomSearch()
search
.setCategoryNames([_.state.name])
.setSortOrder(opt.sort)
await search.fetch()
let items = await search.getItems()
let items
try {
await search.fetch()
items = search.getItems()
} catch (err) {
if (err.response && err.response.status === 404) {
console.error(err)
} else {
throw err
}
}
const categoryNames = [_.state.name]
if (!items.length) {
if (items && !items.length) {
const childCategories = _.categories.filter(({ parent }) => {
return parent && parent._id === _.state._id
})
Expand Down
13 changes: 11 additions & 2 deletions template/pages/@/sections/inc/retail-grid.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,17 @@ if (!opt.items) {
if (opt.sort) {
search.setSortOrder(opt.sort)
}
await search.fetch()
items = await search.getItems()
try {
await search.fetch()
items = search.getItems()
} catch (err) {
if (_.pageName === 'home' || (err.response && err.response.status === 404)) {
items = []
console.error(err)
} else {
throw err
}
}
} else {
items = opt.items
}
Expand Down

0 comments on commit 90529ff

Please sign in to comment.