- Uscita PRIMA VERSIONE PiuCheBuono.app

src/views/admin/dbop/dbop.vue

@@ -261,6 +261,14 @@
       ></q-btn>
       <br />
     </div>
+    <div class="row">
+      <q-btn
+        label="10. Elimina la Tabella CATPROD !)"
+        color="negative"
+        @click="EseguiFunz('dropCatProd')"
+      ></q-btn>
+      <br />
+    </div>
 
     <div class="row">
       <q-btn

src/views/ecommerce/orderInfo/orderInfo.scss

@@ -20,7 +20,7 @@ $heightBtn: 100%;
   padding: 5px;
 }
 
-.evaso {
+.confermato {
   font-weight: bold;
   color: green;
 }

src/views/ecommerce/orderInfo/orderInfo.ts

@@ -67,7 +67,7 @@ export default defineComponent({
       {
         name: 'items',
         required: true,
-        label: 'Articoli',
+        label: '',
         field: 'items',
         sortable: true
       },
@@ -157,7 +157,6 @@ export default defineComponent({
 
     function getOrdersCart(): IOrderCart[] | undefined {
       const hasGasordine: any = (cosa.value === shared_consts.PROD.TUTTI) ? undefined : (cosa.value === shared_consts.PROD.GAS)
-      console.log('hasgas', hasGasordine)
       const ris = productStore.getOrdersCart(taborders.value, hasGasordine)
       
       return ris
@@ -180,8 +179,12 @@ export default defineComponent({
           totalPrice: orderscart.reduce((total: number, rec: any) => total + rec.totalPrice, 0),
         };
 
-        // Combine orders and totals
-        const rowsWithTotals = [...orderscart, totals];
+        let rowsWithTotals: any = [...orderscart];
+
+        if (tools.isManager()) {
+          // Combine orders and totals
+          rowsWithTotals.push(totals);
+        }
 
         return rowsWithTotals;
       } else {

src/views/ecommerce/orderInfo/orderInfo.vue

@@ -210,9 +210,9 @@
                   shared_consts.getStatusStr(props.row.status)
                 }}</span>
                 <br />
-                <div v-if="props.row.evaso" class="ordstat">
-                  {{ tools.getstrDateTime(props.row.date_evaso) }}:
-                  <span class="ordstat evaso">{{ $t('ecomm.evaso') }}</span>
+                <div v-if="props.row.confermato" class="ordstat">
+                  {{ tools.getstrDateTime(props.row.date_confermato) }}:
+                  <span class="ordstat confermato">{{ $t('ecomm.confermato') }}</span>
                 </div>
                 <div v-if="props.row.pagato" class="ordstat">
                   {{ tools.getstrDateTime(props.row.date_pagato) }}:

src/views/ecommerce/productsList/productsList.ts

@@ -30,6 +30,7 @@ export default defineComponent({
 
     const cosa = ref(0)
     const cat = ref('')
+    const loadpage = ref(false)
 
     watch(() => cosa.value, (newval, oldval) => {
       tools.setCookie(tools.COOK_COSA_PRODOTTI, cosa.value.toString())
@@ -67,10 +68,12 @@ export default defineComponent({
       });
     }*/
 
-    function mounted() {
+    async function mounted() {
+      loadpage.value = false
+      await productStore.loadProducts()
       cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.BOTTEGA, true)
       // Inizializza
-      productStore.loadProducts()
+      loadpage.value = true
     }
 
     function getCatProds() {
@@ -99,6 +102,7 @@ export default defineComponent({
       cat,
       productStore,
       t,
+      loadpage,
     }
   }
 })

src/views/ecommerce/productsList/productsList.vue

@@ -1,6 +1,7 @@
 <template>
   <q-page>
-    <div class="panel">
+    <q-spinner v-if="!loadpage" color="primary" size="3em" :thickness="2" />
+    <div v-if="loadpage" class="panel">
       <div>
         <div class="q-gutter-md text-center q-mb-md">
           <q-btn-toggle