vers: 1.1.3

- aggiornato ncu -u
2024-10-03 17:10:04 +02:00
parent 38862311ee
commit f9277f3a01
121 changed files with 2460 additions and 3597364 deletions
--- a/src/components/CCart/CCart.ts
+++ b/src/components/CCart/CCart.ts
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, ref, computed } from 'vue'
+import { defineComponent, onMounted, ref, computed, watch } from 'vue'
 import { tools } from '@store/Modules/tools'
 import { useUserStore } from '@store/UserStore'
 import { useRouter } from 'vue-router'
@@ -49,6 +49,14 @@ export default defineComponent({

    const search = ref('')

+    const isfinishLoading = computed(() => globalStore.finishLoading)
+
+    watch(() => isfinishLoading.value, (newval: boolean, oldval: boolean) => {
+      if (isfinishLoading.value) {
+        load()
+      }      
+    })
+
    const statusnow = computed(() => (): number => {
      if (recOrderCart.value) {
        return recOrderCart.value.status
@@ -123,20 +131,23 @@ export default defineComponent({
    }

    async function load() {
-      mycart.value = getCart()
-      myrec.value = Object.keys(mycart)
-      oldrec.value = myrec.value
-      note.value = mycart.value.note!
+      if (isfinishLoading.value) {
+        console.log('Load CCART')
+        mycart.value = getCart()
+        myrec.value = Object.keys(mycart)
+        oldrec.value = myrec.value
+        note.value = mycart.value.note!

-      let options = {};
+        let options = {};

-      if (mycart.value) {
-        recOrderCart.value = await productStore.CreateOrdersCart({ cart_id: mycart.value._id, status: 0, note: note.value })
+        if (mycart.value) {
+          recOrderCart.value = await productStore.CreateOrdersCart({ cart_id: mycart.value._id, status: 0, note: note.value })
+        }
+
+        // console.log('myrec', myrec.value)
+
+        endload.value = true
      }
-
-      // console.log('myrec', myrec.value)
-
-      endload.value = true
    }

    function CanBeShipped() {
@@ -264,6 +275,7 @@ export default defineComponent({
      search,
      insertArticolo,
      globalStore,
+      isfinishLoading,
    }
  }
 })
--- a/src/components/CCart/CCart.vue
+++ b/src/components/CCart/CCart.vue
@@ -1,6 +1,6 @@
 <template>
  <q-spinner v-if="!endload" color="primary" size="3em" :thickness="2" />
-  <div v-if="endload">
+  <div v-if="isfinishLoading && endload">
    <CSelectUserActive></CSelectUserActive>
    <div v-if="recOrderCart" class="panel">
      <div>
--- a/src/components/CCatalogoCard/CCatalogoCard.vue
+++ b/src/components/CCatalogoCard/CCatalogoCard.vue
@@ -45,8 +45,8 @@
        >
          <q-img
            :src="
-              myproduct.productInfo.imagefile
-                ? `` + myproduct.productInfo.imagefile
+              productInfo.imagefile
+                ? tools.getFullFileNameByImageFile('productInfos', myproduct.myproduct.productInfo.imagefile)
                : myproduct.productInfo.image_link
            "
            :alt="myproduct.productInfo.name"
--- a/src/components/CProductCard/CProductCard.vue
+++ b/src/components/CProductCard/CProductCard.vue
@@ -30,7 +30,7 @@
          <q-img
            :src="
              myproduct.productInfo.imagefile
-                ? tools.getFullFileNameByImageFile(myproduct.productInfo.imagefile, 'productInfos')
+                ? tools.getFullFileNameByImageFile('productInfos', myproduct.productInfo.imagefile)
                : myproduct.productInfo.image_link
            "
            :alt="myproduct.productInfo.name"
@@ -1067,7 +1067,7 @@
        <q-img
          :src="
            myproduct.productInfo.imagefile
-              ? tools.getFullFileNameByImageFile(myproduct.productInfo.imagefile, 'productInfos')
+              ? tools.getFullFileNameByImageFile('productInfos', myproduct.productInfo.imagefile)
              : myproduct.productInfo.image_link
          "
          :alt="myproduct.productInfo.name"
--- a/src/components/CSingleCart/CSingleCart.vue
+++ b/src/components/CSingleCart/CSingleCart.vue
@@ -12,7 +12,7 @@
              order.product.productInfo &&
              order.product.productInfo.imagefile
            "
-            :src="`` + order.product.productInfo.imagefile"
+            :src="tools.getFullFileNameByImageFile('productInfos', order.product.productInfo.imagefile)"
            :alt="order.product.productInfo.name"
            :class="myimgclass()"
          />
--- 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,9 +1,9 @@
 const msg_website_it = {
  ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Più che Buono',
+    siteshortname: 'Più che Buono',
+    description: '',
+    keywords: '',
  },
  hours: {
    descr: 'Descrizione',
@@ -16,23 +16,35 @@ const msg_website_it = {
  pages: {
    home: 'Home',
    profile: 'Profilo',
+    install_site: 'Installa Sito',
    profile2: 'ProfiloU',
    mypage2: 'mypage2',
    myservice2: 'myservice2',
    myhosps2: 'myhosps2',
    mygood2: 'mygood2',
+    catalogo: 'Catalogo',
    fundraising: 'Sostieni il Progetto',
    notifs: 'Configura le Notifiche',
    unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
    test: 'Test',
    projects: 'Progetti',
    report: 'Report Ore',
    producer: 'Produttore',
    orderinfo: 'Ordini Effettuati',
    products: 'Prodotti',
+    cash: 'Cassa',
+    productInfos: 'Info Prodotti',
+    listinoprodotti: 'Listino Prodotti',
    productslist: 'Lista Prodotti',
    collabora: 'Collabora',
+    categories: 'Categorie',
    storehouses: 'Magazzino',
+    providers: 'Fornitori',
+    catprods: 'Categorie',
+    subcatprods: 'Sotto-Categorie',
+    gasordine: 'Gas Ordine',
+    scontisticas: 'Scontistica',
    departments: 'Uffici',
    orders: 'Ordini Ricevuti',
    orders2: 'Ordini Ricevuti',
@@ -121,15 +133,11 @@ const msg_website_it = {
    only_residenti: 'Solo Residenti',
    only_consiglio: 'Solo Consiglieri',
    color: 'Colore',
-    mainMenu: 'Menu Principale',
-    subtitle: 'Sottotitolo',
-    lang: 'Lingua',
-    keywords: 'Parole Chiave',
-    desctiption: 'Descrizione',
-    heightimg: 'Altezza Immagine',
+    gasordini: 'Gas Ordini',
+    gestoreordini: 'Gestore Ordini',
  },
  msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
    myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
    underconstruction: 'App in costruzione...',
    myDescriz: '',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -7,30 +7,6 @@ import {
 import { func } from '@store/Modules/fieldsTable'


-// 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,
@@ -57,83 +33,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: true,
      infooter: true,
    },
-    {
-      active: true,
-      order: 400,
-      path: '/test',
-      materialIcon: 'fas fa-test',
-      name: 'mypages.test',
-      component: () => import('@/views/testServer/testServer.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/activities',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.activities',
-      component: () => import('@/root/activities/activities.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/provapao',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.provapao',
-      component: () => import('@/root/provapao/provapao.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 16,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
+    /*{
      active: true,
      order: 20,
      path: '/events',
@@ -143,6 +43,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('@/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
    },
    {
      active: true,
@@ -155,17 +66,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: false,
      infooter: false,
    },
-    {
-      active: true,
-      order: 120,
-      path: '/myprofile',
-      materialIcon: 'fas fa-user',
-      name: 'pages.profile',
-      component: () => import('@/views/user/myprofile/myprofile.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
    {
      active: true,
      order: 120,
@@ -178,7 +78,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
      order: 130,
      path: '/friends',
      materialIcon: 'fas fa-user-friends',
@@ -188,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,
@@ -198,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: false,
+      onlyAdmin: true,
+      onlyManager: true,
    },
    {
      active: true,
@@ -276,7 +191,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
    {
      active: true,
      order: 150,
-      path: '/sostieniilprogetto',
+      path: '/fundraising',
      materialIcon: 'fas fa-hand-holding-heart',
      name: 'pages.fundraising',
      component: () => import('@src/root/fundraising/fundraising.vue'),
--- a/src/index.template.html
+++ b/src/index.template.html
@@ -10,7 +10,7 @@
  <meta name="description" content="<%= productDescription %>">
  <meta name="format-detection" content="telephone=no">
  <meta name="msapplication-tap-highlight" content="no">
-  <meta name="version" content="1.1.2">
+  <meta name="version" content="1.1.3">
  <meta name="viewport"
    content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">

--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -7352,12 +7352,13 @@ export const tools = {
      }
    }
  },
-  getFullFileNameByImageFile(imagefile: string, table: string) {
+  getFullFileNameByImageFile(table: string, imagefile: string) {
    // console.log('arrimage', arrimage)

    if (shared_consts.TABLES_IMAGEFILE_SINGOLO.includes(table)) {
      return costanti.DIR_UPLOAD + `products/` + imagefile    
    }
+    return imagefile
  },
  canModifyThisRec(rec: any, tablesel: string) {
    // console.log('rec', rec)
@@ -8964,7 +8965,7 @@ export const tools = {
    return originalString.replace(regex, replaceString);
  },

-  getStringaConto(mov: IMovQuery) {
+  getStringaConto_NonUsata(mov: IMovQuery) {

    let mystr = ''
    let mystrfrom = ''
--- a/src/views/ecommerce/checkOut/checkOut.ts
+++ b/src/views/ecommerce/checkOut/checkOut.ts
@@ -26,9 +26,14 @@ export default defineComponent({
    const { t } = useI18n();
    const productStore = useProducts()

+    const endload = ref(false)
+
    async function mounted() {
      // Inizializza      
      await productStore.loadProducts()
+
+      endload.value = true
+
    }

    onMounted(mounted)
@@ -41,6 +46,7 @@ export default defineComponent({
      shared_consts,
      t,
      products,
+      endload,
    }
  }
 })
--- a/src/views/ecommerce/checkOut/checkOut.vue
+++ b/src/views/ecommerce/checkOut/checkOut.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-page>
+  <q-page v-if="endload">
    <CTitleBanner :title="t('ecomm.carrello_di', {user: products.userActive.username})"></CTitleBanner>
    <CCart>
    </CCart>
--- a/src/views/ecommerce/orderInfo/orderInfo.scss
+++ b/src/views/ecommerce/orderInfo/orderInfo.scss
@@ -32,3 +32,26 @@ $heightBtn: 100%;
 .totali {
  font-weight: bold;
 }
+
+.q-table {
+  overflow-x: auto; /* Aggiungi scroll se il contenuto supera in larghezza */
+}
+
+.q-item-label {
+  white-space: nowrap; /* Impedisce il wrapping del testo */
+  overflow: hidden;
+  text-overflow: ellipsis; /* Aggiunge "..." se il testo è troppo lungo */
+}
+
+.my-card-shadow {
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15); /* Aggiunge un'ombra sottile alle card */
+}
+
+.q-item__section--side {
+  flex-grow: 1; /* Permette a questa sezione di crescere più dell'etichetta "Articoli" */
+}
+
+.q-item__label {
+  overflow: hidden !important;
+  white-space: wrap !important; /* Impedisce che il testo si spezzi in più righe */
+}
--- a/src/views/ecommerce/orderInfo/orderInfo.vue
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -114,7 +114,7 @@
                              item.order.product.productInfo
                            "
                          >
-                            {{ productStore.getStrInfoOrder(t, item.order) }}
+                            <span v-html="productStore.getStrInfoOrder(t, item.order)"></span>
                            {{ item.order.product.productInfo.name }} ({{
                              productStore.getQuantityByOrder(t, item.order)
                            }})