Skip to content

Commit

Permalink
Merge pull request #719 from Support-pl/dev-pl
Browse files Browse the repository at this point in the history
dev pl
  • Loading branch information
639852 committed Jul 22, 2024
2 parents 54e21ee + 763761e commit 31e6113
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/components/services/custom/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
<custom-pagination
v-if="isResourcesExist"
style="margin-top: 20px"
:visible="filteredSizes.length > 15"
:options="paginationOptions"
@update:options="(key, value) => paginationOptions[key] = value"
Expand Down Expand Up @@ -308,10 +309,12 @@ export default {
return sum + addon.price * ((period >= 1) ? period : 1 / period)
}, 0
)
const description = product.meta.description.replace(
/[\wА-ЯЁа-яё \-_+]{1,};/,
'<span style="font-weight: 700">$&</span>'
)
const description = (this.isResourcesExist)
? product.meta.description?.replace(
/[\wА-ЯЁа-яё \-_+]{1,};/,
'<span style="font-weight: 700">$&</span>'
)
: product.meta.description

return {
...product,
Expand Down Expand Up @@ -374,6 +377,7 @@ export default {
const { meta } = this.products[keys[this.options.period]] ?? {}
let isIncluded = (this.typesOptions.length > 1) ? this.checkedType === group : true

if (!keys[this.options.period]) return false
if (!this.checkedType && this.isResourcesExist) {
isIncluded = true
}
Expand Down

0 comments on commit 31e6113

Please sign in to comment.