dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 3d7493708f - Show all commits

View File

@ -201,7 +201,7 @@ const total_txt = computed(() => {
Object.entries(item).map(el => el[1]).join(': ') Object.entries(item).map(el => el[1]).join(': ')
).filter(Boolean) ).filter(Boolean)
const res_total = [`Итого ${roubleSign.format(total)}`] const res_total = [`Итого без доп узора и колпаков: ${roubleSign.format(total)}`]
return { return {
regular: res_regular, regular: res_regular,
extra: res_extra, extra: res_extra,

View File

@ -1,7 +1,7 @@
export const patterns = [ export const patterns = [
{ name: 'Без узора', }, { name: 'Без узора', },
{ name: 'Узор 1', filename: 'tile1.png' }, { name: 'Узор 1', filename: 'tile1.png' },
{ name: 'А это узор 2', filename: 'tile2.jpg' }, { name: 'Узор 2', filename: 'tile2.jpg' },
].map((el, i) => Object.assign(el, { id: i })) ].map((el, i) => Object.assign(el, { id: i }))
export const getName = (id: patternIds) => { export const getName = (id: patternIds) => {