- Gestore Ordini GAS (aggiornato)

- Possibilità di modificare un record, click sulla matita rossa. - corretto altre sistemazioni sui valori di minimo e massimo quantità.
2025-10-03 16:28:46 +02:00
parent fc1e9d4666
commit b07d4c822f
73 changed files with 1767 additions and 3592866 deletions
--- a/src/components/CCart/CCart.ts
+++ b/src/components/CCart/CCart.ts
@@ -306,8 +306,8 @@ export default defineComponent({

      let index = 1
      for (const itemorder of getItemsCart.value) {
-        const productCode = itemorder.order.product?.productInfo.code || '';
-        const productName = itemorder.order.product?.productInfo.name || '';
+        const productCode = itemorder.order.product?.productInfo?.code || '';
+        const productName = itemorder.order.product?.productInfo?.name || '';
        const quantity = itemorder.order.quantity + itemorder.order.quantitypreordered;
        const price = Number(itemorder.order.price).toFixed(2);
        const totalPrice = (parseFloat(price) * quantity).toFixed(2);
--- a/src/components/CCart/CCart.vue
+++ b/src/components/CCart/CCart.vue
@@ -23,7 +23,7 @@
            >
              <CSingleCart
                :order="itemorder.order"
-                :idOrdersCart="recOrderCart._id"
+                :idOrdersCart="recOrderCart?._id"
                :showall="true"
              />
            </div>
@@ -36,7 +36,7 @@
            <table class="table-price">
              <tbody>
                <tr>
-                  <td class="label-price">{{ t('ecomm.prezzointero') }}:</td>
+                  <td class="label-price">{{ myTotalPrice !== totalPriceIntero ? t('ecomm.prezzointero') : t('ecomm.totale') }}:</td>
                  <td
                    class="value-price text-subtitle1"
                    :class="{ 'text-strike': myTotalPrice !== totalPriceIntero }"
@@ -44,7 +44,7 @@
                    € {{ totalPriceIntero }}
                  </td>
                </tr>
-                <tr v-if="recOrderCart.codice_sconto">
+                <tr v-if="recOrderCart?.codice_sconto">
                  <td class="label-price">{{ t('ecomm.sconto_appl') }}:</td>
                  <td>
                    <div class="column items-center">
@@ -69,7 +69,7 @@
                  </td>
                </tr>

-                <tr v-if="!recOrderCart.codice_sconto">
+                <tr v-if="!recOrderCart?.codice_sconto">
                  <td class="label">{{ t('ecomm.codice_sconto') }}:</td>
                  <td>
                    <q-input
@@ -91,7 +91,7 @@
                  </td>
                </tr>

-                <tr>
+                <tr v-if="myTotalPrice !== totalPriceIntero">
                  <td class="label">{{ t('ecomm.totale_scontato') }}:</td>
                  <td class="ordine_scontato_nuovo text-center">€ {{ myTotalPrice }}</td>
                </tr>
@@ -114,7 +114,7 @@
          </q-input>

          <div
-            v-if="recOrderCart.note_ordine_gas"
+            v-if="recOrderCart?.note_ordine_gas"
            class="note_ordine_gas"
            v-html="recOrderCart.note_ordine_gas"
          ></div>
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -1773,6 +1773,10 @@ export default defineComponent({
      return userStore.isFacilitatore;
    }

+    function enableToEdit() {
+      return isFacilitatore() || userStore.isAdmin || userStore.isManager;
+    }
+
    function isAdmin() {
      return userStore.isAdmin;
    }
@@ -2378,6 +2382,12 @@ export default defineComponent({
            }
          }
        }
+
+        if (enableToEdit()) {
+          colVisib.value.push('deleterec');
+          colVisib.value.push('copyrec');
+          colVisib.value.unshift('modifrec');
+        }
      }

      // console.log('REFRR - changetable')
--- a/src/components/CMyCart/CMyCart.vue
+++ b/src/components/CMyCart/CMyCart.vue
@@ -27,7 +27,7 @@
          <table class="table">
            <tbody>
              <tr>
-                <td class="label">{{ t('ecomm.prezzointero') }}:</td>
+                <td class="label-price">{{ myTotalPrice !== totalPriceIntero ? t('ecomm.prezzointero') : t('ecomm.totale') }}:</td>
                <td
                  class="value text-subtitle1 text-right"
                  :class="{ 'text-strike': myTotalPrice !== totalPriceIntero }"
@@ -35,7 +35,7 @@
                  € {{ totalPriceIntero }}
                </td>
              </tr>
-              <tr v-if="recOrderCart.codice_sconto">
+              <tr v-if="recOrderCart?.codice_sconto">
                <td class="label">{{ t('ecomm.sconto_appl') }}:</td>
                <td>
                  <div class="column items-center">
@@ -52,7 +52,7 @@
                </td>
              </tr>

-              <tr v-if="!recOrderCart.codice_sconto">
+              <tr v-if="!recOrderCart?.codice_sconto">
                <td class="label">{{ t('ecomm.codice_sconto') }}:</td>
                <td>
                  <q-input
@@ -74,7 +74,7 @@
                </td>
              </tr>

-              <tr>
+              <tr v-if="myTotalPrice !== totalPriceIntero">
                <td class="label">{{ t('ecomm.totale_scontato') }}:</td>
                <td class="ordine_scontato_nuovo text-right">€ {{ myTotalPrice }}</td>
              </tr>
--- a/src/components/COrdersCart/COrdersCart.vue
+++ b/src/components/COrdersCart/COrdersCart.vue
@@ -1,6 +1,6 @@
 <template>
  <q-spinner v-if="!endload" color="primary" size="3em" :thickness="2" />
-  <div v-if="endload && recOrderCart.numorder > 0">
+  <div v-if="endload && recOrderCart?.numorder > 0">
    <div v-if="recOrderCart" class="panel">
      <q-toggle
        v-if="tools.isManager()"
--- a/src/components/CProductCard/CProductCard.vue
+++ b/src/components/CProductCard/CProductCard.vue
@@ -139,7 +139,7 @@
              (cosa === shared_consts.PROD.GAS && Products.getQtyAvailable(myproduct) > 0)
            "
            :clickable="tools.isManager()"
-            style="padding: 16px !important;"
+            style="padding: 16px !important"
            @click="
              tools.isManager() &&
              !editOn &&
@@ -239,7 +239,10 @@
          <div class="text-h7 boldhigh titolo_prod">
            {{ myproduct.productInfo.name }}
          </div>
-          <div v-if="myproduct?.productInfo?.authors" class="text-h8 text-italic titolo_prod q-mb-sm">
+          <div
+            v-if="myproduct?.productInfo?.authors"
+            class="text-h8 text-italic titolo_prod q-mb-sm"
+          >
            {{ Products.getAutoriByArrayAuthors(myproduct.productInfo.authors) }}
          </div>
          <div class="product_code">
@@ -419,8 +422,9 @@
                :editOn="editOn"
                table="products"
                :id="myproduct._id"
-                :rec="myproduct.productInfo"
-                mykey="note"
+                :rec="myproduct"
+                mykey="productInfo"
+                mysubkey="note"
                debounce="1000"
                @save="updateproductmodif"
                :type="costanti.FieldType.string"
@@ -452,8 +456,9 @@
              :title="t('products.imagefile')"
              table="products"
              :id="myproduct._id"
-              :rec="myproduct.productInfo"
-              mykey="imagefile"
+              :rec="myproduct"
+              mykey="productInfo"
+              mysubkey="imagefile"
              debounce="1000"
              @save="updateproductmodif"
              :type="costanti.FieldType.imagerec"
@@ -513,10 +518,10 @@
                :type="costanti.FieldType.number"
              >
              </CMyValueDb>
-              <CMyValueDb
+              <!--<CMyValueDb
                v-if="editOn"
                :editOn="editOn"
-                :title="t('products.maxbookableGASQty')"
+                :title="t('ecomm.maxbookableGASQty')"
                table="products"
                :id="myproduct._id"
                :rec="myproduct"
@@ -525,7 +530,7 @@
                @save="updateproductmodif"
                :type="costanti.FieldType.number"
              >
-              </CMyValueDb>
+              </CMyValueDb>-->
              <div class="prod_qtywarn">
                <div v-if="tools.isManager() && !!myproduct.QuantitaPrenotateInAttesa">
                  {{
@@ -679,8 +684,8 @@
                {{
                  t('ecomm.bookedGASQtyOrdered_str', {
                    qta:
-                      (myproduct.bookableGASBloccatiQty +
-                        myproduct.QuantitaPrenotateInAttesa) *
+                      (Products.getQtyBloccataBookableAvailable(myproduct) +
+                        Products.getQuantitaPrenotateInAttesa(myproduct)) *
                      myproduct.productInfo.weight,
                    qtatot: myproduct.qtyToReachForGas * myproduct.productInfo.weight,
                  })
--- a/src/components/CUserNonVerif/CUserNonVerif.vue
+++ b/src/components/CUserNonVerif/CUserNonVerif.vue
@@ -9,7 +9,7 @@
        (site.confpages?.enableRegMultiChoice || !site.confpages?.enabledRegNeedTelegram)
      "
    >
-      <CVerifyEmail v-if="!tools.isEmailVerified() && !tools.TelegVerificato()">
+      <CVerifyEmail v-if="tools.isLogged() && !tools.isEmailVerified() && !tools.TelegVerificato()">
      </CVerifyEmail>
    </div>

--- a/src/db/lang/ws_enUs.js
+++ b/src/db/lang/ws_enUs.js
@@ -8,6 +8,8 @@ const msg_website_enUs = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
+    stockBloccatiQty: 'Bloccati In Magazzino',  
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
@@ -36,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/src/db/lang/ws_es.js
+++ b/src/db/lang/ws_es.js
@@ -8,6 +8,7 @@ const msg_website_es = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,7 +1,7 @@
 const msg_website_it = {
  ws: {
-    sitename: 'Gruppo Macro',
-    siteshortname: 'Gruppo Macro',
+    sitename: 'Più che Buono',
+    siteshortname: 'Più che Buono',
    description: '',
    keywords: '',
  },
@@ -30,6 +30,27 @@ const msg_website_it = {
    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',
+    sharewithus: 'Condividi con Noi',
+    checkout: 'Carrello',
+    payment: 'Pagamenti',
    regok: 'Registrazione Confermata',
    presentazione: 'Presentazione',
    presentazione2: 'Presentazione',
@@ -75,12 +96,14 @@ const msg_website_it = {
    eventodef: 'Evento:',
    prova: 'prova',
    dbop: 'Operazioni',
-    dbopmacro: 'Operazioni Macro',
    projall: 'Comunitari',
    groups: 'Lista Gruppi',
    projectsShared: 'Condivisi da me',
    myprojects: 'Privati',
    favproj: 'Favoriti',
+    admin_ecommerce: 'ECommerce',
+    ecommerce: 'Prodotti',
+    ecommerce_menu: 'ECommerce1',
    hours: 'Ore',
    department: 'Uffici',
    title: 'Titolo',
@@ -109,8 +132,9 @@ const msg_website_it = {
    onlyif_logged: 'Solo se Loggati',
    only_residenti: 'Solo Residenti',
    only_consiglio: 'Solo Consiglieri',
-    only_collab: 'Solo Collaboratori',
    color: 'Colore',
+    gestoreordini: 'Gestore Ordini',
+    gestoreordinigas: 'Gestore Ordini GAS',
  },
  msg: {
    myAppName: 'Più che Buono',
@@ -172,18 +196,7 @@ const msg_website_it = {
      descr: '<ul class="mylist" style="padding-left: 20px;">'
        + '<li>📱<strong>Condividendo la APP</strong> a tutti coloro che vogliono far parte insieme della crescita e sviluppo di una Nuova Era</li>'
        + '<li>👥 Aiutando a creare Gruppi Territoriali nella vostra città, impegnandosi a realizzare progetti per il Bene Comune, in onore ai principi Amorevoli e di condivisione.</li>'
-        + '<li>🌱 Sostenendo le persone attorno a voi, e rispettando la nostra vera Casa: Madre Natura e Tutti gli Esseri Viventi. ❤️</li>'
-        + '<li>👨🏻‍💻 Con una <strong>piccola donazione</strong> per le spese dei Server, manutenzione e per i continui sviluppi e miglioramenti</li></ul>' +
-        '1) Tramite <strong><a href="https://paypal.me/paoloarena" target="_blank">Paypal</a></strong>:<br>' +
-        '<br>2) Tramite <strong>Satispay</strong>: <a href="https://www.satispay.com/app/match/link/money-box/S6Y-SVN--62712D42-35B0-4BB9-8511-410C2AB8CD45" target="_blank">Clicca qui</a><br>' +
-        '<div style="font-size: 1rem; background-color: white; color: blue; border: solid 2px #f00; margin: 5px; padding: 5px; border-radius: 10px; " ' +
-        'class="row justify-around">' +
-        'Se ancora non hai Satispay <a href="https://www.satispay.com/promo/PAOLOARENA4">Richiedila cliccando qui</a></br>' +
-        '</div>' +
-        '<br>3) Tramite <strong>Bonifico Bancario</strong>:<br>' +
-        '(Scrivi a Surya (<a href="https://t.me/surya1977">@surya1977</a>) per le coordinate</br>' +
-        '' +
-        '4) In alternativa scegli tu una forma di Dono <br />' +
+        + '<li>🌱 Sostenendo le persone attorno a voi, e rispettando la nostra vera Casa: Madre Natura e Tutti gli Esseri Viventi. ❤️</li>' +
        'Grazie Mille per l\'Aiuto ed il Supporto' +
        '<br>',
    },
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -1,6 +1,6 @@
-/* GRUPPOMACRO APP
+/* PIUCHEBUONO APP
 */
-import {
+import type {
  IListRoutes,
  ILang,
  IPreloadImages,
@@ -8,30 +8,6 @@ import {
 } from '@model'


-// const SHOW_PROJINTHEMENU = false
-//
-// let arrlistafavourite = []
-// let arrlistaprojtutti = []
-// let arrlistaprojmiei = []
-// if (SHOW_PROJINTHEMENU) {
-//   arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
-//   arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
-//   arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
-// }
-// PROGETTI -> FAVORITI :
-
-// if (arrlistafavourite.length > 0) {
-//   arrMenu.push({
-//     icon: 'favorite_border',
-//     nametranslate: 'pages.' + RouteNames.favouriteprojects,
-//     urlroute: RouteNames.favouriteprojects,
-//     level_parent: 0.0,
-//     level_child: 0.5,
-//     routes2: arrlistafavourite,
-//     idelem: ''
-//   })
-// }
-
 const firstPage = {
  active: true,
  order: 5,
@@ -44,7 +20,6 @@ const firstPage = {
  infooter: true,
 }

-
 function getDynamicPages(site: ISites): IListRoutes[] {

  const baseroutes: IListRoutes[] = [
@@ -66,43 +41,13 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      materialIcon: 'fas fa-test',
      name: 'mypages.test',
      component: () => import('@src/views/testServer/testServer.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 400,
-      path: '/test-lungo',
-      materialIcon: 'fas fa-test',
-      name: 'mypages.test_lungo',
-      component: () => import('@src/views/testLungo/testLungo.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/provapao',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.provapao',
-      component: () => import('@src/root/provapao/provapao.vue'),
      meta: { requiresAuth: true },
      inmenu: false,
      infooter: false,
    },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 16,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@src/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.enableEvents,
+
+    /*{
+      active: true,
      order: 20,
      path: '/events',
      materialIcon: 'fas fa-bullhorn',
@@ -111,6 +56,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: true,
+    },*/
+    {
+      active: site.confpages && site.confpages.showProfile,
+      order: 120,
+      path: '/myprofile',
+      materialIcon: 'fas fa-user',
+      name: 'pages.profile',
+      component: () => import('@src/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
    },
    {
      active: true,
@@ -124,18 +80,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.showProfile,
-      order: 120,
-      path: '/myprofile',
-      materialIcon: 'fas fa-user',
-      name: 'pages.profile',
-      component: () => import('@src/views/user/myprofile/myprofile.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.showProfile,
+      active: true,
      order: 120,
      path: '/editprofile',
      materialIcon: 'fas fa-user',
@@ -156,6 +101,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('@src/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+      onlyAdmin: true,
+      onlyManager: true,
+    },
    {
      active: site.confpages && site.confpages.enableGroups,
      order: 132,
@@ -166,6 +124,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: false,
+      onlyAdmin: true,
+      onlyManager: true,
    },
    {
      active: true,
@@ -241,6 +201,16 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: false,
      infooter: false,
    },
+    {
+      active: true,
+      order: 150,
+      path: '/fundraising',
+      materialIcon: 'fas fa-hand-holding-heart',
+      name: 'pages.fundraising',
+      component: () => import('@src/root/fundraising/fundraising.vue'),
+      inmenu: false,
+      infooter: false,
+    },
    {
      active: true,
      order: 80,
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -41,7 +41,7 @@ export default defineComponent({
    }

    function updatemenu() {
-      console.log('*** updatemenu');
+      // console.log('*** updatemenu');
      const mymenu = globalStore.getmenu;
      Object.keys(mymenu).forEach((parentName: any) => {
        // @ts-ignore
--- a/src/rootgen/admin/gasordini/gasordini.ts
+++ b/src/rootgen/admin/gasordini/gasordini.ts
@@ -10,11 +10,13 @@ import { CTitleBanner } from '../../../components/CTitleBanner'
 import { CGridTableRec } from '../../../components/CGridTableRec'

 import MixinMetaTags from '../../../mixins/mixin-metatags'
+import { useI18n } from 'vue-i18n'

 export default defineComponent({
  name: 'GasOrdini',
  components: { CImgText, CCard, CMyPage, CTitleBanner, CGridTableRec },
  setup() {
+    const { t } = useI18n();
    const pagination = {
      sortBy: 'name',
      descending: false,
@@ -28,6 +30,7 @@ export default defineComponent({
    return {
      colTableGasordine,
      setmeta,
+      t,
    }
  }

--- a/src/rootgen/admin/gasordini/gasordini.vue
+++ b/src/rootgen/admin/gasordini/gasordini.vue
@@ -1,8 +1,8 @@
 <template>
-  <CMyPage title="Gas Ordini" imgbackground="/images/fornitori.jpg" sizes="max-height: 120px">
+  <CMyPage :title="t('pages.gestoreordinigas')" imgbackground="/images/fornitori.jpg" sizes="max-height: 120px">
    <span>{{
      setmeta({
-        title: 'Gas Ordini',
+        title: t('pages.gestoreordinigas'),
        description: '',
        keywords: '',
      })
@@ -10,10 +10,10 @@
    </span>

    <div class="q-ma-sm q-gutter-sm q-pa-xs">
-      <CTitleBanner title="Gas Ordini"></CTitleBanner>
-      <CGridTableRec prop_mytable="gasordines" prop_mytitle="Lista Gas Ordini" :prop_mycolumns="colTableGasordine"
-        prop_colkey="name" nodataLabel="Nessun Gas Ordine"
-        noresultLabel="Il filtro selezionato non ha trovato nessun risultato">
+      <CTitleBanner :title="t('pages.gestoreordinigas')"></CTitleBanner>
+      <CGridTableRec prop_mytable="gasordines" :prop_mytitle="t('pages.gestoreordinigas')" :prop_mycolumns="colTableGasordine"
+        prop_colkey="name" nodataLabel="Nessun Gas"
+        noresultLabel="Il filtro selezionato non ha trovato nessun GAS">

      </CGridTableRec>
    </div>
--- a/src/rootgen/admin/gestoreordini_old/gestoreordini.ts
+++ b/src/rootgen/admin/gestoreordini_old/gestoreordini.ts
@@ -48,14 +48,6 @@ export default defineComponent({
            preserveNullAndEmptyArrays: true,
          },
        },
-        /*{
-          $lookup: {
-            from: 'productinfos',
-            localField: 'product.idProductInfo',
-            foreignField: '_id',
-            as: 'productInfo',
-          },
-        },*/
        {
          $unwind: {
            path: '$productInfo',
--- a/src/router/routesECommerce.ts
+++ b/src/router/routesECommerce.ts
@@ -58,48 +58,7 @@ function getRoutesEcomm(site: ISites) {
  const routes_admin_ecommerce: IListRoutes[] = [
    {
      active: true,
-      order: 30,
-      path: '/admin/ecommerce/settings',
-      materialIcon: 'fas fa-cogs',
-      name: 'ecomm.settings',
-      component: () => import('@src/rootgen/admin/settings/settings.vue'),
-      inmenu: true,
-      submenu: true,
-      level_parent: 0,
-      level_child: 0.5,
-      onlyManager: true,
-      onlyEditor: true
-    },
-    {
-      active: true,
-      order: 1040,
-      path: '/products/importa',
-      materialIcon: 'fas fa-upload',
-      name: 'otherpages.manage.importaprodotti',
-      component: () => import('@src/rootgen/admin/importaprodotti/importaprodotti.vue'),
-      level_parent: 0.0,
-      level_child: 0.5,
-      inmenu: true,
-      submenu: true,
-      onlyAdmin: true
-    },
-    {
-      active: true,
-      order: 30,
-      path: '/admin/ecommerce/cash',
-      materialIcon: 'fas fa-cash-register',
-      name: 'mypages.cash',
-      component: () => import('@src/views/ecommerce/cash/cash.vue'),
-      inmenu: true,
-      submenu: true,
-      level_parent: 0,
-      level_child: 0.5,
-      onlyManager: true,
-      onlyEditor: true
-    },
-    {
-      active: true,
-      order: 30,
+      order: 10,
      path: '/admin/ecommerce/products',
      materialIcon: 'fas fa-lemon',
      name: 'mypages.listinoprodotti',
@@ -111,6 +70,33 @@ function getRoutesEcomm(site: ISites) {
      onlyManager: true,
      onlyEditor: true
    },
+    {
+      active: true,
+      order: 30,
+      path: '/admin/ecommerce/gasordini',
+      materialIcon: 'fas fa-file-alt',
+      name: 'pages.gestoreordinigas',
+      component: () => import('@src/rootgen/admin/gasordini/gasordini.vue'),
+      inmenu: true,
+      submenu: true,
+      level_parent: 0,
+      level_child: 0.5,
+      onlyManager: true,
+      onlyEditor: true
+    },
+    {
+      active: true,
+      order: 12,
+      path: '/products/importa',
+      materialIcon: 'fas fa-upload',
+      name: 'otherpages.manage.importaprodotti',
+      component: () => import('@src/rootgen/admin/importaprodotti/importaprodotti.vue'),
+      level_parent: 0.0,
+      level_child: 0.5,
+      inmenu: true,
+      submenu: true,
+      onlyAdmin: true
+    },
    {
      active: true,
      order: 30,
@@ -167,20 +153,6 @@ function getRoutesEcomm(site: ISites) {
      onlyManager: true,
      onlyEditor: true
    },
-    {
-      active: true,
-      order: 30,
-      path: '/admin/ecommerce/gasordini',
-      materialIcon: 'fas fa-file-alt',
-      name: 'mypages.gasordini',
-      component: () => import('@src/rootgen/admin/gasordini/gasordini.vue'),
-      inmenu: true,
-      submenu: true,
-      level_parent: 0,
-      level_child: 0.5,
-      onlyManager: true,
-      onlyEditor: true
-    },
    {
      active: true,
      order: 30,
@@ -251,6 +223,34 @@ function getRoutesEcomm(site: ISites) {
      onlyManager: true,
      onlyEditor: true
    },
+    {
+      active: true,
+      order: 1900,
+      path: '/admin/ecommerce/cash',
+      materialIcon: 'fas fa-cash-register',
+      name: 'mypages.cash',
+      component: () => import('@src/views/ecommerce/cash/cash.vue'),
+      inmenu: true,
+      submenu: true,
+      level_parent: 0,
+      level_child: 0.5,
+      onlyManager: true,
+      onlyEditor: true
+    },
+    {
+      active: true,
+      order: 2000,
+      path: '/admin/ecommerce/settings',
+      materialIcon: 'fas fa-cogs',
+      name: 'ecomm.settings',
+      component: () => import('@src/rootgen/admin/settings/settings.vue'),
+      inmenu: true,
+      submenu: true,
+      level_parent: 0,
+      level_child: 0.5,
+      onlyManager: true,
+      onlyEditor: true
+    },

  ]

--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -92,7 +92,6 @@ const msg_it = {
      bookedQtyOrdered: 'Quantità Ordinate',
      bookedQtyConfirmed: 'Quantità Confermate',
      bookableAvailableQty: 'Disponib. Prenotabili',
-      maxbookableGASQty: 'Prenotabili',
      bookedGASQtyConfirmed: 'Qtà GAS Confermate',
      bookableGASBloccatiQty: 'Qtà GAS Bloccate',
      weight: 'Peso',
@@ -1269,6 +1268,7 @@ const msg_it = {
      date_updated: 'Ult. Aggiornamento',
    },
    mypages: {
+      listadeigas: 'Lista dei GAS',
      catalogo_new: 'Vuoi andare al Catalogo "{title}" appena creato?',
      confirm_nav: 'Conferma Navigazione',
      catalogo_err: 'Catalogo non generato correttamente',
@@ -1282,7 +1282,6 @@ const msg_it = {
      admin_ecommerce: 'ECommerce',
      ecommerce: 'Prodotti',
      ecommerce_menu: 'ECommerce1',
-      gasordini: 'Gas Ordini',
      gestoreordini: 'Gestore Ordini',
      producer: 'Produttore',
      orderinfo: 'Ordini Effettuati',
@@ -1941,6 +1940,7 @@ const msg_it = {
      bloccati: 'Bloccati',
      bookedGASQtyOrdered: 'Prenotate',
      bookedGASQtyOrdered_str: 'Prenotati {qta} su {qtatot} {unit}',
+      maxbookableGASQty: 'Prenotabili',
      booked_su_str: '{qta} su {qtatot}',
      qtyToReachForGas: 'Qta da raggiungere',
      offerta_gas: 'Offerta valida al raggiungimento di {qta} {unit}',
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -875,6 +875,7 @@ export const colmyelems = [
    label_trans: 'myelems.idElemParent',
  }),
  AddCol(DeleteRec),
+  AddCol(ModifRec),
  AddCol(DuplicateRec),
 ];

@@ -1166,6 +1167,7 @@ export const colmypage = [
    fieldtype: costanti.FieldType.string,
  }),
  AddCol(DeleteRec),
+  AddCol(ModifRec),
  AddCol(DuplicateRec),
 ];

@@ -1213,6 +1215,7 @@ export const colmybot = [
    fieldtype: costanti.FieldType.date,
  }),
  AddCol(DeleteRec),
+  AddCol(ModifRec),
  AddCol(DuplicateRec),
 ];

@@ -1336,6 +1339,7 @@ export const colnewstosent = [
    label_trans: 'newsletter.error_job',
    fieldtype: costanti.FieldType.string,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1361,6 +1365,7 @@ export const colTableProducer = [
  AddCol({ name: 'city', label_trans: 'producer.city' }),
  AddCol({ name: 'img', label_trans: 'producer.img' }),
  AddCol({ name: 'website', label_trans: 'reg.website' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1450,6 +1455,7 @@ export const colTableShareWithUs = [
    label_trans: 'share.rating',
    fieldtype: costanti.FieldType.number,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1476,6 +1482,7 @@ export const colTableHours = [
    showWhen:
      costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1490,6 +1497,7 @@ export const colTablegroups = [
    fieldtype: costanti.FieldType.multiselect,
    jointable: 'workers',
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1497,6 +1505,7 @@ export const colTablegroups = [
 export const colTabledepartments = [
  AddCol({ name: 'name', label_trans: 'store.name' }),
  AddCol({ name: 'username', label_trans: 'store.username' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1504,6 +1513,7 @@ export const colTabledepartments = [
 export const colTablecategories = [
  AddCol({ name: 'name', label_trans: 'categories.name' }),
  AddCol({ name: 'img', label_trans: 'categories.img' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1514,24 +1524,28 @@ export const colTableCatProd = [
  AddCol({ name: 'img', label_trans: 'categories.img' }),
  AddCol({ name: 'icon', label_trans: 'categories.icon' }),
  AddCol({ name: 'color', label_trans: 'categories.color' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
 export const colTableStatiProdotto = [
  AddCol({ name: 'IdTipologia', label_trans: 'statoprod.IdTipologia' }),
  AddCol({ name: 'Descrizione', label_trans: 'statoprod.Descrizione' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
 export const colTableTipoFormato = [
  AddCol({ name: 'IdTipoFormato', label_trans: 'statoprod.IdTipologia' }),
  AddCol({ name: 'Descrizione', label_trans: 'statoprod.Descrizione' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
 export const colTableTipologie = [
  AddCol({ name: 'IdTipologia', label_trans: 'statoprod.IdTipologia' }),
  AddCol({ name: 'Descrizione', label_trans: 'statoprod.Descrizione' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1547,6 +1561,7 @@ export const colTableCollane = [
    fieldtype: costanti.FieldType.number,
  }),
  AddCol({ name: 'title', label_trans: 'collane.title' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1556,6 +1571,7 @@ export const colTableCatAI = [
  AddCol({ name: 'img', label_trans: 'categories.img' }),
  AddCol({ name: 'icon', label_trans: 'categories.icon' }),
  AddCol({ name: 'color', label_trans: 'categories.color' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1571,6 +1587,7 @@ export const colTableQueryAI = [
  AddCol({ name: 'query', label_trans: 'queryai.query' }),
  AddCol({ name: 'ask', label_trans: 'queryai.ask' }),
  AddCol({ name: 'output_type', label_trans: 'queryai.output_type' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1586,6 +1603,7 @@ export const colTableSubCatProd = [
  AddCol({ name: 'img', label_trans: 'categories.img' }),
  AddCol({ name: 'icon', label_trans: 'categories.icon' }),
  AddCol({ name: 'color', label_trans: 'categories.color' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1641,6 +1659,7 @@ export const colTableStorehouse = [
    label_trans: 'store.email_GAS_html_order_consegnato',
    fieldtype: costanti.FieldType.html,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1654,6 +1673,7 @@ export const colTableProviders = [
  AddCol({ name: 'region', label_trans: 'store.region' }),
  AddCol({ name: 'img', label_trans: 'store.img' }),
  AddCol({ name: 'website', label_trans: 'reg.website' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1663,21 +1683,13 @@ export const colTableGasordine = [
    label_trans: 'sites.active',
    fieldtype: costanti.FieldType.boolean,
  }),
+  AddCol(ModifRec),
  AddCol({ name: 'name', label_trans: 'store.name' }),
-  AddCol({ name: 'description', label_trans: 'store.description' }),
-  AddCol({ name: 'referente', label_trans: 'store.referent' }),
-  AddCol({ name: 'city', label_trans: 'store.city' }),
-  AddCol({ name: 'img', label_trans: 'store.img' }),
  AddCol({
    name: 'dataora_chiusura_ordini',
    label_trans: 'gas.dataora_chiusura_ordini',
    fieldtype: costanti.FieldType.date,
  }),
-  AddCol({
-    name: 'note_ordine_gas',
-    label_trans: 'gas.note_ordine_gas',
-    fieldtype: costanti.FieldType.html,
-  }),
  AddCol({
    name: 'data_arrivo_merce',
    label_trans: 'gas.data_arrivo_merce',
@@ -1688,6 +1700,17 @@ export const colTableGasordine = [
    label_trans: 'gas.dataora_ritiro',
    fieldtype: costanti.FieldType.date,
  }),
+  AddCol({ name: 'description', label_trans: 'store.description' }),
+  AddCol({ name: 'referente', label_trans: 'store.referent' }),
+  AddCol({ name: 'city', label_trans: 'store.city' }),
+  AddCol({ name: 'img', label_trans: 'store.img' }),
+  AddCol({
+    name: 'note_ordine_gas',
+    label_trans: 'gas.note_ordine_gas',
+    fieldtype: costanti.FieldType.html,
+    showWhen:
+      costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+  }),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1724,6 +1747,7 @@ export const colTableScontistica = [
    label_trans: 'scontistica.comulativo',
    fieldtype: costanti.FieldType.boolean,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -1751,6 +1775,7 @@ export const colSectors = [
  AddCol({ name: 'theme', label_trans: 'products.theme' }),
  AddCol({ name: 'img', label_trans: 'store.img' }),
  AddCol({ name: 'icon', label_trans: 'store.icon' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4464,6 +4489,21 @@ export const colTableProdShort = [
    label_trans: 'products.stockQty',
    fieldtype: costanti.FieldType.number,
  }),
+  AddCol({
+    name: 'maxbookableGASQty',
+    label_trans: 'ecomm.maxbookableGASQty',
+    fieldtype: costanti.FieldType.number,
+  }),
+  AddCol({
+    name: 'maxBookableSinglePersQty',
+    label_trans: 'products.maxBookableSinglePersQty',
+    fieldtype: costanti.FieldType.number,
+  }),
+  AddCol({
+    name: 'qtyToReachForGas',
+    label_trans: 'ecomm.qtyToReachForGas',
+    fieldtype: costanti.FieldType.number,
+  }),
  AddCol({
    name: 'price_acquistato',
    label_trans: 'products.price_acquistato',
@@ -4490,7 +4530,7 @@ export const colTableProdShort = [
  }),
  AddCol({
    name: 'idProvider',
-    label_trans: 'provider.name',
+    label_trans: 'providers.name',
    fieldtype: costanti.FieldType.select,
    jointable: 'providers',
  }),
@@ -4575,7 +4615,7 @@ export const colTableProducts = [
  }),
  AddCol({
    name: 'idProvider',
-    label_trans: 'provider.name',
+    label_trans: 'providers.name',
    fieldtype: costanti.FieldType.select,
    jointable: 'providers',
  }),
@@ -4696,6 +4736,7 @@ export const colTableProducts = [
    label_trans: 'products.scraped_error',
    fieldtype: costanti.FieldType.boolean,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4708,6 +4749,7 @@ const colcontribtype = [
    label_trans: 'event.showprice',
    fieldtype: costanti.FieldType.boolean,
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4716,6 +4758,7 @@ const colpaymenttype = [
  AddCol({ name: '_id', label_trans: 'others.value' }),
  AddCol({ name: 'key', label_trans: 'reg.key' }),
  AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4729,156 +4772,6 @@ const colworkers = [
  AddCol(DuplicateRec),
 ];

-const colflotte = [
-  AddCol({ name: 'index', label_trans: 'others.value' }),
-  AddCol({ name: 'riga', label_trans: 'reg.riga' }),
-  AddCol({ name: 'col_prima', label_trans: 'ColPrima' }),
-  AddCol({ name: 'col_ultima', label_trans: 'ColUltima' }),
-];
-const colnavi = [
-  AddCol({ name: '_id', label_trans: 'others.value' }),
-  AddCol({ name: 'idListaIngresso', label_trans: 'idListaIngresso' }),
-  AddCol({ name: 'riga', label_trans: 'reg.riga' }),
-  AddCol({ name: 'col', label_trans: 'reg.col' }),
-  AddCol({ name: 'ind_order', label_trans: 'ind_order' }),
-  AddCol({
-    name: 'created',
-    label_trans: 'cal.data',
-    fieldtype: costanti.FieldType.date,
-  }),
-  // AddCol({ name: 'date_start', label_trans: 'date_start', fieldtype: costanti.FieldType.date }),
-  // AddCol({ name: 'date_gift_chat_open', label_trans: 'date_gift_chat_open', fieldtype: costanti.FieldType.date }),
-  // AddCol({ name: 'link_chat', label_trans: 'reg.link_chat' }),
-  AddCol({ name: 'parent_id', label_trans: 'parent_id' }),
-  AddCol({
-    name: 'sent_msg_howto_make_gift',
-    label_trans: 'sent_msg_howto_make_gift',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  // AddCol({ name: 'provvisoria', label_trans: 'reg.provvisoria', fieldtype: costanti.FieldType.boolean }),
-  AddCol({
-    name: 'made_gift',
-    label_trans: 'reg.made_gift',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  AddCol({
-    name: 'received_gift',
-    label_trans: 'reg.received_gift',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  AddCol({
-    name: 'date_made_gift',
-    label_trans: 'date_made_gift',
-    fieldtype: costanti.FieldType.date,
-  }),
-  // AddCol({ name: 'received_gift', label_trans: 'received_gift', fieldtype: costanti.FieldType.boolean }),
-  // AddCol({ name: 'date_received_gift', label_trans: 'date_received_gift', fieldtype: costanti.FieldType.date }),
-  AddCol({
-    name: 'offerta_al_fondo',
-    label_trans: 'offerta_al_fondo',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({
-    name: 'num_tess',
-    label_trans: 'num_tess',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({ name: 'note', label_trans: 'note', fieldtype: costanti.FieldType.string }),
-  // AddCol({ name: 'note_interne', label_trans: 'note_interne', fieldtype: costanti.FieldType.string }),
-  // AddCol({ name: 'facilitatore', label_trans: 'facilitatore', fieldtype: costanti.FieldType.string }),
-  AddCol(DeleteRec),
-  AddCol(DuplicateRec),
-];
-const colnavepersistente = [
-  AddCol({ name: '_id', label_trans: 'others.value' }),
-  AddCol({ name: 'riga', label_trans: 'reg.riga' }),
-  AddCol({ name: 'col', label_trans: 'reg.col' }),
-  AddCol({
-    name: 'date_gift_chat_open',
-    label_trans: 'dashboard.nave_in_partenza',
-    fieldtype: costanti.FieldType.date,
-  }),
-  AddCol({
-    name: 'date_start',
-    label_trans: 'dashboard.nave_in_chiusura',
-    fieldtype: costanti.FieldType.date,
-  }),
-  AddCol({ name: 'link_chat', label_trans: 'reg.link_chat' }),
-  AddCol({
-    name: 'provvisoria',
-    label_trans: 'reg.provvisoria',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  AddCol({
-    name: 'DoniAttesaDiConferma',
-    label_trans: 'note_bot',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({
-    name: 'DoniMancanti',
-    label_trans: 'note_bot',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({
-    name: 'DoniConfermati',
-    label_trans: 'note_bot',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({
-    name: 'DoniConfermati',
-    label_trans: 'note_bot',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({
-    name: 'DoniTotali',
-    label_trans: 'note_bot',
-    fieldtype: costanti.FieldType.string,
-  }),
-  AddCol({
-    name: 'note_interne',
-    label_trans: 'note_interne',
-    fieldtype: costanti.FieldType.string,
-  }),
-  AddCol({
-    name: 'facilitatore',
-    label_trans: 'facilitatore',
-    fieldtype: costanti.FieldType.string,
-  }),
-  AddCol(DeleteRec),
-  AddCol(DuplicateRec),
-];
-
-const collistaingresso = [
-  AddCol({ name: '_id', label_trans: 'others.value' }),
-  AddCol({ name: 'ind_order', label_trans: 'ind_order' }),
-  AddCol({ name: 'username', label_trans: 'reg.username_short' }),
-  AddCol({ name: 'invitante_username', label_trans: 'reg.aportador_solidario' }),
-  AddCol({
-    name: 'date_added',
-    label_trans: 'date_added',
-    fieldtype: costanti.FieldType.date,
-  }),
-  AddCol({
-    name: 'added',
-    label_trans: 'Aggiunto',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  AddCol({ name: 'navestr', label_trans: 'Nave', fieldtype: costanti.FieldType.string }),
-  AddCol({
-    name: 'num_tess',
-    label_trans: 'num_tess',
-    fieldtype: costanti.FieldType.number,
-  }),
-  AddCol({ name: 'note', label_trans: 'reg.note', fieldtype: costanti.FieldType.string }),
-  AddCol({
-    name: 'deleted',
-    label_trans: 'reg.deleted',
-    fieldtype: costanti.FieldType.boolean,
-  }),
-  AddCol(DuplicateRec),
-  AddCol(DeleteRec),
-];
-
 const colgraduatoria = [
  AddCol({ name: 'index', label_trans: 'index' }),
  AddCol({
@@ -4959,6 +4852,7 @@ const coldisciplines = [
    fieldtype: costanti.FieldType.multiselect,
    jointable: 'operators',
  }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4966,6 +4860,7 @@ const coldisciplines = [
 const colTablePermission = [
  AddCol({ name: '_id', label_trans: 'others.value' }),
  AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -4973,6 +4868,7 @@ const colTableTipoDiAttivita = [
  AddCol({ name: '_id', label_trans: 'others.value' }),
  AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
  AddCol({ name: 'note', label_trans: 'proj.longdescr' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
@@ -5032,6 +4928,7 @@ export const colTableOperator = [
  AddCol({ name: 'webpage', label_trans: 'op.webpage' }),
  AddCol({ name: 'days_working', label_trans: 'op.days_working' }),
  AddCol({ name: 'facebook', label_trans: 'op.facebook' }),
+  AddCol(ModifRec),
  AddCol(DeleteRec),
  AddCol(DuplicateRec),
 ];
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -965,7 +965,7 @@ export const useProducts = defineStore('Products', {
      if (trovato) this.userActive = trovato;
      else this.userActive = userStore.my;

-      console.log('userActive', this.userActive);
+      // console.log('userActive', this.userActive);

      ris = await Api.SendReq('/products', 'POST', { userId: this.userActive._id })
        .then((res) => {
@@ -1665,22 +1665,27 @@ export const useProducts = defineStore('Products', {
    },

    getQtyAvailable(myproduct: IProduct): number {
-      let qty = myproduct.quantityAvailable!;
+      let qty = myproduct.quantityAvailable || 0;
      return qty;
    },

    getQtyBookableAvailable(myproduct: IProduct): number {
-      let qty = myproduct.bookableAvailableQty!;
+      let qty = myproduct.bookableAvailableQty || 0;
      return qty;
    },

    getQtyBloccataAvailable(myproduct: IProduct): number {
-      let qty = myproduct.stockBloccatiQty;
+      let qty = myproduct.stockBloccatiQty || 0;
      return qty;
    },

    getQtyBloccataBookableAvailable(myproduct: IProduct): number {
-      let qty = myproduct.bookableGASBloccatiQty;
+      let qty = myproduct.bookableGASBloccatiQty || 0;
+      return qty;
+    },
+
+    getQuantitaPrenotateInAttesa(myproduct: IProduct): number {
+      let qty = myproduct.QuantitaPrenotateInAttesa || 0;
      return qty;
    },

@@ -1711,7 +1716,7 @@ export const useProducts = defineStore('Products', {
      const canPreOrder =
        globalStore.site.ecomm?.enablePreOrders &&
        qtyBookableAvailable > 0 &&
-        myorder.quantitypreordered + 1 <= maxAllowed;
+        ((myorder.quantitypreordered + 1 <= maxAllowed) || maxAllowed === 0);

      return canOrder || canPreOrder;
    },
@@ -2211,7 +2216,7 @@ export const useProducts = defineStore('Products', {
                ),
                index: productMap.size + 1,
                idProduct: productId,
-                code: item.order.product?.productInfo.code,
+                code: item.order.product?.productInfo?.code,
                codice_interno: item.order.product?.productInfo?.codice ?? '',
                qty: qtyparz,
                singlePrice: item.order.price,
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -1682,7 +1682,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
      return Api.SendReq('/chval', 'PATCH', { data: mydata })
        .then((res) => {
          if (res) {
-            if (mydata.aggiornainmem) this.UpdateValuesInMemory(mydata);
+            // if (mydata.aggiornainmem) this.UpdateValuesInMemory(mydata);
+            this.UpdateValuesInMemory(mydata);
            return res.data.code === serv_constants.RIS_CODE_OK;
          }
          return false;
--- a/src/views/admin/gestoreordini/gestoreordini.ts
+++ b/src/views/admin/gestoreordini/gestoreordini.ts
@@ -58,7 +58,7 @@ export default defineComponent({
        required: true,
        align: 'left',
        label: 'Nome Prodotto',
-        field: 'nameSurname',
+        field: 'productInfo.name',
        sortable: true
      },
      {
--- a/src/views/ecommerce/orderInfo/orderInfo.vue
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -1,7 +1,12 @@
 <template>
  <q-page>
    <CTitleBanner title="Ordini"></CTitleBanner>
-    <q-spinner v-if="!endload" color="primary" size="3em" :thickness="2" />
+    <q-spinner
+      v-if="!endload"
+      color="primary"
+      size="3em"
+      :thickness="2"
+    />

    <div class="q-gutter-md text-center">
      <q-btn-toggle
@@ -18,27 +23,39 @@
      >
        <template v-slot:tutti>
          <div class="row items-center no-wrap">
-            <div class="text-center">{{ t("gas.tutti") }}</div>
-            <q-icon right name="fas fa-user-friends" />
+            <div class="text-center">{{ t('gas.tutti') }}</div>
+            <q-icon
+              right
+              name="fas fa-user-friends"
+            />
          </div>
        </template>
        <template v-slot:gas>
          <div class="row items-center no-wrap">
-            <div class="text-center">{{ t("gas.ordina_sul_gas") }}</div>
-            <q-icon right name="fas fa-user-friends" />
+            <div class="text-center">{{ t('gas.ordina_sul_gas') }}</div>
+            <q-icon
+              right
+              name="fas fa-user-friends"
+            />
          </div>
        </template>

        <template v-slot:bottega>
          <div class="row items-center no-wrap">
-            <div class="text-center">{{ t("gas.bottega") }}</div>
-            <q-icon right name="fas fa-store" />
+            <div class="text-center">{{ t('gas.bottega') }}</div>
+            <q-icon
+              right
+              name="fas fa-store"
+            />
          </div>
        </template>
      </q-btn-toggle>
    </div>

-    <div v-if="endload" class="row">
+    <div
+      v-if="endload"
+      class="row"
+    >
      <div class="row">
        <q-toggle
          v-if="tools.isManager()"
@@ -104,7 +121,10 @@
        inline-label
        class="text-blue"
      >
-        <span v-for="(page, index) of shared_consts.OrderPages" :key="index">
+        <span
+          v-for="(page, index) of shared_consts.OrderPages"
+          :key="index"
+        >
          <q-tab
            :class="page.color"
            :name="page.value"
@@ -121,7 +141,10 @@
          inline-label
          class="text-blue"
        >
-          <span v-for="(stat, index) of shared_consts.OrderStat" :key="index">
+          <span
+            v-for="(stat, index) of shared_consts.OrderStat"
+            :key="index"
+          >
            <q-tab
              v-if="arrnumstatus[stat.value] > 0"
              :class="stat.color"
@@ -144,11 +167,17 @@
            :virtual-scroll="false"
            class="table-container"
          >
-            <template v-if="$q.screen.lt.sm" v-slot:item="props">
+            <template
+              v-if="$q.screen.lt.sm"
+              v-slot:item="props"
+            >
              <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4">
                <q-card class="my-card-shadow yes_shadow">
                  <q-list dense>
-                    <q-item v-for="col in getCols(props)" :key="col.name">
+                    <q-item
+                      v-for="col in getCols(props)"
+                      :key="col.name"
+                    >
                      <q-item-section>
                        <q-item-label>{{ col.label }}</q-item-label>
                      </q-item-section>
@@ -158,22 +187,29 @@
                          caption
                          >{{ tools.getstrDateTime(col.value) }}</q-item-label
                        >
+                        <q-item-label
+                          v-else-if="col.name === 'productInfo.name'"
+                          caption
+                        >
+                          <span v-if="props.row.productInfo">
+                            <span>{{ props.row.productInfo.name }}</span>
+                          </span>
+                        </q-item-label>
                        <q-item-label
                          v-else-if="col.name === 'nameSurname'"
                          caption
                        >
                          <span v-if="props.row.user">
                            <span
-                              :class="
-                                props.row.user.name !== 'TOTALI' ? '' : 'totali'
-                              "
-                              >{{
-                                tools.getNomeUtenteByRecUser(props.row.user)
-                              }}</span
+                              :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
+                              >{{ tools.getNomeUtenteByRecUser(props.row.user) }}</span
                            >
                          </span>
                        </q-item-label>
-                        <q-item-label v-else-if="col.name === 'items'" caption>
+                        <q-item-label
+                          v-else-if="col.name === 'items'"
+                          caption
+                        >
                          <div
                            v-for="(item, index) of props.row.items"
                            :key="index"
@@ -190,13 +226,9 @@
                              "
                            >
                              <span
-                                v-html="
-                                  productStore.getStrInfoOrder(t, item.order)
-                                "
+                                v-html="productStore.getStrInfoOrder(t, item.order)"
                              ></span>
-                              {{
-                                productStore.getQuantityByOrder(t, item.order)
-                              }}
+                              {{ productStore.getQuantityByOrder(t, item.order) }}
                              {{ item.order.product.productInfo.name }}
                              <span v-if="mostra_cat"
                                >({{
@@ -207,10 +239,8 @@
                              >
                              {{
                                mostra_codice
-                                  ? "- [" +
-                                    item.order.product.productInfo.code +
-                                    "]"
-                                  : ""
+                                  ? '- [' + item.order.product.productInfo.code + ']'
+                                  : ''
                              }}
                              <br />
                            </div>
@@ -250,16 +280,12 @@
                          caption
                        >
                          <div
-                            v-if="
-                              tools.isManager() &&
-                              props.row.user.name !== 'TOTALI'
-                            "
+                            v-if="tools.isManager() && props.row.user.name !== 'TOTALI'"
                            class="q-pa-sm"
                          >
                            <q-btn
                              v-if="
-                                taborders ===
-                                shared_consts.OrderStat.CONFERMATI.value
+                                taborders === shared_consts.OrderStat.CONFERMATI.value
                              "
                              size="sm"
                              dense
@@ -274,12 +300,14 @@
                              "
                            ></q-btn>

-                            <q-btn-dropdown rounded dense label="Azioni">
+                            <q-btn-dropdown
+                              rounded
+                              dense
+                              label="Azioni"
+                            >
                              <q-list class="text-primary">
                                <q-item
-                                  v-for="(
-                                    cmd, index
-                                  ) of shared_consts.OrderCmdStr"
+                                  v-for="(cmd, index) of shared_consts.OrderCmdStr"
                                  :key="index"
                                  clickable
                                  v-close-popup
@@ -318,7 +346,10 @@
                            ></q-btn>
                          </div>
                        </q-item-label>
-                        <q-item-label v-else caption>
+                        <q-item-label
+                          v-else
+                          caption
+                        >
                          {{ col.value }}
                        </q-item-label>
                      </q-item-section>
@@ -327,12 +358,21 @@
                </q-card>
              </div>
            </template>
-            <template v-else v-slot:body="props">
+            <template
+              v-else
+              v-slot:body="props"
+            >
              <q-tr :props="props">
-                <q-td key="ind" :props="props">
+                <q-td
+                  key="ind"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.ind + 1 }}</div>
                </q-td>
-                <q-td key="apri" :props="props">
+                <q-td
+                  key="apri"
+                  :props="props"
+                >
                  <div class="q-pa-sm">
                    <q-btn
                      v-if="props.row._id"
@@ -348,15 +388,16 @@
                    ></q-btn>
                  </div>
                </q-td>
-                <q-td key="comandi" :props="props">
+                <q-td
+                  key="comandi"
+                  :props="props"
+                >
                  <div
                    v-if="tools.isManager() && props.row.user.name !== 'TOTALI'"
                    class="q-pa-sm"
                  >
                    <q-btn
-                      v-if="
-                        taborders === shared_consts.OrderStat.CONFERMATI.value
-                      "
+                      v-if="taborders === shared_consts.OrderStat.CONFERMATI.value"
                      size="sm"
                      dense
                      color="green"
@@ -364,14 +405,15 @@
                      class="q-mx-sm"
                      :label="t('ecomm.consegna')"
                      @click="
-                        clickFunz(
-                          props.row,
-                          shared_consts.OrderStat.DELIVERED.value
-                        )
+                        clickFunz(props.row, shared_consts.OrderStat.DELIVERED.value)
                      "
                    ></q-btn>

-                    <q-btn-dropdown rounded dense label="Azioni">
+                    <q-btn-dropdown
+                      rounded
+                      dense
+                      label="Azioni"
+                    >
                      <q-list class="text-primary">
                        <q-item
                          v-for="(cmd, index) of shared_consts.OrderCmdStr"
@@ -395,33 +437,43 @@
                    </q-btn-dropdown>
                  </div>
                </q-td>
-                <q-td key="numorder" :props="props">
+                <q-td
+                  key="numorder"
+                  :props="props"
+                >
                  <span v-if="props.row.numorder"
                    >&nbsp; n. {{ props.row.numorder }}</span
                  >
                </q-td>
-                <q-td key="nameSurname" :props="props">
+                <q-td
+                  key="nameSurname"
+                  :props="props"
+                >
                  <span v-if="props.row.user">
-                    <span
-                      :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
-                      >{{ tools.getNomeUtenteByRecUser(props.row.user) }}</span
-                    >
+                    <span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{
+                      tools.getNomeUtenteByRecUser(props.row.user)
+                    }}</span>
                  </span>
                </q-td>
-                <q-td key="created_at" :props="props">
+                <q-td
+                  key="created_at"
+                  :props="props"
+                >
                  {{ tools.getstrDateTime(props.row.created_at) }}
-                  <span
-                    v-if="
-                      taborders === shared_consts.OrderStat.COMPLETATI.value
-                    "
-                  >
+                  <span v-if="taborders === shared_consts.OrderStat.COMPLETATI.value">
                    <br />Consegnato il:
                    <br />
                    {{ tools.getstrDateTime(props.row.date_consegnato) }}
                  </span>
                </q-td>
-                <q-td key="items" :props="props">
-                  <div v-for="(item, index) of props.row.items" :key="index">
+                <q-td
+                  key="items"
+                  :props="props"
+                >
+                  <div
+                    v-for="(item, index) of props.row.items"
+                    :key="index"
+                  >
                    <div
                      v-if="
                        !!item.order &&
@@ -443,64 +495,97 @@
                      </span>
                      {{
                        mostra_codice
-                          ? "- [" + item.order.product.productInfo.code + "]"
-                          : ""
+                          ? '- [' + item.order.product.productInfo.code + ']'
+                          : ''
                      }}
                      <br />
                    </div>
                  </div>
-                  <div v-if="props.row.note" class="note">
+                  <div
+                    v-if="props.row.note"
+                    class="note"
+                  >
                    Note: {{ props.row.note }}
                  </div>
-                  <div v-if="props.row.codice_sconto" class="codice_sconto">
+                  <div
+                    v-if="props.row.codice_sconto"
+                    class="codice_sconto"
+                  >
                    Codice Sconto: {{ props.row.codice_sconto }}
                  </div>
-                  <div v-if="props.row.note_per_gestore" class="note">
+                  <div
+                    v-if="props.row.note_per_gestore"
+                    class="note"
+                  >
                    Note per Gestore: {{ props.row.note_per_gestore }}
                  </div>
-                  <div v-if="props.row.note_per_admin" class="note">
+                  <div
+                    v-if="props.row.note_per_admin"
+                    class="note"
+                  >
                    Note per Admin: {{ props.row.note_per_admin }}
                  </div>
                </q-td>
-                <q-td key="totalPrice" :props="props">
-                  <span
-                    :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
+                <q-td
+                  key="totalPrice"
+                  :props="props"
+                >
+                  <span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
                    >{{
-                      getTotaleOrdineByOrdId(props.row._id, storeGasordine, props.row.user.name === 'TOTALI')
+                      getTotaleOrdineByOrdId(
+                        props.row._id,
+                        storeGasordine,
+                        props.row.user.name === 'TOTALI'
+                      )
                    }}
                    €</span
                  >
                </q-td>
-                <q-td key="status" :props="props">
+                <q-td
+                  key="status"
+                  :props="props"
+                >
                  <span :class="props.row.status">
                    {{ shared_consts.getStatusStr(props.row.status) }}
                  </span>
                  <br />
-                  <div v-if="props.row.confermato" class="ordstat">
+                  <div
+                    v-if="props.row.confermato"
+                    class="ordstat"
+                  >
                    {{ tools.getstrDateTime(props.row.date_confermato) }}:
                    <span class="ordstat confermato">
-                      {{ $t("ecomm.confermato") }}
+                      {{ $t('ecomm.confermato') }}
                    </span>
                  </div>
-                  <div v-if="props.row.pagato" class="ordstat">
+                  <div
+                    v-if="props.row.pagato"
+                    class="ordstat"
+                  >
                    {{ tools.getstrDateTime(props.row.date_pagato) }}:
-                    <span class="ordstat">{{ t("ecomm.pagato") }}</span>
+                    <span class="ordstat">{{ t('ecomm.pagato') }}</span>
                  </div>
-                  <div v-if="props.row.consegnato" class="ordstat">
+                  <div
+                    v-if="props.row.consegnato"
+                    class="ordstat"
+                  >
                    {{ tools.getstrDateTime(props.row.date_consegnato) }}:
-                    <span class="ordstat">{{ t("ecomm.consegnato") }}</span>
+                    <span class="ordstat">{{ t('ecomm.consegnato') }}</span>
                  </div>
-                  <div v-if="props.row.preparato" class="ordstat">
+                  <div
+                    v-if="props.row.preparato"
+                    class="ordstat"
+                  >
                    {{ tools.getstrDateTime(props.row.date_preparato) }}:
-                    <span class="ordstat">{{ t("ecomm.preparato") }}</span>
+                    <span class="ordstat">{{ t('ecomm.preparato') }}</span>
                  </div>
                  <div v-if="props.row.spedito">
                    {{ tools.getstrDateTime(props.row.date_spedito) }}:
-                    <span class="ordstat">{{ t("ecomm.spedito") }}</span>
+                    <span class="ordstat">{{ t('ecomm.spedito') }}</span>
                  </div>
                  <div v-if="props.row.ricevuto">
                    {{ tools.getstrDateTime(props.row.date_ricevuto) }}:
-                    <span class="ordstat">{{ t("ecomm.ricevuto") }}</span>
+                    <span class="ordstat">{{ t('ecomm.ricevuto') }}</span>
                  </div>
                </q-td>
              </q-tr>
@@ -510,10 +595,7 @@

        <!-- Ordini IN CORSO -->
        <div
-          v-if="
-            tools.isManager() &&
-            taborders === shared_consts.OrderStat.IN_CORSO.value
-          "
+          v-if="tools.isManager() && taborders === shared_consts.OrderStat.IN_CORSO.value"
          class="q-ma-sm q-pa-sm row justify-center"
        >
          <q-btn
@@ -524,7 +606,10 @@
          ></q-btn>
        </div>

-        <div v-if="tools.isManager()" class="q-ma-sm q-pa-sm row">
+        <div
+          v-if="tools.isManager()"
+          class="q-ma-sm q-pa-sm row"
+        >
          <q-select
            :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
            rounded
@@ -587,9 +672,7 @@

        <br>
      </div>
-      -->
-
-    </div>
+      --></div>
      <div v-else-if="tabpages === shared_consts.OrderPages.LISTA_TOTALI.value">
        <div class="q-pa-sm">
          <q-btn
@@ -611,35 +694,55 @@
          >
            <template v-slot:body="props">
              <q-tr :props="props">
-                <q-td key="index" :props="props">
+                <q-td
+                  key="index"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.index }}</div>
                </q-td>
-                <q-td key="code" :props="props">
+                <q-td
+                  key="code"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.code }}</div>
                </q-td>
-                <q-td key="codice_interno" :props="props">
+                <q-td
+                  key="codice_interno"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.codice_interno }}</div>
                </q-td>
-                <q-td key="productName" :props="props">
+                <q-td
+                  key="productName"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.productName }}</div>
                </q-td>
-                <q-td key="strSubCatProds" :props="props">
+                <q-td
+                  key="strSubCatProds"
+                  :props="props"
+                >
                  <div class="q-pa-sm">
                    {{ props.row.strSubCatProds }}
                  </div>
                </q-td>
-                <q-td key="qty" :props="props">
+                <q-td
+                  key="qty"
+                  :props="props"
+                >
                  <div class="q-pa-sm">{{ props.row.qty }}</div>
                </q-td>
-                <q-td key="singlePrice" :props="props">
-                  <div class="q-pa-sm">
-                    {{ props.row.singlePrice.toFixed(2) }} €
-                  </div>
+                <q-td
+                  key="singlePrice"
+                  :props="props"
+                >
+                  <div class="q-pa-sm">{{ props.row.singlePrice.toFixed(2) }} €</div>
                </q-td>
-                <q-td key="subtotalPrice" :props="props">
-                  <div class="q-pa-sm">
-                    {{ props.row.subtotalPrice.toFixed(2) }} €
-                  </div>
+                <q-td
+                  key="subtotalPrice"
+                  :props="props"
+                >
+                  <div class="q-pa-sm">{{ props.row.subtotalPrice.toFixed(2) }} €</div>
                </q-td>
              </q-tr>
            </template>
@@ -649,15 +752,20 @@

      <!-- Emails -->
    </div>
-    <CMyDialog v-model="showOrdersCart" title="Ordine">
-      <COrdersCart :iscash="false" :idOrdersCart="idOrdersCartToShow" />
+    <CMyDialog
+      v-model="showOrdersCart"
+      title="Ordine"
+    >
+      <COrdersCart
+        :iscash="false"
+        :idOrdersCart="idOrdersCartToShow"
+      />
    </CMyDialog>
  </q-page>
 </template>

-<script lang="ts" src="./orderInfo.ts">
-</script>
+<script lang="ts" src="./orderInfo.ts"></script>

 <style lang="scss" scoped>
-@import "./orderInfo";
+@import './orderInfo';
 </style>