diff --git a/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js b/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js index 85c0f473..25b51103 100755 --- a/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js +++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js @@ -9,6 +9,7 @@ const msg_website_enUs = { quantity: 'Quantità ', quantityAvailable: 'Disponibili', stockQty: 'In Magazzino', + stockBloccatiQty: 'Bloccati In Magazzino', weight: 'Peso', stars: 'Voto', color: 'Colore', @@ -37,6 +38,7 @@ const msg_website_enUs = { productslist: 'Lista Prodotti', collabora: 'Collabora', storehouses: 'Magazzino', + providers: 'Fornitori', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', diff --git a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js index d67ccadf..aeab2813 100755 --- a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js +++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js @@ -31,10 +31,17 @@ const msg_website_it = { 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', + gasordine: 'Gas Ordine', + scontisticas: 'Scontistica', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', @@ -123,6 +130,7 @@ const msg_website_it = { only_residenti: 'Solo Residenti', only_consiglio: 'Solo Consiglieri', color: 'Colore', + gasordini: 'Gas Ordini', }, msg: { myAppName: 'Più che Buono', diff --git a/_ALL_SITES/piuchebuono.app/db/static_data.ts b/_ALL_SITES/piuchebuono.app/db/static_data.ts index 9b0f84e1..799d1f4a 100755 --- a/_ALL_SITES/piuchebuono.app/db/static_data.ts +++ b/_ALL_SITES/piuchebuono.app/db/static_data.ts @@ -88,6 +88,19 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, + { + active: site.confpages && site.confpages.enableCircuits, + order: 16, + path: '/circuits', + materialIcon: 'fas fa-coins', + name: 'mypages.circuits', + component: () => import('@/views/user/mycircuits/mycircuits.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + onlyAdmin: true, + onlyManager: true, + }, { active: site.confpages && site.confpages.enableGroups, order: 132, @@ -98,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: false, + onlyAdmin: true, + onlyManager: true, }, { active: true, @@ -109,6 +124,17 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, + }, + { + active: true, + order: 137, + path: '/circuit/:path', + materialIcon: 'fas fa-user', + name: 'proj.circuit2', + component: () => import('@/views/user/mycircuit/mycircuit.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, }, { active: true, diff --git a/_ALL_SITES/piuchebuono.app/quasar.conf.js b/_ALL_SITES/piuchebuono.app/quasar.conf.js index b4bf3510..5f342f74 100755 --- a/_ALL_SITES/piuchebuono.app/quasar.conf.js +++ b/_ALL_SITES/piuchebuono.app/quasar.conf.js @@ -317,54 +317,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/fv-android-icon-512x512.png', + src: 'images/pcb-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/fv-android-icon-384x384.png', + src: 'images/pcb-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/fv-android-icon-192x192.png', + src: 'images/pcb-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/fv-android-icon-144x144.png', + src: 'images/pcb-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-android-icon-96x96.png', + src: 'images/pcb-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/fv-apple-icon-120x120.png', + src: 'images/pcb-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/fv-apple-icon-144x144.png', + src: 'images/pcb-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-apple-icon-152x152.png', + src: 'images/pcb-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/fv-apple-icon-180x180.png', + src: 'images/pcb-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.riso.app/manifest.json" + "url": "https://www.piuchebuono.app/manifest.json" }] }, }, diff --git a/public/images/favicon.ico b/public/images/favicon.ico index 105ff16c..d283c964 100644 Binary files a/public/images/favicon.ico and b/public/images/favicon.ico differ diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index 56b229cb..981b05f2 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -115,7 +115,7 @@