From 40076e3e1d2154c6f02c36d08001158b4a23997c Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Tue, 16 Jan 2024 23:00:15 +0100
Subject: [PATCH] =?UTF-8?q?Poter=20inserire=20un=20Ordine=20anche=20per=20?=
 =?UTF-8?q?un=20altra=20persona...=20(Modalit=C3=A0=20Cassa)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/shared_vuejs.ts                    |  2 +-
 src/components/CCart/CCart.ts                 |  3 +-
 src/components/CCart/CCart.vue                |  1 +
 src/components/CProductCard/CProductCard.ts   |  2 +-
 src/components/CProductCard/CProductCard.vue  |  4 +-
 .../CSelectUserActive/CSelectUserActive.scss  |  0
 .../CSelectUserActive/CSelectUserActive.ts    | 26 ++++++++
 .../CSelectUserActive/CSelectUserActive.vue   | 22 +++++++
 src/components/CSelectUserActive/index.ts     |  1 +
 src/components/MyHeader/MyHeader.ts           |  8 ++-
 src/components/MyHeader/MyHeader.vue          | 12 +++-
 src/model/Products.ts                         |  4 +-
 src/model/UserStore.ts                        |  8 +++
 src/statics/lang/it.js                        |  1 +
 src/store/Modules/fieldsTable.ts              |  1 +
 src/store/Modules/tools.ts                    |  6 ++
 src/store/Products.ts                         | 61 +++++++++++++------
 src/views/ecommerce/cash/cash.ts              |  3 +-
 src/views/ecommerce/cash/cash.vue             |  1 +
 src/views/ecommerce/checkOut/checkOut.ts      |  2 +
 src/views/ecommerce/checkOut/checkOut.vue     |  2 +-
 .../ecommerce/productsList/productsList.ts    |  3 +-
 .../ecommerce/productsList/productsList.vue   |  1 +
 23 files changed, 144 insertions(+), 30 deletions(-)
 create mode 100755 src/components/CSelectUserActive/CSelectUserActive.scss
 create mode 100755 src/components/CSelectUserActive/CSelectUserActive.ts
 create mode 100755 src/components/CSelectUserActive/CSelectUserActive.vue
 create mode 100755 src/components/CSelectUserActive/index.ts

diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index e2fcab16..9bc64feb 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -1177,7 +1177,7 @@ export const shared_consts = {
       color: 'blue',
     },
     {
-      label: 'Imposta come Cancellato', //CANCELED
+      label: '📩 Imposta come Cancellato', //CANCELED
       value: 10,
       icon: 'delete',
       color: 'red',
diff --git a/src/components/CCart/CCart.ts b/src/components/CCart/CCart.ts
index f9906602..fb3ae9eb 100755
--- a/src/components/CCart/CCart.ts
+++ b/src/components/CCart/CCart.ts
@@ -14,6 +14,7 @@ import { shared_consts } from '@src/common/shared_vuejs'
 
 import { CSingleCart } from '../CSingleCart'
 import { CTitleBanner } from '@components'
+import { CSelectUserActive } from '@src/components/CSelectUserActive'
 
 export default defineComponent({
   name: 'CCart',
@@ -30,7 +31,7 @@ export default defineComponent({
     },
 
   },
-  components: { CSingleCart, CTitleBanner },
+  components: { CSingleCart, CTitleBanner, CSelectUserActive },
   setup(props) {
     const userStore = useUserStore()
     const globalStore = useGlobalStore()
diff --git a/src/components/CCart/CCart.vue b/src/components/CCart/CCart.vue
index acfa23dc..87ab06ff 100755
--- a/src/components/CCart/CCart.vue
+++ b/src/components/CCart/CCart.vue
@@ -1,6 +1,7 @@
 <template>
   <q-spinner v-if="!endload" color="primary" size="3em" :thickness="2" />
   <div v-if="endload">
+    <CSelectUserActive></CSelectUserActive>
     <div v-if="recOrderCart" class="panel">
       <div>
         <div class="container">
diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts
index 5fac5a84..c4dc3b2f 100755
--- a/src/components/CProductCard/CProductCard.ts
+++ b/src/components/CProductCard/CProductCard.ts
@@ -258,7 +258,6 @@ export default defineComponent({
 
     function updateLabel() {
       if (myproduct.value.gasordine) {
-        //labelDataRitiro.value = tools.getstrDateTime(recgasordineSelected.value.dataora_ritiro)
         if (myproduct.value.gasordine.data_arrivo_merce)
           labelDataArrivoMerce.value = tools.getstrDateShort(myproduct.value.gasordine.data_arrivo_merce)
         if (myproduct.value.gasordine.dataora_ritiro)
@@ -267,6 +266,7 @@ export default defineComponent({
         labelDataArrivoMerce.value = ''
         labelDataRitiro.value = ''
       }
+      updateTimerLabel()
     }
 
     function mounted() {
diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue
index 250308d9..b8707ef2 100755
--- a/src/components/CProductCard/CProductCard.vue
+++ b/src/components/CProductCard/CProductCard.vue
@@ -604,12 +604,12 @@
             </q-item-section>
           </q-item-section>
         </q-item>
-        <q-item v-if="myproduct.gasordine && myproduct.gasordine.active">
+        <q-item v-if="myproduct.gasordine && myproduct.gasordine.active && (myproduct.gasordine.dataora_chiusura_ordini || editOn)">
           <q-item-section avatar>
             <q-icon color="blue" name="fas fa-hourglass-half" />
           </q-item-section>
 
-          <q-item-section v-if="!!myproduct.gasordine.dataora_chiusura_ordini">
+          <q-item-section>
             <q-item-label class="countdown_scadenza">
               <span v-if="timerLabelScadenza">{{ timerLabelScadenza }}</span>
               <span v-else-if="isOrdineChiuso()">{{
diff --git a/src/components/CSelectUserActive/CSelectUserActive.scss b/src/components/CSelectUserActive/CSelectUserActive.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/components/CSelectUserActive/CSelectUserActive.ts b/src/components/CSelectUserActive/CSelectUserActive.ts
new file mode 100755
index 00000000..399a189d
--- /dev/null
+++ b/src/components/CSelectUserActive/CSelectUserActive.ts
@@ -0,0 +1,26 @@
+import { defineComponent, ref } from 'vue'
+
+import { useUserStore } from '@store/UserStore'
+import { useProducts } from '@store/Products'
+import { useI18n } from '@/boot/i18n'
+import { tools } from '@store/Modules/tools'
+
+export default defineComponent({
+  name: 'CSelectUserActive',
+  props: {
+  },
+  components: {},
+  setup(props, { emit }) {
+    const { t } = useI18n()
+
+    const userStore = useUserStore()
+    const productStore = useProducts()
+
+    return {
+      userStore,
+      productStore,
+      t,
+      tools,
+    }
+  },
+})
diff --git a/src/components/CSelectUserActive/CSelectUserActive.vue b/src/components/CSelectUserActive/CSelectUserActive.vue
new file mode 100755
index 00000000..5969202c
--- /dev/null
+++ b/src/components/CSelectUserActive/CSelectUserActive.vue
@@ -0,0 +1,22 @@
+<template>
+  <q-select
+    v-if="tools.isSeller() && productStore.userActive"
+    v-model="productStore.userActive"
+    :options="userStore.usersList"
+    label="Spesa dell'Utente:"
+    filled
+    :bg-color="userStore.my._id !== productStore.userActive._id ? 'green' : undefined"
+    :option-label="(opt) => tools.getNomeUtenteEUsernameByRecUser(opt)"
+    option-value="null"
+    emit-value
+    map-options
+    @update:model-value="productStore.changeuserActive(productStore.userActive)"
+  >
+  </q-select>
+</template>
+
+<script lang="ts" src="./CSelectUserActive.ts">
+</script>
+<style lang="scss" scoped>
+@import './CSelectUserActive.scss';
+</style>
diff --git a/src/components/CSelectUserActive/index.ts b/src/components/CSelectUserActive/index.ts
new file mode 100755
index 00000000..c3978343
--- /dev/null
+++ b/src/components/CSelectUserActive/index.ts
@@ -0,0 +1 @@
+export {default as CSelectUserActive} from './CSelectUserActive.vue'
diff --git a/src/components/MyHeader/MyHeader.ts b/src/components/MyHeader/MyHeader.ts
index a87cb73c..c8b579cf 100755
--- a/src/components/MyHeader/MyHeader.ts
+++ b/src/components/MyHeader/MyHeader.ts
@@ -16,10 +16,12 @@ import coinsPopover from '../../layouts/toolbar/coinsPopover/coinsPopover.vue'
 import drawer from '../../layouts/drawer/drawer.vue'
 import { CMyAvatar } from '@/components/CMyAvatar'
 import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CSelectUserActive } from '@/components/CSelectUserActive'
 import { toolsext } from '@store/Modules/toolsext'
 import { useGlobalStore } from '@store/globalStore'
 import { useTestStore } from '@store/testStore'
 import { useUserStore } from '@store/UserStore'
+import { useProducts } from '@store/Products'
 
 import MixinUsers from '../../mixins/mixin-users'
 import { CMyCart, CSigninNoreg } from '@/components'
@@ -33,7 +35,8 @@ export default defineComponent({
   name: 'MyHeader',
   components: {
     drawer, messagePopover,
-    CMyFieldDb, CMyAvatar, CSigninNoreg, CMyCart, notifPopover, coinsPopover
+    CMyFieldDb, CMyAvatar, CSigninNoreg, CMyCart, notifPopover, coinsPopover,
+    CSelectUserActive,
   },
   props: {
     extraContent: {
@@ -66,6 +69,7 @@ export default defineComponent({
 
     const userStore = useUserStore()
     const globalStore = useGlobalStore()
+    const products = useProducts()
     const testStore = useTestStore()
     const notifStore = useNotifStore()
 
@@ -594,6 +598,8 @@ export default defineComponent({
       iconConn,
       clIconConn,
       toHome,
+      products,
+      userStore,
     }
   },
 
diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue
index 981b05f2..962cf517 100755
--- a/src/components/MyHeader/MyHeader.vue
+++ b/src/components/MyHeader/MyHeader.vue
@@ -115,7 +115,12 @@
         <div v-if="site.confpages && site.confpages.showMsgs">
           <message-popover></message-popover>
         </div>
-        <div v-if="site.confpages && site.confpages.showCoins || site.confpages.showRIS">
+        <div
+          v-if="
+            (site.confpages && site.confpages.showCoins) ||
+            site.confpages.showRIS
+          "
+        >
           <coinsPopover v-model="rightCoinsOpen"></coinsPopover>
         </div>
         <div v-if="site.confpages && site.confpages.showNotif">
@@ -250,8 +255,11 @@
         @click="rightCartOpen = !rightCartOpen"
       >
       </q-btn>
+
+      <CSelectUserActive></CSelectUserActive>
+      
       <div v-if="tools.isLogged()" class="text-weight-bold text-cart">
-        {{ $t('ecomm.carrello') }}
+        {{ $t('ecomm.carrello_di', { user: products.userActive.username }) }}
       </div>
       <CMyCart v-if="isfinishLoading"></CMyCart>
     </q-drawer>
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 3ecaac1e..fa208097 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -1,4 +1,4 @@
-import { IUserFields } from './UserStore'
+import { IUserFields, IUserShort } from './UserStore'
 
 
 export interface IProductInfo {
@@ -101,6 +101,7 @@ export interface IProductsState {
   catprods: ICatProd[]
   subcatprods: ISubCatProd[]
   productInfos: IProductInfo[]
+  userActive: IUserShort
 }
 
 export interface IProducer {
@@ -213,6 +214,7 @@ export interface ICart {
   userId?: string
   totalQty?: number
   totalPrice?: number
+  totalPriceCalc?: number
   department?: string
   items?: IBaseOrder[]
   note?: string
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index ec560771..c59ced20 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -193,6 +193,14 @@ export interface IUserAport {
   profile?: IUserProfile
 }
 
+export interface IUserShort {
+  _id: string
+  username: string
+  name: string
+  surname: string
+  profile?: IUserProfile
+}
+
 export interface IUserFields {
   _id: string
   idapp?: string
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index cdaca838..a08dad32 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1698,6 +1698,7 @@ const msg_it = {
       totale: 'Totale',
       calcolato: 'Calcolato',
       carrello: 'Carrello',
+      carrello_di: 'Carrello di {user}',
       settings: 'Impostazioni',
       qta_in_attesa: '(Ordinati In attesa {qty})',
       sconto_applicato: 'Risparmi {risparmio} € !',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 3b5b9dfb..86f12ad2 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2036,6 +2036,7 @@ export const colTableOrdersCart = [
   AddCol({ name: 'totalQty', label_trans: 'orderscart.totalQty', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'totalQtyPreordered', label_trans: 'orderscart.totalQtyPreordered', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'totalPrice', label_trans: 'orderscart.totalPrice', fieldtype: costanti.FieldType.number }),
+  AddCol({ name: 'totalPriceCalc', label_trans: 'orderscart.totalPriceCalc', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'status', label_trans: 'orderscart.status', fieldtype: costanti.FieldType.number }),
 ] 
   
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index e7397e13..a1fe3182 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -66,6 +66,7 @@ export const tools = {
   FILTER_MYFOLLOW: 2,
 
   COOK_SEARCH: 'SEARCH_',
+  COOK_SELCART: 'SELCART_',
   COOK_TAB_CIRCUIT: 'TAB_CIRC',
   COOK_COSA_PRODOTTI: 'PROD',
 
@@ -3005,6 +3006,11 @@ export const tools = {
     return userStore.isManager || userStore.isAdmin
   },
 
+  isSeller() {
+    const userStore = useUserStore()
+    return userStore.isManager || userStore.isAdmin
+  },
+
   isSocioResidente() {
     const userStore = useUserStore()
     return !!userStore.my.profile ? userStore.my.profile.socioresidente : false
diff --git a/src/store/Products.ts b/src/store/Products.ts
index de558e3f..c92de05f 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -1,4 +1,4 @@
-import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd } from 'model'
+import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort } from 'model'
 
 import { Api } from '@api'
 import { serv_constants } from '@src/store/Modules/serv_constants'
@@ -107,6 +107,7 @@ export const useProducts = defineStore('Products', {
     catprods: [],
     subcatprods: [],
     productInfos: [],
+    userActive: {username: '', name: '', surname: '', _id: ''},
   }),
 
   getters: {
@@ -356,7 +357,7 @@ export const useProducts = defineStore('Products', {
     createOrderByProduct(product: IProduct, order: IOrder): IOrder {
       const userStore = useUserStore()
       const myorder: IOrder = {
-        userId: userStore.my._id,
+        userId: this.userActive._id,
         idapp: process.env.APP_ID,
         status: shared_consts.OrderStatus.IN_CART,
         TotalPriceProduct: 0,
@@ -379,7 +380,7 @@ export const useProducts = defineStore('Products', {
 
     initcat() {
 
-      // rec.userId = userStore.my._id
+      // rec.userId = this.userActive._id
 
       return this.getRecordEmpty()
 
@@ -401,15 +402,26 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      // console.log('getProducts', 'userid=', userStore.my._id)
+      // console.log('getProducts', 'userid=', this.userActive._id)
 
-      // if (userStore.my._id === '') {
+      // if (this.userActive._id === '') {
       //   return new Types.AxiosError(0, null, 0, '')
       // }
 
       let ris = null
 
-      ris = await Api.SendReq('/products', 'POST', { userId: userStore.my._id })
+      let myIdActiveSelected = userStore.my._id
+      if (tools.isSeller())
+        myIdActiveSelected = tools.getCookie(tools.COOK_SELCART, userStore.my._id, false)
+
+      const trovato = userStore.usersList.find((user: IUserShort) => user._id === myIdActiveSelected)
+      if (trovato)
+        this.userActive = trovato
+      else
+        this.userActive = userStore.my
+     
+
+      ris = await Api.SendReq('/products', 'POST', { userId: this.userActive._id })
         .then((res) => {
           if (res.data.products) {
             // console.log('aggiorna prodotti')
@@ -452,7 +464,7 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      console.log('updateOrderByOrder', 'userid=', userStore.my._id)
+      console.log('updateOrderByOrder', 'userid=', this.userActive._id)
 
       let ris = null
 
@@ -492,7 +504,7 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      console.log('updateOrdersCartById', 'userid=', userStore.my._id)
+      console.log('updateOrdersCartById', 'userid=', this.userActive._id)
 
       let ris = null
 
@@ -529,7 +541,7 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      // if (userStore.my._id === '') {
+      // if (this.userActive._id === '') {
       //   return new Types.AxiosError(0, null, 0, '')
       // }
 
@@ -563,13 +575,13 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      // if (userStore.my._id === '') {
+      // if (this.userActive._id === '') {
       //   return new Types.AxiosError(0, null, 0, '')
       // }
 
       let ris = null
 
-      ris = await Api.SendReq('/cart/' + userStore.my._id, 'GET', null)
+      ris = await Api.SendReq('/cart/' + this.userActive._id, 'GET', null)
         .then((res) => {
           if (res.data && res.data.cart) {  // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
             this.cart = res.data.cart
@@ -596,7 +608,7 @@ export const useProducts = defineStore('Products', {
 
       const userStore = useUserStore()
 
-      return Api.SendReq('/cart/' + userStore.my._id, 'DELETE', { orderId: order._id })
+      return Api.SendReq('/cart/' + this.userActive._id, 'DELETE', { orderId: order._id })
         .then((res) => {
           this.updateDataProduct(res)
 
@@ -680,11 +692,11 @@ export const useProducts = defineStore('Products', {
       // if (neworder && !neworder.idStorehouse)
       //   return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, 'Nessuno Store')
 
-      console.log('addToCart', 'userid=', userStore.my._id, neworder)
+      console.log('addToCart', 'userid=', this.userActive._id, neworder)
 
       let ris = null
 
-      ris = await Api.SendReq('/cart/' + userStore.my._id, 'POST', { order: neworder })
+      ris = await Api.SendReq('/cart/' + this.userActive._id, 'POST', { order: neworder })
         .then((res) => {
           if (res.data.cart) {  // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
             this.cart = res.data.cart
@@ -714,11 +726,11 @@ export const useProducts = defineStore('Products', {
       if (!globalStore.site.confpages.enableEcommerce)
         return null
 
-      // console.log('addSubQtyToItem', 'userid=', userStore.my._id, order)
+      // console.log('addSubQtyToItem', 'userid=', this.userActive._id, order)
 
       let ris = null
 
-      ris = await Api.SendReq('/cart/' + userStore.my._id, 'POST', { addqty, subqty, order })
+      ris = await Api.SendReq('/cart/' + this.userActive._id, 'POST', { addqty, subqty, order })
         .then((res: any) => {
           this.updateDataProduct(res)
 
@@ -749,7 +761,7 @@ export const useProducts = defineStore('Products', {
 
       let ris = null
 
-      ris = await Api.SendReq('/cart/' + userStore.my._id + '/createorderscart', 'POST', { cart_id, status, note, options: this.getOptions() })
+      ris = await Api.SendReq('/cart/' + this.userActive._id + '/createorderscart', 'POST', { cart_id, status, note, options: this.getOptions() })
         .then((res) => {
 
           if (res.data.status === shared_consts.OrderStatus.CHECKOUT_SENT) {
@@ -811,7 +823,7 @@ export const useProducts = defineStore('Products', {
 
       let ris = null
 
-      ris = await Api.SendReq('/cart/' + userStore.my._id + '/ordercartstatus', 'POST', { order_id, status, options: this.getOptions() })
+      ris = await Api.SendReq('/cart/' + this.userActive._id + '/ordercartstatus', 'POST', { order_id, status, options: this.getOptions() })
         .then((res) => {
 
           this.updateDataProduct(res)
@@ -1013,6 +1025,19 @@ export const useProducts = defineStore('Products', {
       return arrprod.length
     },
 
+    changeuserActive(valuerec: any) {
+      if (valuerec) {
+        console.log('valuerec', valuerec)
+        tools.setCookie(tools.COOK_SELCART, valuerec._id)
+        this.products = []
+        this.orders = []
+        this.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' }
+        
+        this.loadOrders()
+        this.loadProducts()
+      }
+    },
+
     async sendMailToTheBuyer(idOrdersCart: string, templemail_id: string, test: boolean) {
       return await Api.SendReq('/orders/sendmail', 'POST', { templemail_id, idOrdersCart, previewonly: tools.isDebug(), test })
         .then((res) => {
diff --git a/src/views/ecommerce/cash/cash.ts b/src/views/ecommerce/cash/cash.ts
index fd14e6f5..3aefa8ef 100755
--- a/src/views/ecommerce/cash/cash.ts
+++ b/src/views/ecommerce/cash/cash.ts
@@ -11,12 +11,13 @@ import { costanti } from '@costanti'
 
 import { shared_consts } from '@/common/shared_vuejs'
 import { CProductCard } from '@src/components/CProductCard'
+import { CSelectUserActive } from '@src/components/CSelectUserActive'
 import { IProduct } from '@src/model'
 
 
 export default defineComponent({
   name: 'cash',
-  components: { CProductCard },
+  components: { CProductCard, CSelectUserActive },
   props: {},
   setup() {
     const userStore = useUserStore()
diff --git a/src/views/ecommerce/cash/cash.vue b/src/views/ecommerce/cash/cash.vue
index 60349265..faee3995 100755
--- a/src/views/ecommerce/cash/cash.vue
+++ b/src/views/ecommerce/cash/cash.vue
@@ -6,6 +6,7 @@
     <div v-if="loadpage" class="panel">
       <div>
         <div class="text-center">
+          <CSelectUserActive></CSelectUserActive>
           <q-btn-toggle
             v-model="cosa"
             push
diff --git a/src/views/ecommerce/checkOut/checkOut.ts b/src/views/ecommerce/checkOut/checkOut.ts
index 8d8aa1bf..8227a323 100755
--- a/src/views/ecommerce/checkOut/checkOut.ts
+++ b/src/views/ecommerce/checkOut/checkOut.ts
@@ -22,6 +22,7 @@ export default defineComponent({
   props: {},
   setup() {
     const userStore = useUserStore()
+    const products = useProducts()
     const { t } = useI18n();
 
     function mounted() {
@@ -37,6 +38,7 @@ export default defineComponent({
       toolsext,
       shared_consts,
       t,
+      products,
     }
   }
 })
diff --git a/src/views/ecommerce/checkOut/checkOut.vue b/src/views/ecommerce/checkOut/checkOut.vue
index 2cfc5199..acd4ede6 100755
--- a/src/views/ecommerce/checkOut/checkOut.vue
+++ b/src/views/ecommerce/checkOut/checkOut.vue
@@ -1,6 +1,6 @@
 <template>
   <q-page>
-    <CTitleBanner :title="t('ecomm.carrello')"></CTitleBanner>
+    <CTitleBanner :title="t('ecomm.carrello_di', {user: products.userActive.username})"></CTitleBanner>
     <CCart>
     </CCart>
   </q-page>
diff --git a/src/views/ecommerce/productsList/productsList.ts b/src/views/ecommerce/productsList/productsList.ts
index 52fec017..53611251 100755
--- a/src/views/ecommerce/productsList/productsList.ts
+++ b/src/views/ecommerce/productsList/productsList.ts
@@ -11,12 +11,13 @@ import { costanti } from '@costanti'
 
 import { shared_consts } from '@/common/shared_vuejs'
 import { CProductCard } from '@src/components/CProductCard'
+import { CSelectUserActive } from '@src/components/CSelectUserActive'
 import { IProduct } from '@src/model'
 
 
 export default defineComponent({
   name: 'ProductsList',
-  components: { CProductCard },
+  components: { CProductCard, CSelectUserActive },
   props: {},
   setup() {
     const userStore = useUserStore()
diff --git a/src/views/ecommerce/productsList/productsList.vue b/src/views/ecommerce/productsList/productsList.vue
index f7526f60..a6b844fe 100755
--- a/src/views/ecommerce/productsList/productsList.vue
+++ b/src/views/ecommerce/productsList/productsList.vue
@@ -5,6 +5,7 @@
     </div>
     <div v-if="loadpage" class="panel">
       <div>
+        <CSelectUserActive></CSelectUserActive>
         <div class="text-center">
           <q-btn-toggle
             v-model="cosa"