- aggiornato sistema per inviare le newsletter !

src/components/CCart/CCart.ts

@@ -263,6 +263,7 @@ export default defineComponent({
       endload,
       search,
       insertArticolo,
+      globalStore,
     }
   }
 })

src/components/CCart/CCart.vue

@@ -5,8 +5,16 @@
     <div v-if="recOrderCart" class="panel">
       <div>
         <div class="container">
-          <div class="q-pa-sm col items-start q-gutter-xs" v-for="(itemorder, index) in getItemsCart()" :key="index">
-            <CSingleCart :order="itemorder.order" :idOrdersCart="recOrderCart._id" :showall="true" />
+          <div
+            class="q-pa-sm col items-start q-gutter-xs"
+            v-for="(itemorder, index) in getItemsCart()"
+            :key="index"
+          >
+            <CSingleCart
+              :order="itemorder.order"
+              :idOrdersCart="recOrderCart._id"
+              :showall="true"
+            />
           </div>
         </div>
         <q-separator></q-separator>
@@ -15,30 +23,71 @@
           <span class="text-subtitle1 q-mr-sm">€ {{ myTotalPrice() }}</span>
         </div>
 
-        <q-input v-if="getNumItems() > 0" v-model="note" style="max-width: 400px" :label="$t('ecomm.note')" filled dense
-          debounce="1000" autogrow @input="change_field('note')">
+        <q-input
+          v-if="getNumItems() > 0"
+          v-model="note"
+          style="max-width: 400px"
+          :label="$t('ecomm.note')"
+          filled
+          dense
+          debounce="1000"
+          autogrow
+          @input="change_field('note')"
+        >
         </q-input>
-
+      </div>
+      <div class="center-text">
         <br />
+
+        <div
+          class="q-ma-sm q-pa-sm text-h7"
+          v-if="globalStore && globalStore.site.ecomm.NoteExtraOnCart"
+        >
+          {{ globalStore.site.ecomm.NoteExtraOnCart }}
+        </div>
       </div>
 
       <div class="text-center">
-        <q-btn v-if="recOrderCart &&
-          recOrderCart.status < shared_consts.OrderStatus.CHECKOUT_SENT
-          " rounded icon="fas fa-shopping-cart" color="green" :label="$t('ecomm.completa_ord')" class="q-mb-sm"
-          :disabled="myTotalQty() < 1" @click="completeOrder()"></q-btn>
+        <q-btn
+          v-if="
+            recOrderCart &&
+            recOrderCart.status < shared_consts.OrderStatus.CHECKOUT_SENT
+          "
+          rounded
+          icon="fas fa-shopping-cart"
+          color="green"
+          :label="$t('ecomm.completa_ord')"
+          class="q-mb-sm"
+          :disabled="myTotalQty() < 1"
+          @click="completeOrder()"
+        ></q-btn>
       </div>
     </div>
     <div v-else style="text-align: center" class="text-grey">
       {{ $t('ecomm.carrello_vuoto') }}
     </div>
 
-    <br>
-    <div class="q-gutter-y-md column text-center q-mx-auto" style="width: 350px; max-width: 100%">
-      <q-input filled stack-label dense :label="$t('ecomm.code_add_to_cart')" v-model="search" class="q-ml-md"
-        @keyup.enter="insertArticolo()">
+    <br />
+    <div
+      class="q-gutter-y-md column text-center q-mx-auto"
+      style="width: 350px; max-width: 100%"
+    >
+      <q-input
+        filled
+        stack-label
+        dense
+        :label="$t('ecomm.code_add_to_cart')"
+        v-model="search"
+        class="q-ml-md"
+        @keyup.enter="insertArticolo()"
+      >
         <template v-slot:append>
-          <q-icon class="insert" name="fas fa-shopping-cart" color="green" @click="insertArticolo()" />
+          <q-icon
+            class="insert"
+            name="fas fa-shopping-cart"
+            color="green"
+            @click="insertArticolo()"
+          />
         </template>
       </q-input>
     </div>

src/components/CLineChart/CLineChart.ts

@@ -7,7 +7,7 @@ import { useGlobalStore } from '@store/globalStore'
 import { useI18n } from '@/boot/i18n'
 import { useQuasar } from 'quasar'
 
-import { Chart, ChartItem, ChartConfiguration } from 'chart.js'
+import { Chart, BarController, BarElement, LineController, LinearScale, CategoryScale, PointElement, LineElement, Title, ChartItem, ChartConfiguration } from 'chart.js';
 
 
 export default defineComponent({
@@ -68,6 +68,9 @@ export default defineComponent({
     }
 
     function mounted() {
+      Chart.register(BarController, BarElement, 
+        LineController, LinearScale, CategoryScale, PointElement, LineElement, Title);
+
       myarrdata.value = []
       myarrdataLine.value = []
       myarrbg.value = []
@@ -173,7 +176,7 @@ export default defineComponent({
         fill: true,
       }
 
-      if (props.showMedia)
+      if (props.showMedia && myarrdataLine.value)
         chartData.datasets.push(media)
 
       const configBar: ChartConfiguration = {

src/components/CProductCard/CProductCard.ts

@@ -49,7 +49,7 @@ export default defineComponent({
       default: false,
     },
   },
-  components: { CTitleBanner, CCardState, CCopyBtn, CMyValueDb },
+  components: { CTitleBanner, CCardState, CCopyBtn, CMyValueDb, VuePdfApp },
   setup(props, { emit }) {
     const $q = useQuasar()
     const { t } = useI18n()

src/components/CProductCard/CProductCard.vue

@@ -832,7 +832,6 @@
       </CMyValueDb>
     </q-card>
 
-    
     <q-dialog v-if="myproduct" v-model="openlistorders">
       <q-card class="dialog_card">
         <q-toolbar class="bg-primary text-white">
@@ -916,34 +915,68 @@
       </q-card>
     </q-dialog>
 
-    <q-dialog v-if="myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda" v-model="apriSchedaPDF" maximized>
-    <q-card>
+    <q-dialog
+      v-if="true && 
+        myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda
+      "
+      v-model="apriSchedaPDF"
+      maximized
+    >
+      <q-card>
         <q-toolbar class="bg-primary text-white">
           <q-toolbar-title>
             {{ myproduct.productInfo.name }}
           </q-toolbar-title>
-          <q-btn flat round color="white" label="CHIUDI" icon="close" v-close-popup></q-btn>
+          <q-btn
+            flat
+            round
+            color="white"
+            label="CHIUDI"
+            icon="close"
+            v-close-popup
+          ></q-btn>
         </q-toolbar>
-        <q-card-main>
-          <iframe :src="myproduct.productInfo.link_scheda" frameborder="0" width="100%" height="100%"></iframe>
-        </q-card-main>
+        <q-card-section>
+          <iframe
+            :src="myproduct.productInfo.link_scheda"
+            frameborder="0"
+            width="100%"
+            height="100%"
+          ></iframe>
+        </q-card-section>
       </q-card>
       <q-card-actions align="bottom">
         <q-btn color="primary" label="Chiudi" @click="apriSchedaPDF = false" />
       </q-card-actions>
     </q-dialog>
 
-    <!--
-    <q-dialog v-if="myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda" v-model="apriSchedaPDF" fullscreen>
-      <div class="q-pa-md">
-        <vue-pdf-app style="height: 100vh;" :pdf="myproduct.productInfo.link_scheda"></vue-pdf-app>
-        
-      </div>
-      <q-card-actions align="bottom">
-        <q-btn color="primary" label="Chiudi" @click="apriSchedaPDF = false" />
-      </q-card-actions>
+    <q-dialog
+      v-if="false &&
+        myproduct && myproduct.productInfo && myproduct.productInfo.link_scheda
+      "
+      v-model="apriSchedaPDF"
+      fullscreen
+    >
+      <q-toolbar class="bg-primary text-white">
+        <q-toolbar-title>
+          {{ myproduct.productInfo.name }}
+        </q-toolbar-title>
+        <q-btn
+          flat
+          round
+          color="white"
+          label="CHIUDI"
+          icon="close"
+          v-close-popup
+        ></q-btn>
+      </q-toolbar>
+      <q-card-section>
+        <vue-pdf-app
+          :pdf="myproduct.productInfo.link_scheda"
+          style="height: 100vh;"
+        ></vue-pdf-app>
+      </q-card-section>
     </q-dialog>
-    -->
 
     <q-dialog
       v-model="isFullScreen"