menu RIS

2024-01-07 16:03:45 +01:00
parent be6ce49698
commit ecd3154dd8
13 changed files with 69 additions and 14 deletions
--- 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',
--- 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',
--- 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,
--- 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"
      }]
    },
  },
--- a/public/images/favicon.ico
+++ b/public/images/favicon.ico
--- a/src/components/MyHeader/MyHeader.vue
+++ b/src/components/MyHeader/MyHeader.vue
@@ -115,7 +115,7 @@
        <div v-if="site.confpages && site.confpages.showMsgs">
          <message-popover></message-popover>
        </div>
-        <div v-if="site.confpages && site.confpages.showCoins">
+        <div v-if="site.confpages && site.confpages.showCoins || site.confpages.showRIS">
          <coinsPopover v-model="rightCoinsOpen"></coinsPopover>
        </div>
        <div v-if="site.confpages && site.confpages.showNotif">
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -233,6 +233,7 @@ export interface IConfPages {
  showMsgs: boolean
  showNotif: boolean
  showCoins: boolean
+  showRIS: boolean
  showMenuCoins: boolean
  showNameSurname: boolean
  showCompetenze: boolean
--- a/src/rootgen/admin/confsite/confsite.vue
+++ b/src/rootgen/admin/confsite/confsite.vue
@@ -493,6 +493,16 @@
              :type="costanti.FieldType.boolean"
            >
            </CMyFieldDb>
+            <CMyFieldDb
+              table="sites"
+              :title="$t('confpages.showRIS')"
+              :id="mysite._id"
+              :rec="mysite"
+              mykey="confpages"
+              mysubkey="showRIS"
+              :type="costanti.FieldType.boolean"
+            >
+            </CMyFieldDb>
            <CMyFieldDb
              table="sites"
              :title="$t('confpages.showMenuCoins')"
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1557,7 +1557,8 @@ const msg_it = {
      sendNewsletter: 'Menu Invia Newsletter',
      showMsgs: 'Messaggi',
      showNotif: 'Notifiche',
-      showCoins: 'RIS',
+      showCoins: 'Monete',
+      showRIS: 'RIS',
      showMenuCoins: 'Menu Monete',
      showNameSurname: 'Mostra Nome e Cognome',
      showCompetenze: 'Mostra Competenze',
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1931,7 +1931,7 @@ export const useUserStore = defineStore('UserStore', {

      const globalStore = useGlobalStore()

-      if (globalStore.site && !globalStore.site.confpages.showCoins) {
+      if (globalStore.site && (!globalStore.site.confpages.showCoins  && !globalStore.site.confpages.showRIS)) {
        return false
      }

--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -162,6 +162,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
        showMsgs: false,
        showNotif: false,
        showCoins: false,
+        showRIS: false,
        showMenuCoins: false,
        showNameSurname: false,
        showCompetenze: false,
--- a/src/views/user/mycircuit/mycircuit.ts
+++ b/src/views/user/mycircuit/mycircuit.ts
@@ -38,6 +38,7 @@ export default defineComponent({
  props: {},
  setup() {
    const userStore = useUserStore()
+    const globalStore = useGlobalStore()
    const notifStore = useNotifStore()
    const circuitStore = useCircuitStore()
    const $route = useRoute()
@@ -550,6 +551,7 @@ export default defineComponent({
      aggiornaSaldo,
      loadSaldo,
      optionsmov,
+      globalStore,
    }
  }
 })
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -316,6 +316,7 @@
            v-if="
              userStore.my.profile &&
              userStore.my.profile.calc.numGoodsAndServices <= 0 &&
+              globalStore.site.confpages.showRIS &&
              userStore.IsMyCircuitByName(circuit.name)
            "
            rounded
@@ -332,7 +333,10 @@
            ><br />
          </q-banner>
          <q-banner
-            v-else-if="userStore.my.profile.calc.numGoodsAndServices <= 0"
+            v-else-if="
+              globalStore.site.confpages.showRIS &&
+              userStore.my.profile.calc.numGoodsAndServices <= 0
+            "
            rounded
            class="bg-deep-purple text-white"
            style="text-align: center"