From f7656c83790ad4d8bd234cddd9f25f59e8ce8edc Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Thu, 30 Nov 2023 15:43:32 +0100
Subject: [PATCH] =?UTF-8?q?quantit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CMyCart/CMyCart.vue           |  1 -
 src/components/CMyPopupEdit/CMyPopupEdit.vue | 36 +++++++++++++++++++-
 src/components/CProductCard/CProductCard.ts  | 21 +++++++-----
 src/components/CProductCard/CProductCard.vue | 10 +++---
 src/components/MyHeader/MyHeader.ts          | 15 ++------
 src/model/Products.ts                        |  2 +-
 src/statics/lang/it.js                       |  7 ++--
 src/views/ecommerce/cartList/cartList.vue    |  2 +-
 8 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/components/CMyCart/CMyCart.vue b/src/components/CMyCart/CMyCart.vue
index 441c334e..b2c41836 100755
--- a/src/components/CMyCart/CMyCart.vue
+++ b/src/components/CMyCart/CMyCart.vue
@@ -4,7 +4,6 @@
       <div class="myheader row justify-between">
         <div class="col-6">
           <q-btn class="q-mx-xs" round dense flat icon="fas fa-shopping-cart">
-
             <q-badge v-if="getnumItemsCart() > 0" color="red" floating transparent>
               {{ getnumItemsCart() }}
             </q-badge>
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 04088cd9..106b6c06 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -1227,6 +1227,40 @@
               </CMySelect>
             </div>
             <div v-else-if="col.fieldtype === costanti.FieldType.multiselect">
+              <CMySelect
+                :type_out="col.field_outtype"
+                :col="col"
+                :row="row"
+                :multiple="true"
+                :withToggle="true"
+                :label="col.label ? col.label : $t(col.label_trans)"
+                :filter_table="col.filter_table"
+                :filter_field="col.filter_field"
+                :value_extra="value_extra"
+                v-model:arrvalue="scope.value"
+                @update:arrvalue="changevalRec"
+                :addall="false"
+                :addnone="false"
+                label-color="primary"
+                class="combowidth"
+                color="primary"
+                :optval="fieldsTable.getKeyByTable(col.jointable)"
+                :optlab="fieldsTable.getLabelByTable(col.jointable)"
+                :options="
+                  globalStore.getTableJoinByName(
+                    col.jointable,
+                    col.addall,
+                    col.addnone,
+                    col.filter
+                  )
+                "
+                :sola_lettura="!isInModif"
+                :useinput="col.allowNewValue"
+                :newvaluefunc="addNewValue"
+              >
+              </CMySelect>
+
+              <!--
               <q-select
                 :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
                 v-model="scope.value"
@@ -1269,7 +1303,7 @@
                     </q-item-section>
                   </q-item>
                 </template>
-              </q-select>
+              </q-select>-->
             </div>
             <div v-else-if="col.fieldtype === costanti.FieldType.nationality">
               <div class="justify-center q-gutter-sm clgutter q-mt-sm">
diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts
index d2f2f727..2fe08b04 100755
--- a/src/components/CProductCard/CProductCard.ts
+++ b/src/components/CProductCard/CProductCard.ts
@@ -55,6 +55,8 @@ export default defineComponent({
 
     const myproduct = ref(<IProduct> {})
 
+    const storeSelected = ref('')
+
     function iconWhishlist(order: IProduct) {
       if (true) {
         return 'far fa-heart'
@@ -64,17 +66,13 @@ export default defineComponent({
     }
 
     function decqty() {
-      if (myorder.value.quantity) {
-        if (myorder.value.quantity > 0)
-          myorder.value.quantity--
-      }
+      if (myorder.value.quantity > 0)
+        myorder.value.quantity--
     }
 
     function addqty() {
-      if (myorder.value.quantity) {
-        if (myorder.value.quantity < 10)
-          myorder.value.quantity++
-      }
+      if (myorder.value.quantity < 10)
+        myorder.value.quantity++
     }
 
     function addtoCart() {
@@ -91,7 +89,7 @@ export default defineComponent({
       } else {
         products.addToCart({ product: myproduct.value, order: props.order }).then((ris) => {
           let strprod = t('ecomm.prodotto')
-          if (myorder.value.quantity! > 1)
+          if (myorder.value.quantity > 1)
             strprod = t('ecomm.prodotti')
           if (ris)
             tools.showPositiveNotif($q, t('ecomm.haveadded') + ' ' + myorder.value.quantity + ' ' + strprod + ' ' + t('ecomm.tocart'))
@@ -144,6 +142,10 @@ export default defineComponent({
       load()
     })
 
+    watch(() => storeSelected.value, (newval, oldval) => {
+      myorder.value.idStorehouse = newval
+    })
+
     async function load() {
       // console.log('created Cproductcard', code)
       if (props.code) {
@@ -187,6 +189,7 @@ export default defineComponent({
       myorder,
       tools,
       t,
+      storeSelected,
     }
   }
 })
diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue
index bdf9c8a7..2281dae2 100755
--- a/src/components/CProductCard/CProductCard.vue
+++ b/src/components/CProductCard/CProductCard.vue
@@ -1,7 +1,7 @@
 <template>
   <q-card :class="getmycardcl()" v-if="!!myproduct">
     <div v-if="myorder">
-      qta: {{ myorder.quantity }}
+      myorder: {{ myorder }}
     </div>
 
     <q-img :src="`` + myproduct.img" :alt="myproduct.name" :class="getclimg()"></q-img>
@@ -50,13 +50,13 @@
         </div>
       </div>
       <div class="row q-mb-sm no-wrap items-center centeritems">
-        <q-btn round size="xs" text-color="grey" icon="fas fa-minus" @click="decqty"></q-btn>
+        <q-btn round size="xs" text-color="grey" icon="fas fa-minus" @click="decqty()"></q-btn>
         <q-field outlined dense style="width: 40px; height: 30px;" class="q-mx-xs">
           <template v-slot:control>
             <div class="self-center no-outline" tabindex="0">{{ order.quantity }}</div>
           </template>
         </q-field>
-        <q-btn round size="xs" text-color="grey" icon="fas fa-plus" @click="addqty"></q-btn>
+        <q-btn round size="xs" text-color="grey" icon="fas fa-plus" @click="addqty()"></q-btn>
       </div>
       <div v-if="complete || getnumstore() > 1">
         <div class="text-blue text-title row items-center q-mr-md centeritems">
@@ -66,7 +66,7 @@
         <div class="text-green-6 text-title row items-center q-my-sm centeritems">
 
           <div v-if="getnumstore() > 1">
-            <q-select :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'" outlined v-model="order.idStorehouse"
+            <q-select :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'" outlined v-model="storeSelected"
               :options="getStorehouses()" :label="t('products.magazzino') + `:`" emit-value map-options>
             </q-select>
           </div>
@@ -81,7 +81,7 @@
 
     <q-card-actions vertical align="center">
       <q-btn icon="fas fa-cart-plus" color="primary" :disable="checkifCartDisable()" rounded size="md"
-        :label="t('products.addcart')" @click="addtoCart">
+        :label="t('products.addcart', {qta: order.quantity})" @click="addtoCart()">
       </q-btn>
       <!--
       <q-btn :icon="iconWhishlist(myproduct)" flat color="primary" rounded label="Lista Desideri">
diff --git a/src/components/MyHeader/MyHeader.ts b/src/components/MyHeader/MyHeader.ts
index bd7739e8..f988bb87 100755
--- a/src/components/MyHeader/MyHeader.ts
+++ b/src/components/MyHeader/MyHeader.ts
@@ -26,6 +26,7 @@ import { CMyCart, CSigninNoreg } from '@/components'
 import { costanti } from '@costanti'
 import { useNotifStore } from '@src/store/NotifStore'
 
+
 import { Platform } from 'quasar';
 
 export default defineComponent({
@@ -68,6 +69,8 @@ export default defineComponent({
     const testStore = useTestStore()
     const notifStore = useNotifStore()
 
+    const { getnumItemsCart } = MixinUsers()
+
     const site = computed(() => globalStore.site)
     const isfinishLoading = computed(() => globalStore.finishLoading)
 
@@ -501,18 +504,6 @@ export default defineComponent({
       $router.replace('/signup')
     }
 
-    function getnumItemsCart() {
-      /* const arrcart = Products.cart
-      if (!!arrcart) {
-        if (!!arrcart.items) {
-          const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity, 0)
-          return total
-        }
-      }
-
-       */
-      return 0
-    }
 
     function getnumOrdersCart() {
       /* const arrorderscart = Products.orders.filter((rec) => rec.status < shared_consts.OrderStatus.RECEIVED)
diff --git a/src/model/Products.ts b/src/model/Products.ts
index da686a08..c916143f 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -41,7 +41,7 @@ export interface IOrder {
   after_price?: string
   color?: string
   size?: string
-  quantity?: number
+  quantity: number
   weight?: number
   stars?: number
   product?: IProduct
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index dd8715a5..502e8e83 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -68,8 +68,11 @@ const msg_it = {
       theme: 'Tema',
       ritiro_presso: 'Ritiro presso',
       magazzino: 'Magazzino',
-      addcart: 'Aggiungi al Carrello',
-      origine: 'Origine',
+      addcart: 'Aggiungi {qta} al Carrello',
+      origine: 'Origine',    
+    },
+    storehouses: {
+      name: 'Magazzino',
     },
     otherpages: {
       myactivities: 'Attività',
diff --git a/src/views/ecommerce/cartList/cartList.vue b/src/views/ecommerce/cartList/cartList.vue
index 3c6338fa..951b6d0e 100755
--- a/src/views/ecommerce/cartList/cartList.vue
+++ b/src/views/ecommerce/cartList/cartList.vue
@@ -3,7 +3,7 @@
     <div class="panel">
       <div class="container">
         <div class="row">
-          <div class="q-pa-md row items-start q-gutter-md" v-for="(product, index) in getProducts" :key="index">
+          <div class="q-pa-md row items-start q-gutter-md" v-for="(product, index) in getProducts()" :key="index">
             <CProductCard :product="product"/>
           </div>
         </div>