+
{{ label }} {{ modelValue }}
-
+
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index ab3d8ef2..9cd59a3d 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,9 +1,9 @@
const msg_website_it = {
ws: {
- sitename: 'Gruppo Macro',
- siteshortname: 'Gruppo Macro',
- description: '',
- keywords: '',
+ sitename: 'Riso',
+ siteshortname: 'RISO',
+ description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
+ keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
},
hours: {
descr: 'Descrizione',
@@ -16,35 +16,23 @@ const msg_website_it = {
pages: {
home: 'Home',
profile: 'Profilo',
- install_site: 'Installa Sito',
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
myhosps2: 'myhosps2',
mygood2: 'mygood2',
- catalogo: 'Catalogo',
fundraising: 'Sostieni il Progetto',
notifs: 'Configura le Notifiche',
unsubscribe: 'Disiscriviti',
- unsubscribe_user: 'Disiscriviti User',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
producer: 'Produttore',
orderinfo: 'Ordini Effettuati',
products: 'Prodotti',
- cash: 'Cassa',
- productInfos: 'Info Prodotti',
- listinoprodotti: 'Listino Prodotti',
productslist: 'Lista Prodotti',
collabora: 'Collabora',
- categories: 'Categorie',
storehouses: 'Magazzino',
- providers: 'Fornitori',
- catprods: 'Categorie',
- subcatprods: 'Sotto-Categorie',
- gasordine: 'Gas Ordine',
- scontisticas: 'Scontistica',
departments: 'Uffici',
orders: 'Ordini Ricevuti',
orders2: 'Ordini Ricevuti',
@@ -133,11 +121,15 @@ const msg_website_it = {
only_residenti: 'Solo Residenti',
only_consiglio: 'Solo Consiglieri',
color: 'Colore',
- gasordini: 'Gas Ordini',
- gestoreordini: 'Gestore Ordini',
+ mainMenu: 'Menu Principale',
+ subtitle: 'Sottotitolo',
+ lang: 'Lingua',
+ keywords: 'Parole Chiave',
+ desctiption: 'Descrizione',
+ heightimg: 'Altezza Immagine',
},
msg: {
- myAppName: 'Più che Buono',
+ myAppName: 'Riso',
myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
underconstruction: 'App in costruzione...',
myDescriz: '',
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index 91805981..a5950655 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -67,6 +67,39 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: false,
infooter: false,
},
+ {
+ active: true,
+ order: 12,
+ path: '/goods',
+ materialIcon: 'fas fa-tshirt',
+ name: 'mypages.goods',
+ component: () => import('@/root/goods/goods.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
+ {
+ active: true,
+ order: 15,
+ path: '/services',
+ materialIcon: 'fas fa-house-user',
+ name: 'mypages.services',
+ component: () => import('@/root/services/services.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
+ {
+ active: true,
+ order: 15,
+ path: '/activities',
+ materialIcon: 'fas fa-house-user',
+ name: 'mypages.activities',
+ component: () => import('@/root/activities/activities.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
{
active: true,
order: 15,
@@ -78,6 +111,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: false,
infooter: false,
},
+ {
+ active: true,
+ order: 15,
+ path: '/hosps',
+ materialIcon: 'fas fa-bed',
+ name: 'mypages.hosp',
+ component: () => import('@/root/hosp/hosp.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
{
active: site.confpages && site.confpages.enableCircuits,
order: 16,
@@ -165,7 +209,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
meta: { requiresAuth: true, newpage: true },
inmenu: false,
infooter: false,
- },
+ },
{
active: true,
order: 137,
@@ -232,7 +276,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
{
active: true,
order: 150,
- path: '/fundraising',
+ path: '/sostieniilprogetto',
materialIcon: 'fas fa-hand-holding-heart',
name: 'pages.fundraising',
component: () => import('@src/root/fundraising/fundraising.vue'),
diff --git a/src/index.template.html b/src/index.template.html
index ae28cd56..54ace6d8 100755
--- a/src/index.template.html
+++ b/src/index.template.html
@@ -10,7 +10,7 @@
-
+
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index b5b7f31f..b0a4b443 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -684,24 +684,53 @@ export interface IMyCard {
link?: string
}
+export interface ISize {
+ width?: string
+ height?: string
+}
+
+export interface IBorder {
+ top?: string
+ bottom?: string
+ left?: string
+ right?: string
+}
+export interface IDimensioni {
+ size?: ISize
+ margini?: IBorder
+ padding?: IBorder
+}
+
+export interface IElementiPagina {
+ pagina: IDimensioni
+ riga: IDimensioni
+}
+
+export interface IElementiScheda {
+ pagina: IDimensioni
+ riga: IDimensioni
+ scheda_prodotto: IDimensioni
+ immagine_prodotto: IDimensioni
+}
+
export interface IMyScheda {
- _id: string,
- idapp: string,
- isTemplate: boolean,
- name: string,
- widthscheda?: string
+ _id?: string,
+ idapp?: string,
+ isTemplate?: boolean,
+ name?: string,
line_height?: number
- widthpag?: number
- width?: number
- height?: number
numschede_perRiga?: number
numschede_perCol?: number
- margine_top?: number
- margine_pagina?: string
- margine_riga?: string
text?: string
posiz_text?: number
+ dimensioni: IElementiScheda
+
+ bgimg?: string
+ bgimg_printable?: string
+ bgSize?: string
+ bgSize_printable?: string
+
productTypes?: number[]
excludeproductTypes?: number[]
editore?: string[]
@@ -709,8 +738,6 @@ export interface IMyScheda {
sort?: number
arrProdottiSpeciali?: string[]
- // In Memoria:
- arrProdToShow?: IProduct[][]
}
export interface ISchedaSingola {
@@ -718,6 +745,9 @@ export interface ISchedaSingola {
scheda?: IMyScheda,
order?: number,
numSchede?: number,
+
+ // In Memoria
+ arrProdToShow?: IProduct[][]
}
export interface ICatalogo {
@@ -728,15 +758,14 @@ export interface ICatalogo {
Categoria: string[]
Editore: string[]
pdf: boolean
+ printable?: boolean
+
+ dimensioni: IElementiPagina,
+
backgroundimage?: string
backgroundimage_printable?: string
- widthpag?: number
- widthpagPrintable?: number
- width?: string
- height?: string
- printable?: boolean
- margine_paginaPrintable?: string
- margine_rigaPrintable?: string
+ backgroundSize?: string
+ backgroundSize_printable?: string
first_page_img?: string
first_page_html?: string
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index ee6c1dbf..f46b2688 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1063,6 +1063,7 @@ const msg_it = {
max_partecip: 'Massimo partecipanti',
contribstr: 'Contributo (esempio: 5€ + 5 RIS)',
contact_phone: 'Telefono per info',
+ contact_email: 'Email per info',
contact_telegram: 'Username Telegram',
},
disc: {
diff --git a/src/store/Api/index.ts b/src/store/Api/index.ts
index 54cd60df..cddf96eb 100755
--- a/src/store/Api/index.ts
+++ b/src/store/Api/index.ts
@@ -242,7 +242,7 @@ export const Api = {
setAuthToken = false,
evitaloop = false,
retryCount = 5,
- retryDelay = 3000
+ retryDelay = 5000
): Promise
{
try {
const response = await this.SendReqBase(url, method, mydata, setAuthToken, evitaloop);
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index a5e0e53a..a37e7163 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -39,6 +39,7 @@ export const costanti = {
'widthpag',
'Printable',
'height',
+ 'height_Printable',
'numschede_perCol',
'numschede_perRiga',
'margine_pagina',
@@ -54,6 +55,13 @@ export const costanti = {
'text',
],
+ SCHEDA_FIELDS: [
+ 'bgimg',
+ 'bgimg_printable',
+ 'bgSize',
+ 'bgSize_printable',
+ ],
+
TIPOFAVBOOK: {
FAVORITE: 1,
BOOKMARK: 2,
@@ -350,6 +358,7 @@ export const costanti = {
DIR_UPLOAD: 'upload/',
DIR_PRODUCTS: 'products/',
DIR_CATALOGO: 'catalogo/',
+ DIR_SCHEDA: 'scheda/',
FRIENDS: 1,
ASK_TRUST: 2,
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 9c3eba94..eb24be63 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -147,22 +147,43 @@ export const colmylistcards = [
AddCol({ name: 'link', label_trans: 'link' }),
]
+export const IBorder = [
+ AddCol({ name: 'top', label_trans: 'size.top', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'bottom', label_trans: 'size.bottom', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'left', label_trans: 'size.left', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'right', label_trans: 'size.right', fieldtype: costanti.FieldType.string }),
+]
+
+export const colISize = [
+ AddCol({ name: 'width', label_trans: 'size.width', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'height', label_trans: 'size.height', fieldtype: costanti.FieldType.string }),
+]
+
export const colmyScheda = [
AddCol({ name: 'name', label_trans: 'scheda.name', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'isTemplate', label_trans: 'scheda.isTemplate', fieldtype: costanti.FieldType.boolean }),
- AddCol({ name: 'widthscheda', label_trans: 'scheda.widthscheda', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'widthscheda', label_trans: 'scheda.widthscheda', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'widthpag', label_trans: 'scheda.widthpag', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'width', label_trans: 'scheda.width', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'height', label_trans: 'scheda.height', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'widthimg', label_trans: 'scheda.widthimg', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'heightimg', label_trans: 'scheda.heightimg', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'height_Printable', label_trans: 'scheda.height_Printable', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'numschede_perCol', label_trans: 'scheda,numschede_perCol', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'numschede_perRiga', label_trans: 'scheda.numschede_perRiga', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'margine_top', label_trans: 'scheda.margine_top', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'margine_top', label_trans: 'scheda.margine_top', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'margine_pagina', label_trans: 'scheda.margine_pagina', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'margine_paginaPrintable', label_trans: 'scheda.margine_paginaPrintable', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'margine_riga', label_trans: 'scheda.margine_riga', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'margine_rigaPrintable', label_trans: 'scheda.margine_rigaPrintable', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'text', label_trans: 'catalogo.text', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'posiz_text', label_trans: 'catalogo.posiz_text', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'line_height', label_trans: 'catalogo.line_height', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'bgimg', label_trans: 'scheda.bgimg', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'bgimg_printable', label_trans: 'scheda.bgimg_printable', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'bgSize', label_trans: 'scheda.bgimg', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'bgSize_printable', label_trans: 'scheda.bgSize', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'widthPPrintable', label_trans: 'scheda.widthPPrintable', fieldtype: costanti.FieldType.number }),
+
AddCol({ name: 'productTypes', label_trans: 'productTypes', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'excludeproductTypes', label_trans: 'excludeproductTypes', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'Editore', label_trans: 'Editore' }),
@@ -176,14 +197,12 @@ export const colmyelCatalogo = [
AddCol({ name: 'excludeproductTypes', label_trans: 'excludeproductTypes', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'pdf', label_trans: 'pdf' }),
AddCol({ name: 'Editore', label_trans: 'Editore' }),
- AddCol({ name: 'backgroundimage', label_trans: 'backgroundimage', fieldtype: costanti.FieldType.image }),
- AddCol({ name: 'backgroundimage_printable', label_trans: 'backgroundimage_printable', fieldtype: costanti.FieldType.image }),
- AddCol({ name: 'widthpag', label_trans: 'widthpag', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'widthpagPrintable', label_trans: 'widthpagPrintable', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'width', label_trans: 'width', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'height', label_trans: 'height', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'optcatalogo.', label_trans: 'catalogo.optcatalogo.', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'margine_pagina', label_trans: 'margine_pagina', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'margine_paginaPrintable', label_trans: 'margine_paginaPrintable', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'margine_riga', label_trans: 'margine_riga', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'margine_rigaPrintable', label_trans: 'margine_rigaPrintable', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'first_page_img', label_trans: 'catalogo.first_page_img', fieldtype: costanti.FieldType.image }),
AddCol({ name: 'last_page_img', label_trans: 'catalogo.last_page_img', fieldtype: costanti.FieldType.image }),
@@ -191,6 +210,13 @@ export const colmyelCatalogo = [
AddCol({ name: 'first_page_height', label_trans: 'catalogo.first_page_height', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'last_page_height', label_trans: 'catalogo.last_page_html', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'last_page_html', label_trans: 'catalogo.last_page_html', fieldtype: costanti.FieldType.html }),
+
+ AddCol({ name: 'backgroundimage', label_trans: 'backgroundimage', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'backgroundimage_printable', label_trans: 'backgroundimage_printable', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'backgroundSize', label_trans: 'scheda.bgimg', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'backgroundSize_printable', label_trans: 'scheda.bgSize', fieldtype: costanti.FieldType.image }),
+ AddCol({ name: 'widthpagPrintable', label_trans: 'widthpag', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'widthpagPrintable', label_trans: 'widthpagPrintable', fieldtype: costanti.FieldType.number }),
]
export const colmyelems = [
@@ -1541,7 +1567,7 @@ export const colmySkills = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
numpag_carousel: 6,
}),
- AddCol({
+ /*AddCol({
name: 'numLevel',
label_trans: 'level.name',
fieldtype: costanti.FieldType.star3,
@@ -1552,7 +1578,7 @@ export const colmySkills = [
icon: 'grading',
isadvanced_field: true,
numpag_carousel: 7,
- }),
+ }),*/
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
@@ -1878,6 +1904,11 @@ export const colmyBachecas = [
label_trans: 'event.contact_phone',
fieldtype: costanti.FieldType.string,
}),
+ AddCol({
+ name: 'contact_email',
+ label_trans: 'event.contact_email',
+ fieldtype: costanti.FieldType.string,
+ }),
AddCol({
name: 'contact_telegram',
label_trans: 'event.contact_telegram',
@@ -3931,12 +3962,6 @@ export const fieldsTable = {
},
- tableForUsers: [
- 'myskills',
- 'mygoods',
- 'mybachecas',
- 'myhosps',
- ],
tableRemotePickup: [
'countries',
@@ -4186,8 +4211,8 @@ export const fieldsTable = {
collabel: 'title',
},
{
- value: 'scheda',
- label: 'Elementi SCheda',
+ value: 'myschedas',
+ label: 'Elementi Scheda',
columns: colmyScheda,
colkey: '_id',
collabel: 'name',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 391cde64..56165f79 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -7895,7 +7895,7 @@ export const tools = {
},
getTitleGall(table: string) {
- if (fieldsTable.tableForUsers.includes(table)) {
+ if (shared_consts.TABLEFORUSERS.includes(table)) {
return 'Profilo'
} else {
return fieldsTable.getTitleImgByTable(table)
@@ -7919,7 +7919,7 @@ export const tools = {
if (username === '') {
username = userStore.my.username
}
- if (fieldsTable.tableForUsers.includes(table)) {
+ if (shared_consts.TABLEFORUSERS.includes(table)) {
ris = 'profile/' + username + '/' + table
} else if (table === 'users') {
ris = 'profile/' + userStore.my.username
@@ -8271,6 +8271,30 @@ export const tools = {
return null
},
+ getNomeTabellaStrByTable(table: string, rec: any) {
+ let str = ''
+ let nome = ''
+ if (table === toolsext.TABMYBACHECAS) {
+ nome = rec ? rec.descr : ''
+ str = 'l\'Evento "' + nome + '"'
+ } else if (table === toolsext.TABMYSKILLS) {
+ nome = rec ? rec.descr : ''
+ str = 'il Servizio "' + nome + '"'
+ } else if (table === toolsext.TABMYGOODS) {
+ nome = rec ? rec.descr : ''
+ str = 'il Bene "' + nome + '"'
+ } else if (table === toolsext.TABMYHOSPS) {
+ nome = rec ? rec.descr : ''
+ str = 'l\'Ospitalità "' + nome + '"'
+ }
+
+ if (!str) {
+ str = 'il record selezionato'
+ }
+
+ return str
+ },
+
extraparams(table: string, extra?: any) {
if (table === toolsext.TABMYGROUPS) {
diff --git a/src/store/Products.ts b/src/store/Products.ts
index 71bd14d3..d8e2743c 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -52,7 +52,7 @@ function getRecordProductInfoEmpty(): IProductInfo {
stars: 0,
date: tools.getDateNow(),
icon: '',
- img: '',
+ imagefile: '',
}
}
diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts
index b9ebb2e1..1e0cb7a3 100755
--- a/src/views/ecommerce/catalogo/catalogo.ts
+++ b/src/views/ecommerce/catalogo/catalogo.ts
@@ -14,7 +14,7 @@ import { CProductCard } from '@src/components/CProductCard'
import { CMySelect } from '@src/components/CMySelect'
import { CContainerCatalogoCard } from '@src/components/CContainerCatalogoCard'
import { CSelectUserActive } from '@src/components/CSelectUserActive'
-import { ICatalogo, IFilterCatalogo, IMyScheda, IProdView, IProduct, ISearchList } from 'model'
+import { ICatalogo, IFilterCatalogo, IMyScheda, IProdView, IProduct, ISchedaSingola, ISearchList } from 'model'
import html2canvas from 'html2canvas'
// import { VueHtmlToPaper } from 'vue-html-to-paper'
@@ -412,9 +412,9 @@ export default defineComponent({
}
}
- function getProdBySchedaRigaCol(scheda: IMyScheda, riga: number, col: number) {
+ function getProdBySchedaRigaCol(recscheda: ISchedaSingola, riga: number, col: number) {
try {
- return scheda.arrProdToShow![riga][col]
+ return recscheda.arrProdToShow![riga][col]
} catch (e) {
return null
}
@@ -436,10 +436,7 @@ export default defineComponent({
const arrProdFiltrati = getProductsFilteredByScheda(recscheda.scheda)
let indprod = 0
let indadded = 0
- recscheda.scheda.arrProdToShow = []
-
- let riga = 0
- let col = 0
+ recscheda.arrProdToShow = []
for (let giro = 0; giro < schedePerPagina; giro++) {
// Aggiunge il prossimo prodotto che non è stato ancora inserito
@@ -450,21 +447,22 @@ export default defineComponent({
if (result.indprod)
indprod = result.indprod // Aggiorna indprod per il prossimo giro
if (result.myrec) {
- indadded++
let riga = Math.floor(indadded / schedePerCol)
let col = indadded % schedePerCol
- if (!recscheda.scheda.arrProdToShow[riga]) {
- recscheda.scheda.arrProdToShow[riga] = [];
+ if (!recscheda.arrProdToShow[riga]) {
+ recscheda.arrProdToShow[riga] = [];
}
- recscheda.scheda.arrProdToShow[riga][col] = result.myrec
+ recscheda.arrProdToShow[riga][col] = result.myrec
+
+ indadded++
}
}
}
- console.log('*** arrProdToShow', recscheda.scheda.arrProdToShow)
+ console.log('*** arrProdToShow', recscheda.arrProdToShow)
}
}
}
@@ -712,6 +710,57 @@ export default defineComponent({
}
+ function generateStyleCatalogo(optcatalogo: ICatalogo) {
+ const fileimg = (optcatalogo.printable
+ ? optcatalogo.backgroundimage_printable
+ : optcatalogo.backgroundimage)
+
+ const marginBottom = optcatalogo.dimensioni.pagina.margini!.bottom || ''
+
+ const backgroundImage = fileimg ? `url(${costanti.DIR_UPLOAD +
+ costanti.DIR_CATALOGO + fileimg})` : ''
+
+ const backgroundSize = `${optcatalogo.printable
+ ? optcatalogo.backgroundSize_printable
+ : optcatalogo.backgroundSize}`;
+
+ const width = optcatalogo.dimensioni.pagina.size?.width
+
+ return {
+ backgroundImage,
+ backgroundSize,
+ marginBottom,
+ '--width': width
+ };
+ }
+
+ function generateStylePageScheda(optcatalogo: ICatalogo, scheda: IMyScheda) {
+ const marginTop = `${scheda.dimensioni.pagina.margini!.top}`
+
+ const marginBottom = scheda.dimensioni.pagina.margini!.bottom
+
+ const fileimg = (optcatalogo.printable
+ ? scheda.bgimg_printable
+ : scheda.bgimg)
+
+ const backgroundImage = fileimg ? `url(${costanti.DIR_UPLOAD +
+ costanti.DIR_SCHEDA + fileimg})` : ''
+
+ const backgroundSize = `${optcatalogo.printable
+ ? scheda.bgSize_printable
+ : scheda.bgSize}`;
+
+ const width = scheda.dimensioni.pagina.size?.width
+
+ return {
+ marginBottom,
+ marginTop,
+ backgroundImage,
+ backgroundSize,
+ '--width': width
+ };
+ }
+
onMounted(mounted)
@@ -754,6 +803,8 @@ export default defineComponent({
groupedPages,
getNextProd,
getProdBySchedaRigaCol,
+ generateStylePageScheda,
+ generateStyleCatalogo,
}
}
})
diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue
index ad7145a4..3762406d 100755
--- a/src/views/ecommerce/catalogo/catalogo.vue
+++ b/src/views/ecommerce/catalogo/catalogo.vue
@@ -216,7 +216,11 @@
? optcatalogo.first_page_img
: optcatalogo.first_page_img)
})`,
- backgroundSize: 'cover',
+ backgroundSize: `${
+ optcatalogo.printable
+ ? scheda.bgSize_printable
+ : scheda.bgSize
+ }`,
height: optcatalogo.first_page_height + 'px',
width: optcatalogo.first_page_width + 'px',
}"
@@ -226,24 +230,7 @@
v-html="optcatalogo.first_page_html"
>