Aggiornamento modifiche preOrdini

src/components/CProductCard/CProductCard.scss

@@ -18,6 +18,10 @@
   font-size: 1.2rem;
 }
 
+.prod_preorder{
+  font-size: 1.2rem;
+}
+
 .prod_qtywarn{
   padding-left: 10px;
   font-size: 1rem;

src/components/CProductCard/CProductCard.ts

@@ -88,33 +88,39 @@ export default defineComponent({
       }
 
 
-      products.addToCart({ product: myproduct.value, order: myorder, addqty: add }).then((ris) => {
+      if (myproduct.value) {
-        let strprod = t('ecomm.prodotto')
+        products.addToCart({ product: myproduct.value, order: myorder, addqty: add }).then((ris: any) => {
+          let strprod = t('ecomm.prodotto')
 
-        if (myorder.quantity > 1 || myorder.quantity === 0)
+          let msg = ''
-          strprod = t('ecomm.prodotti')
+          console.log('ris', ris)
-
+          if (ris === null || ris.myord == null) {
-        let msg = ''
+            msg = t('ecomm.error_cart')
-        if (ris === null)
+            tools.showNegativeNotif($q, msg)
-          msg = t('ecomm.error_cart')
+            return
-        else {
-
-          if (myorder.quantity === 0) {
-            msg = t('ecomm.prodotto_tolto')
           } else {
-            msg = t('ecomm.prod_sul_carrello', { strprod, qty: myorder.quantity })
+
+            let qta = ris.myord.quantity + ris.myord.quantitypreordered
+            if (qta > 1 || qta === 0)
+              strprod = t('ecomm.prodotti')
+
+            if (qta === 0) {
+              msg = t('ecomm.prodotto_tolto')
+            } else {
+              msg = t('ecomm.prod_sul_carrello', { strprod, qty: qta })
+            }
+
           }
 
-        }
+          updateproduct()
 
-        updateproduct()
+          if (ris === null || ris.myord.quantity === 0)
+            tools.showNotif($q, msg)
+          else
+            tools.showPositiveNotif($q, msg)
 
-        if (ris === null || myorder.quantity === 0)
+        })
-          tools.showNotif($q, msg)
+      }
-        else
-          tools.showPositiveNotif($q, msg)
-
-      })
     }
 
     function getnumstore() {
@@ -141,13 +147,13 @@ export default defineComponent({
 
     function updateproduct() {
       myproduct.value = products.getProduct(props.code)
-      products.updateQuantityAvailable(myproduct.value._id)
+      // products.updateQuantityAvailable(myproduct.value._id)
     }
 
     function getStorehouses() {
       if (!myproduct.value)
         return []
-      
+
       const myarr: any = []
       let ind = 1
       myproduct.value.storehouses.forEach((store) => {
@@ -175,6 +181,11 @@ export default defineComponent({
       return qty
     }
 
+    function getQtyBookableAvailable() {
+      let qty = myproduct.value.bookableAvailableQty!
+      return qty
+    }
+
     function getQtyWarn() {
       if (myorder.quantity > 0) {
         return t('ecomm.di_cui_x_in_carrello', { qty: myorder.quantity })
@@ -182,6 +193,13 @@ export default defineComponent({
       return ''
     }
 
+    function getQtyWarnPreOrdered() {
+      if (myorder.quantitypreordered > 0) {
+        return t('ecomm.di_cui_x_in_carrello', { qty: myorder.quantitypreordered })
+      }
+      return ''
+    }
+
     watch(() => props.code, (newval, oldval) => {
       console.log('change code')
       load()
@@ -206,6 +224,7 @@ export default defineComponent({
         const ord = products.getOrderProductInCart(myproduct.value._id)
         if (ord) {
           myorder.quantity = ord.quantity
+          myorder.quantitypreordered = ord.quantitypreordered
         }
       }
 
@@ -222,7 +241,8 @@ export default defineComponent({
     }
 
     function enableSubQty() {
-      return myorder.quantity ? myorder.quantity > 0 : false
+      let qty = myorder.quantity + myorder.quantitypreordered
+      return qty ? qty > 0 : false
     }
 
     function enableAddQty() {
@@ -262,6 +282,8 @@ export default defineComponent({
       endload,
       shared_consts,
       site,
+      getQtyWarnPreOrdered,
+      getQtyBookableAvailable,
     }
   }
 })

src/components/CProductCard/CProductCard.vue

@@ -51,16 +51,17 @@
                 myproduct.after_price
               }}</span>
             </q-item-label>
-            <q-item-label v-if="myproduct.scontisticas && myproduct.scontisticas.length > 0">
+            <q-item-label
+              v-if="myproduct.scontisticas && myproduct.scontisticas.length > 0"
+            >
               <div
-              class="prod_sconti" 
+                class="prod_sconti"
                 v-for="(sconti, index) of myproduct.scontisticas"
                 :key="index"
               >
                 {{ sconti.description }}
-            </div>
+              </div>
             </q-item-label>
-            
           </q-item-section>
         </q-item>
       </q-list>
@@ -116,29 +117,18 @@
 
             <q-item-section>
               <q-item-label>
-                <span v-if="getQtyAvailable() < 0">
+                {{ t('ecomm.available') }}
-                  {{ t('ecomm.preorders') }}
-                </span>
-                <span v-else>
-                  {{ t('ecomm.available') }}
-                </span>
               </q-item-label>
               <q-item-label>
                 <span class="prod_disp">
-                  <span v-if="getQtyAvailable() < 0">
+                  {{ getQtyAvailable() }}
-                    {{ -getQtyAvailable() }}
-                  </span>
-                  <span v-else>
-                    {{ getQtyAvailable() }}
-                  </span>
                 </span>
                 <div class="prod_qtywarn">
                   {{ getQtyWarn() }}
 
                   <div
                     v-if="
-                      tools.isManager() &&
+                      tools.isManager() && !!myproduct.QuantitaOrdinateInAttesa
-                      !!myproduct.QuantitaOrdinateInAttesa
                     "
                   >
                     {{
@@ -152,6 +142,43 @@
               <q-item-label> </q-item-label>
             </q-item-section>
           </q-item>
+          <q-item
+            v-if="getQtyBookableAvailable() > 0"
+            :clickable="tools.isManager()"
+            @click="tools.isManager() ? (openlistorders = true) : null"
+          >
+            <q-item-section avatar>
+              <q-icon color="blue" name="fas fa-edit" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                {{ t('ecomm.preorders') }}
+              </q-item-label>
+              <q-item-label>
+                <span class="prod_preorder">
+                  {{ getQtyBookableAvailable() }}
+                </span>
+                <div class="prod_qtywarn">
+                  <span v-if="getQtyWarnPreOrdered()">{{
+                    getQtyWarnPreOrdered()
+                  }}</span>
+
+                  <div
+                    v-if="
+                      tools.isManager() && !!myproduct.QuantitaPrenotateInAttesa
+                    "
+                  >
+                    {{
+                      $t('ecomm.qta_prenotate_in_attesa', {
+                        qty: myproduct.QuantitaPrenotateInAttesa,
+                      })
+                    }}
+                  </div>
+                </div>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
         </q-list>
         <div class="row q-mb-sm no-wrap items-center centeritems">
           <q-btn
@@ -175,6 +202,13 @@
               <div class="self-center no-outline" tabindex="0">
                 {{ myorder.quantity }}
               </div>
+              <div
+                v-if="myorder.quantitypreordered"
+                class="self-center no-outline"
+                tabindex="0"
+              >
+                Preord.: {{ myorder.quantitypreordered }}
+              </div>
             </template>
           </q-field>
 
@@ -221,7 +255,7 @@
 
         <q-card-actions vertical align="center">
           <q-btn
-            v-if="myorder.quantity > 0"
+            v-if="myorder.quantity + myorder.quantitypreordered > 0"
             rounded
             icon="fas fa-shopping-cart"
             color="primary"
@@ -282,9 +316,22 @@
                 </td>
                 <td class="text-center">
                   <div v-for="(singleord, index) in ordcart.items" :key="index">
-                    <span v-if="singleord.order.idProduct === myproduct._id">{{
+                    <span
-                      singleord.order.quantity
+                      v-if="
-                    }}</span>
+                        singleord.order.idProduct === myproduct._id &&
+                        singleord.order.quantity > 0
+                      "
+                    >
+                      {{ singleord.order.quantity }}</span
+                    >
+                    <span
+                      v-if="
+                        singleord.order.idProduct === myproduct._id &&
+                        singleord.order.quantitypreordered > 0
+                      "
+                    >
+                      {{ singleord.order.quantitypreordered }}</span
+                    >
                   </div>
                 </td>
                 <td class="text-center">

src/components/CSingleCart/CSingleCart.ts

@@ -40,14 +40,29 @@ export default defineComponent({
     }
 
     function addsubqty(addqty: boolean, subqty: boolean) {
-      if (addqty) {
+      if (products.isQtyAvailableByOrder(props.order)) {
-        if (props.order.quantity >= 10)
+        if (addqty) {
-          return false
+          if (props.order.quantity >= 20)
-      }
+            return false
+        }
 
-      if (subqty) {
+        if (subqty) {
-        if (props.order.quantity === 0)
+          if (props.order.quantity === 0)
-          return false
+            return false
+        }
+      } else {
+
+        if (products.isInPreorderByOrder(props.order)) {
+          if (addqty) {
+            if (props.order.quantitypreordered >= 20)
+              return false
+          }
+
+          if (subqty) {
+            if (props.order.quantitypreordered === 0)
+              return false
+          }
+        }
       }
 
       products.addSubQtyToItem({
@@ -56,14 +71,15 @@ export default defineComponent({
         order: props.order,
       }).then((res: any) => {
         if (res.risult) {
-          order.value.quantity = res.qty
+          order.value.quantity = res.myord.quantity
+          order.value.quantitypreordered = res.myord.quantitypreordered
         }
       })
     }
 
     function isApplicatoSconto() {
-      const totalipotetico = order.value.price! * order.value.quantity
+      const totalipotetico = order.value.price * (order.value.quantity + order.value.quantitypreordered)
-      if (totalipotetico > order.value.TotalPriceProduct!) {
+      if (totalipotetico > order.value.TotalPriceProduct) {
         return true
       }
       return false

src/components/CSingleCart/CSingleCart.vue

@@ -22,14 +22,14 @@
               <div class="self-center no-outline" tabindex="0" >{{ order.quantity }}</div>
             </template>
           </q-field>-->
-          <div :class="`q-mx-sm text-blue-14`">{{ order.quantity }}</div>
+          <div v-if="order.quantity > 0" :class="`q-mx-sm text-blue-14`">{{ order.quantity + order.quantitypreordered }}</div>
           <q-btn v-if="showall && !nomodif" round size="xs" text-color="grey" icon="fas fa-plus"
             @click="addsubqty(true, false)"></q-btn>
         </div>
       </div>
       <div class="col-2 no-wrap text-subtitle3 q-mr-sm">
         <div v-if="isApplicatoSconto()">
-          <span class="ordine_scontato_barrato">€&nbsp; {{ (order.price * order.quantity).toFixed(2) }}</span>
+          <span class="ordine_scontato_barrato">€&nbsp; {{ ((order.price * order.quantity) + (order.price * order.quantitypreordered)).toFixed(2) }}</span>
         </div>
         €&nbsp;{{ order.TotalPriceProduct ? order.TotalPriceProduct.toFixed(2) : 0 }}
       </div>

src/mixins/mixin-users.ts

@@ -51,7 +51,7 @@ export default function () {
     if (!!arrcart) {
       if (!!arrcart.items) {
         // @ts-ignore
-        const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity, 0)
+        const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity + item.order.quantitypreordered , 0)
         return total
       }
     }

src/model/Products.ts

@@ -22,8 +22,11 @@ export interface IProduct {
   color?: string,
   size?: string,
   quantityAvailable?: number,
+  bookableAvailableQty?: number,
   QuantitaOrdinateInAttesa?: number,
-  stockQty?: number,
+  QuantitaPrenotateInAttesa?: number,
+  stockQty: number,
+  bookableQty: number,
   canBeShipped?: boolean,
   canBeBuyOnline?: boolean,
   weight?: number,
@@ -54,6 +57,7 @@ export interface IOrder {
   color?: string
   size?: string
   quantity: number
+  quantitypreordered: number
   weight?: number
   stars?: number
   product?: IProduct

src/statics/lang/it.js

@@ -62,6 +62,8 @@ const msg_it = {
       quantity: 'Quantità',
       quantityAvailable: 'Disponibili',
       stockQty: 'In Magazzino',
+      bookableQty: 'Prenotabili',
+      bookableAvailableQty: 'Disponib. Prenotabili',
       weight: 'Peso',
       unit: 'Unità di Misura',
       stars: 'Voto',
@@ -1661,6 +1663,7 @@ const msg_it = {
       carrello: 'Carrello',
       settings: 'Impostazioni',
       qta_in_attesa: '(Ordinati In attesa {qty})',
+      qta_prenotate_in_attesa: '(Preordinate In attesa {qty})',
     },
   },
 

src/store/Modules/fieldsTable.ts

@@ -1999,11 +1999,21 @@ export const colTableProducts = [
     label_trans: 'products.quantityAvailable',
     fieldtype: costanti.FieldType.number
   }),
+  AddCol({
+    name: 'bookableAvailableQty',
+    label_trans: 'products.bookableAvailableQty',
+    fieldtype: costanti.FieldType.number
+  }),
   AddCol({
     name: 'stockQty',
     label_trans: 'products.stockQty',
     fieldtype: costanti.FieldType.number
   }),
+  AddCol({
+    name: 'bookableQty',
+    label_trans: 'products.bookableQty',
+    fieldtype: costanti.FieldType.number
+  }),
   AddCol({ name: 'canBeShipped', label_trans: 'products.canBeShipped', fieldtype: costanti.FieldType.boolean }),
   AddCol({ name: 'canBeBuyOnline', label_trans: 'products.canBeBuyOnline', fieldtype: costanti.FieldType.boolean }),
   AddCol({ name: 'weight', label_trans: 'products.weight', fieldtype: costanti.FieldType.number }),

src/store/Modules/tools.ts

@@ -8270,6 +8270,7 @@ export const tools = {
   },
 
 
+
   // FINE !
 
   // getLocale() {

src/store/Products.ts

@@ -30,6 +30,17 @@ export const useProducts = defineStore('Products', {
         const indelem = state.products.findIndex((prod: IProduct) => prod._id === res.data.product._id)
         if (indelem >= 0) {
           state.products[indelem] = { ...res.data.product }
+
+          /*if (!res.data.orders) {
+            // aggiorna anche tutti i product negli ordini !
+            let ordcart: IOrderCart
+            for (ordcart of state.orders) {
+              for (const item of ordcart.items!) {
+                if (item.order.idProduct === res.data.product.idProduct)
+                  item.order.product = res.data.product
+              }
+            }
+          }*/
         }
       }
       if (res && res.data.orders) {
@@ -44,7 +55,10 @@ export const useProducts = defineStore('Products', {
 
     getProduct: (state: IProductsState) => (code: string): IProduct => {
       const prod = state.products.find((prod: IProduct) => prod.code === code)
-      return prod ? prod : { active: false, img: '', code: '', name: '', storehouses: [], scontisticas: [], price: 0 }
+      return prod ? prod : {
+        active: false, img: '', code: '', name: '', storehouses: [], scontisticas: [], price: 0,
+        stockQty: 0, bookableQty: 0
+      }
     },
 
     getCart: (state: IProductsState) => (): ICart => {
@@ -115,7 +129,7 @@ export const useProducts = defineStore('Products', {
               for (const item of myord.items) {
                 if (item.order) {
                   if (item.order.idProduct === idproduct) {
-                    totalQuantity += item.order.quantity || 0;
+                    totalQuantity += (item.order.quantity + item.order.quantitypreordered) || 0;
                   }
                 }
               }
@@ -146,7 +160,7 @@ export const useProducts = defineStore('Products', {
       return []
     },
 
-    updateQuantityAvailable: (state: IProductsState) => (id: string): any => {
+    /* updateQuantityAvailable: (state: IProductsState) => (id: string): any => {
 
       const indelem = state.products.findIndex((prod: IProduct) => prod._id === id)
       if (indelem >= 0) {
@@ -154,9 +168,14 @@ export const useProducts = defineStore('Products', {
         if (state.products[indelem].QuantitaOrdinateInAttesa! > 0) {
           state.products[indelem].quantityAvailable! -= state.products[indelem].QuantitaOrdinateInAttesa!
         }
+        state.products[indelem].bookableAvailableQty = state.products[indelem].bookableQty
+        if (state.products[indelem].QuantitaPrenotateInAttesa! > 0) {
+          state.products[indelem].bookableAvailableQty! -= state.products[indelem].QuantitaPrenotateInAttesa!
+        }
       }
 
-    },
+    },*/
+
     getRecordEmpty: (state: IProductsState) => (): IProduct => {
 
       const tomorrow = tools.getDateNow()
@@ -182,9 +201,12 @@ export const useProducts = defineStore('Products', {
         color: '',
         size: '',
         quantityAvailable: 0,
+        bookableAvailableQty: 0,
         stockQty: 0,
+        bookableQty: 0,
         canBeShipped: false,
         QuantitaOrdinateInAttesa: 0,
+        QuantitaPrenotateInAttesa: 0,
         canBeBuyOnline: false,
         weight: 0,
         unit: 0,
@@ -218,6 +240,7 @@ export const useProducts = defineStore('Products', {
         weight: product.weight,
 
         quantity: order.quantity,
+        quantitypreordered: order.quantitypreordered,
         idStorehouse: order.idStorehouse,
         idScontisticas: product.idScontisticas,
       }
@@ -388,12 +411,13 @@ export const useProducts = defineStore('Products', {
         const ordcart = this.getOrderProductInCart(product._id)
         if (ordcart) {
 
-          if (!addqty && ordcart.quantity === 1) {
+          if (!addqty && ((ordcart.quantity + ordcart.quantitypreordered) === 1)) {
             // sto per rimuovere l'ultimo pezzo, quindi cancello direttamente
             const risrem = await this.removeFromCart({ order: ordcart })
 
             if (risrem) {
               order.quantity = 0
+              order.quantitypreordered = 0
               return true
             } else {
               return false
@@ -406,14 +430,22 @@ export const useProducts = defineStore('Products', {
             order: ordcart,
           }).then((res: any) => {
             if (res && res.risult) {
-              order.quantity = res.qty
+              order.quantity = res.myord.quantity
+              order.quantitypreordered = res.myord.quantitypreordered
             }
             return res;
           })
         }
       } else {
-        if (order.quantity === 0)
+        if (this.isQtyAvailableByProduct(product)) {
+          order.quantitypreordered = 0
           order.quantity = 1
+        } else {
+          if (this.isInPreorderByProduct(product)) {
+            order.quantity = 0
+            order.quantitypreordered = 1
+          }
+        }
 
         neworder = this.createOrderByProduct(product, order)
       }
@@ -434,7 +466,7 @@ export const useProducts = defineStore('Products', {
           }
           this.updateDataProduct(res)
 
-          return { risult: !!res, qty: order.quantity }
+          return { risult: !!res }
         })
         .catch((error) => {
           console.log('error addToCart', error)
@@ -463,7 +495,7 @@ export const useProducts = defineStore('Products', {
         .then((res) => {
           this.updateDataProduct(res)
 
-          return { risult: !!res, qty: res.data.qty }
+          return { risult: !!res, myord: res.data.myord }
         })
         .catch((error) => {
           console.log('error addSubQtyToItem', error)
@@ -562,6 +594,47 @@ export const useProducts = defineStore('Products', {
 
       return ris
     },
+
+    getQuantityByOrder(order: IOrder): string {
+      let mystr = '';
+      if (order.quantity > 0) {
+        mystr += order.quantity
+      }
+      if (order.quantitypreordered > 0) {
+        mystr += ' Prenotata :' + order.quantitypreordered
+      }
+      return mystr
+    },
+
+    isQtyAvailableByProduct(product: IProduct): boolean {
+      if (product) {
+        return (product.quantityAvailable! > 0)
+      }
+      return false;
+    },
+
+    isInPreorderByProduct(product: IProduct): boolean {
+      if (product) {
+        return (product.bookableAvailableQty! > 0)
+      }
+      return false;
+    },
+
+    isQtyAvailableByOrder(order: IOrder): boolean {
+      if (order && order.product) {
+        return this.isQtyAvailableByProduct(order.product)
+      }
+      return false;
+    },
+
+    isInPreorderByOrder(order: IOrder): boolean {
+      if (order && order.product) {
+        return this.isInPreorderByProduct(order.product)
+      }
+      return false;
+    },
+
+
   },
 
 })

src/views/ecommerce/orderInfo/orderInfo.ts

@@ -312,6 +312,7 @@ export default defineComponent({
       getCols,
       endload,
       getOrdersCartWithTotals,
+      productStore,
     }
   }
 })

src/views/ecommerce/orderInfo/orderInfo.vue

@@ -57,7 +57,7 @@
                             v-if="!!item && item.order && item.order.product"
                           >
                             {{ item.order.product.name }} ({{
-                              item.order.quantity
+                              productStore.getQuantityByOrder(item.order)
                             }})<br />
                           </div>
                         </div>
@@ -141,7 +141,7 @@
                 <div v-for="(item, index) of props.row.items" :key="index">
                   <div v-if="!!item.order && item.order.product">
                     {{ item.order.product.name }} ({{
-                      item.order.quantity
+                      productStore.getQuantityByOrder(item.order)
                     }})<br />
                   </div>
                 </div>