| {{ $t('ecomm.prezzointero') }}: | +{{ t('ecomm.prezzointero') }}: | ||||||||||
| {{ $t('ecomm.sconto_appl') }}: | +{{ t('ecomm.sconto_appl') }}: |
| {{ $t('ecomm.codice_sconto') }}: |
+ {{ t('ecomm.codice_sconto') }}: |
| {{ $t('ecomm.totale_scontato') }}: |
+ {{ t('ecomm.totale_scontato') }}: |
€ {{ myTotalPrice }} |
| |||
| {{ $t('cal.data') }} | -{{ $t('cal.event') }} | -{{ $t('cal.teachertitle') }} | +{{ t('cal.data') }} | +{{ t('cal.event') }} | +{{ t('cal.teachertitle') }} | - {{ $t('cal.selnumpeople') }} - {{ $t('cal.selnumpeople_short') }} + {{ t('cal.selnumpeople') }} + {{ t('cal.selnumpeople_short') }} | - {{ $t('cal.selnumpeopleLunch') }} + {{ t('cal.selnumpeopleLunch') }} | - {{ $t('cal.selnumpeopleDinner') }} + {{ t('cal.selnumpeopleDinner') }} | - {{ $t('cal.selnumpeopleDinnerShared') }} + {{ t('cal.selnumpeopleDinnerShared') }} | -{{ $t('cal.peoplebooked') }} | +{{ t('cal.peoplebooked') }} |
diff --git a/src/rootgen/admin/productInfos/productInfos.ts b/src/rootgen/admin/productInfos/productInfos.ts
deleted file mode 100755
index cbedf40b..00000000
--- a/src/rootgen/admin/productInfos/productInfos.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { defineComponent } from 'vue'
-
-import { CImgText } from '../../../components/CImgText/index'
-import { CCard } from '@src/components/CCard'
-import { CMyPage } from '@src/components/CMyPage'
-import { CTitleBanner } from '@src/components/CTitleBanner'
-import { CGridTableRec } from '@src/components/CGridTableRec'
-
-import { colTableProductInfosShort } from '@src/store/Modules/fieldsTable'
-import MixinMetaTags from '@src/mixins/mixin-metatags'
-
-export default defineComponent({
- name: 'ProductInfosPage',
- components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec },
- setup() {
-
- const { setmeta } = MixinMetaTags()
-
- return {
- colTableProductInfosShort,
- setmeta,
- }
- }
-})
diff --git a/src/rootgen/admin/productInfos/productInfos.vue b/src/rootgen/admin/productInfos/productInfos.vue
deleted file mode 100755
index 7c342f56..00000000
--- a/src/rootgen/admin/productInfos/productInfos.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
- + {{ t('db.reporteduser', {date_report: tools.getstrDateTimeShort(myuser.date_report)}) }} da: {{ myuser.username_who_report }} diff --git a/src/router/routesAI.ts b/src/router/routesAI.ts index 0258f439..64c3cf10 100644 --- a/src/router/routesAI.ts +++ b/src/router/routesAI.ts @@ -51,7 +51,7 @@ function getRoutesAI(site: ISites) { const menuAI = [ { - active: site.confpages && site.confpages.enableAI, + active: site.confpages && site.confpages?.enableAI, path: '/ai', order: 1402, faIcon: 'fas fa-lemon', @@ -66,7 +66,7 @@ function getRoutesAI(site: ISites) { }, ...routes_ai, { - active: site.confpages && site.confpages.enableAI, + active: site.confpages && site.confpages?.enableAI, path: '/admin/ai', order: 1420, materialIcon: 'next_week', diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts index b74a6f08..859bf4e3 100644 --- a/src/router/routesAdmin.ts +++ b/src/router/routesAdmin.ts @@ -219,8 +219,8 @@ function getRoutesAd(site: ISites) { materialIcon: 'edit', name: 'otherpages.admin.usereventlist', component: () => import('@src/rootgen/admin/eventlist/eventlist.vue'), - inmenu: site.confpages && site.confpages.bookingEvents, - submenu: site.confpages && site.confpages.bookingEvents, + inmenu: site.confpages && site.confpages?.bookingEvents, + submenu: site.confpages && site.confpages?.bookingEvents, level_parent: 0, level_child: 0.5, infooter: false, @@ -331,6 +331,20 @@ function getRoutesAd(site: ISites) { onlyManager: true, onlyEditor: true }, + { + active: true, + order: 30, + path: '/admin/editpages', + materialIcon: 'fas fa-file-alt', + name: 'otherpages.admin.editpages', + component: () => import('@src/rootgen/admin/editpages/editpages.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyEditor: true + }, { active: true, order: 32, @@ -588,13 +602,13 @@ function getRoutesAd(site: ISites) { infooter: true }, /*{ - active: site.confpages && site.confpages.enableRegByBot, + active: site.confpages && site.confpages?.enableRegByBot, order: 1000, path: '/bot', materialIcon: 'how_to_reg', name: 'pages.SignUpBot', - inmenu: site.confpages && site.confpages.enableRegByBot, - infooter: site.confpages && site.confpages.enableRegByBot, + inmenu: site.confpages && site.confpages?.enableRegByBot, + infooter: site.confpages && site.confpages?.enableRegByBot, separator: false },*/ { @@ -675,7 +689,7 @@ function getRoutesAd(site: ISites) { separator: false }, { - active: site.confpages && site.confpages.enableReg && site.confpages.enabledRegNeedTelegram, + active: site.confpages && site.confpages?.enableReg && site.confpages?.enabledRegNeedTelegram, order: 1000, path: '/signup/:invited/:usernameteleg/:idteleg/:regexpire', materialIcon: 'how_to_reg', @@ -686,7 +700,7 @@ function getRoutesAd(site: ISites) { separator: false }, { - active: site.confpages && site.confpages.enableReg && site.confpages.enabledRegNeedTelegram, + active: site.confpages && site.confpages?.enableReg && site.confpages?.enabledRegNeedTelegram, order: 1000, path: '/registrati/:invited/:usernameteleg/:idteleg/:regexpire', materialIcon: 'how_to_reg', @@ -697,7 +711,7 @@ function getRoutesAd(site: ISites) { separator: false }, { - active: site.confpages && site.confpages.enableReg && site.confpages.enabledRegNeedTelegram, + active: site.confpages && site.confpages?.enableReg && site.confpages?.enabledRegNeedTelegram, order: 1000, path: '/registrati/:invited/:usernameteleg/:idteleg', materialIcon: 'how_to_reg', @@ -708,7 +722,7 @@ function getRoutesAd(site: ISites) { separator: false }, { - active: site.confpages && site.confpages.enableReg, + active: site.confpages && site.confpages?.enableReg, order: 2000, path: '/regok', materialIcon: 'how_to_reg', diff --git a/src/router/routesECommerce.ts b/src/router/routesECommerce.ts index 8c767d25..a77a8ac2 100644 --- a/src/router/routesECommerce.ts +++ b/src/router/routesECommerce.ts @@ -84,20 +84,6 @@ function getRoutesEcomm(site: ISites) { onlyManager: true, onlyEditor: true }, - { - active: true, - order: 30, - path: '/admin/ecommerce/productInfos', - materialIcon: 'fas fa-lemon', - name: 'mypages.productInfos', - component: () => import('@src/rootgen/admin/productInfos/productInfos.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, { active: true, order: 30, @@ -257,7 +243,7 @@ function getRoutesEcomm(site: ISites) { const menuEcomm = [ { - active: site.confpages && site.confpages.enableEcommerce, + active: site.confpages && site.confpages?.enableEcommerce, path: '/ecommerce', order: 1402, faIcon: 'fas fa-lemon', @@ -272,7 +258,7 @@ function getRoutesEcomm(site: ISites) { }, ...routes_ecommerce, { - active: site.confpages && site.confpages.enableEcommerce, + active: site.confpages && site.confpages?.enableEcommerce, path: '/admin/ecommerce', order: 1420, materialIcon: 'next_week', diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index e969ebd6..4fec5bd6 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -157,6 +157,7 @@ const msg_it = { error404: 'error404', error404def: 'error404def', admin: { + editpages: 'Editor Pagine', menu: 'Amministrazione', eventlist: 'Le tue Prenotazioni', usereventlist: 'Prenotazioni Utenti', @@ -1106,6 +1107,7 @@ const msg_it = { calendario_eventi_riso: 'Calendario Eventi' }, newsletter: { + tipodest: 'Tipo Destinatario', title: 'Desideri ricevere la nostra Newsletter?', name: 'Il tuo Nome', surname: 'Il tuo Cognome', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 71278368..c6a4c16d 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -5660,7 +5660,7 @@ export const tools = { isDebugOn(): boolean { const globalStore = useGlobalStore(); const site = globalStore.site; - return site.confpages.enableDebugOn; + return site.confpages?.enableDebugOn; }, getDomainSite(): string { diff --git a/src/store/Products.ts b/src/store/Products.ts index f35956aa..c7ff6a10 100755 --- a/src/store/Products.ts +++ b/src/store/Products.ts @@ -1597,7 +1597,7 @@ export const useProducts = defineStore('Products', { mystr += order.quantity; } if (order.quantitypreordered > 0 && order.quantity > 0) { - mystr += ' ' + $t('ecomm.available'); + mystr += ' ' + t('ecomm.available'); mystr += ' + '; } if (order.quantitypreordered > 0) { diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index 68c608c0..e1eef580 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -483,12 +483,14 @@ export const useGlobalStore = defineStore('GlobalStore', { return arrprov && arrprov.length > 0; }, - getIdCircuitToAssignByProv: (state: IGlobalState) => (myprov: string): string => { - const arrprov: any[] = state.provinces.filter( - (recprov: IProvince) => recprov.prov === myprov && !!recprov.idCircuitToAssign - ); - return arrprov && arrprov.length > 0 ? arrprov[0].idCircuitToAssign : ''; - }, + getIdCircuitToAssignByProv: + (state: IGlobalState) => + (myprov: string): string => { + const arrprov: any[] = state.provinces.filter( + (recprov: IProvince) => recprov.prov === myprov && !!recprov.idCircuitToAssign + ); + return arrprov && arrprov.length > 0 ? arrprov[0].idCircuitToAssign : ''; + }, getRespByUsername: (state: IGlobalState) => (username: string) => { const rec = state.resps.find((recin: any) => recin.username === username); @@ -1435,7 +1437,7 @@ export const useGlobalStore = defineStore('GlobalStore', { }); }, - async loadPage(path: string, dove?: string) { + async loadPage(path: string, dove?: string, forza?: boolean) { const userStore = useUserStore(); path = path.substring(1); @@ -1444,7 +1446,7 @@ export const useGlobalStore = defineStore('GlobalStore', { // console.log('mypage', mypage) // Controlla se l'ho già caricato - if (!!mypage && (!!mypage.content || mypage.loadFirst || mypage.loaded)) { + if ((!!mypage && (!!mypage.content || mypage.loadFirst || mypage.loaded)) && !forza) { return mypage; } @@ -1471,6 +1473,24 @@ export const useGlobalStore = defineStore('GlobalStore', { }); }, + async savePage(page: IMyPage) { + const userStore = useUserStore(); + + return Api.SendReq('/savepage', 'POST', { page }) + .then((res) => { + if (res && res.data && res.data.ris) { + return res.data.ris; + } else { + return null; + } + }) + .catch((error: any) => { + console.log('error savePage', error); + userStore.setErrorCatch(error); + return null; + }); + }, + async duplicatePage(path: string, $q: any, t: any) { const userStore = useUserStore(); diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index 4d072498..194a9bf8 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -776,6 +776,11 @@ color="positive" @click="EseguiFunz('EnableNewsOn_ToAll')" > + @@ -127,7 +127,7 @@ color="primary" type="submit" :disable="v$.$error || v$.$invalid" - >{{ $t('install.submit') }} + >{{ t('install.submit') }}
diff --git a/src/views/login/vreg/vreg.ts b/src/views/login/vreg/vreg.ts
index 6dd95d5b..b9c45ada 100755
--- a/src/views/login/vreg/vreg.ts
+++ b/src/views/login/vreg/vreg.ts
@@ -72,6 +72,7 @@ export default defineComponent({
verificatook,
giaverificato,
myrisultato,
+ t,
}
},
diff --git a/src/views/login/vreg/vreg.vue b/src/views/login/vreg/vreg.vue
index adaf0a45..ab15859d 100755
--- a/src/views/login/vreg/vreg.vue
+++ b/src/views/login/vreg/vreg.vue
@@ -6,7 +6,7 @@
class="bg-primary text-white"
color="primary q-title"
style="text-align: center;">
-
+
diff --git a/src/views/requestresetpwd/requestresetpwd.ts b/src/views/requestresetpwd/requestresetpwd.ts
index cddc520c..83c6effa 100755
--- a/src/views/requestresetpwd/requestresetpwd.ts
+++ b/src/views/requestresetpwd/requestresetpwd.ts
@@ -114,6 +114,7 @@ export default defineComponent({
v$,
tools,
checkCode,
+ t,
}
}
})
diff --git a/src/views/requestresetpwd/requestresetpwd.vue b/src/views/requestresetpwd/requestresetpwd.vue
index 4193db31..27a3bba0 100755
--- a/src/views/requestresetpwd/requestresetpwd.vue
+++ b/src/views/requestresetpwd/requestresetpwd.vue
@@ -11,7 +11,7 @@
class="bg-primary text-white"
style="text-align: center"
>
-
+
@@ -37,7 +37,7 @@
-
diff --git a/src/views/projects/proj-list/proj-list.ts.off b/src/views/projects/proj-list/proj-list.ts.off
index 968440b7..3b85c6a4 100755
--- a/src/views/projects/proj-list/proj-list.ts.off
+++ b/src/views/projects/proj-list/proj-list.ts.off
@@ -674,7 +674,7 @@ export default defineComponent({
*/
- // const descr = $t('project.newproj').toString()
+ // const descr = t('project.newproj').toString()
async function addProject(descr: string, tipoproj: string) {
const projatt = projects.getRecordById(idProjAtt.value)
diff --git a/src/views/projects/proj-list/proj-list.vue.off b/src/views/projects/proj-list/proj-list.vue.off
index 6121e8b1..1c517b1a 100755
--- a/src/views/projects/proj-list/proj-list.vue.off
+++ b/src/views/projects/proj-list/proj-list.vue.off
@@ -309,7 +309,7 @@
- {{ $t('proj.createdby') }} {{ getCreatedBy(itemselproj) }}
+ {{ t('proj.createdby') }} {{ getCreatedBy(itemselproj) }}
@@ -41,7 +41,7 @@ color="primary" type="submit" :disable="v$.$error || v$.$invalid" - >{{ $t('reset.send_reset_pwd') }} + >{{ t('reset.send_reset_pwd') }} @@ -49,12 +49,12 @@
- {{ $t('reset.check_email') }}
+ {{ t('reset.check_email') }}
@@ -79,7 +79,7 @@ color="primary" type="submit" :disable="v$.$error || v$.$invalid" - >{{ $t('reset.confirmcode_reset') }} + >{{ t('reset.confirmcode_reset') }}
- {{ $t('reset.check_email') }}
+ {{ t('reset.check_email') }}
diff --git a/src/views/user/editprofile/editprofile.vue b/src/views/user/editprofile/editprofile.vue
index d04a1271..e2336179 100755
--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -28,7 +28,7 @@
>
- {{ $t('profile.info_msg') }}
+ {{ t('profile.info_msg') }}
@@ -96,7 +96,7 @@ $q, userStore.my.username, mygrp.groupname, - $t('db.domanda_exit_fromgroup', { + t('db.domanda_exit_fromgroup', { groupname: mygrp.groupname, }) ) @@ -109,7 +109,7 @@ />
- {{ $t('groups.private') }}
+ {{ t('groups.private') }}
- {{ $t('groups.private_descr') }}
+ {{ t('groups.private_descr') }}
-
{{ $t('groups.hidden') }}
- {{ $t('groups.hidden_descr') }}
+ {{ t('groups.hidden') }}
+ {{ t('groups.hidden_descr') }}
- {{ $t('products.category') }}
+ {{ t('products.category') }}
|
|---|