mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
Conversation 0 Commits 141 Files Changed 62 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62ee7e7c06 - Show all commits

9
components/modal.vue
View File

@ -147,6 +147,8 @@ const total_txt = computed(() => {
lam_quad_regular: discountValue * lamelles_block * lam_count * lamelle_height.value * length_m,
lam_quad_extra: discountValue * lamelles_block * lam_count * lamelle_height.value * extra_m,
}
const isPattern = pillar_pattern.value !== 0;
const isTopper = pillar_topper.value !== 0;
// console.log(prices)
const extra = extra_section.value ? {
pillar: !remove_pillar.value && {
@ -177,8 +179,6 @@ const total_txt = computed(() => {
)
) {
const els = [];
const isPattern = pillar_pattern.value !== 0;
const isTopper = pillar_topper.value !== 0;
if (isPattern) els.push('нанесения узоров на опорные столбы')
if (isTopper) els.push('индивидуального дизайна колпаков')
const txt = `Стоимость ${els.join(' и ')} рассчитывается отдельно.`
@ -201,7 +201,10 @@ const total_txt = computed(() => {
Object.entries(item).map(el => el[1]).join(': ')
).filter(Boolean)
const res_total = [`Итого${res_decor.length ? ' без узора и колпаков:' : ':'} ${roubleSign.format(total)}`]
const total_str = []
if (isPattern) total_str.push('узора')
if (isTopper) total_str.push('колпаков')
const res_total = [`Итого${total_str.length ? ' без ' + total_str.join(' и ') : ''}: ${roubleSign.format(total)}`]
return {
regular: res_regular,
extra: res_extra,