From c1d60a726094492f4d871e486aa0cdd8e3517e9f Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Mon, 18 Dec 2023 12:11:22 +0100
Subject: [PATCH] Carrello con scontistica aggiornata

---
 src/components/CProductCard/CProductCard.ts |  3 +--
 src/components/CSingleCart/CSingleCart.scss |  9 +++++++++
 src/components/CSingleCart/CSingleCart.ts   |  4 ++--
 src/components/CSingleCart/CSingleCart.vue  |  5 +++--
 src/mixins/mixin-users.ts                   |  3 +--
 src/statics/lang/it.js                      |  4 ++++
 src/store/Products.ts                       |  8 +++++---
 src/store/UserStore.ts                      | 18 ++++++++++++++++--
 8 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts
index 74009690..74e5f25a 100755
--- a/src/components/CProductCard/CProductCard.ts
+++ b/src/components/CProductCard/CProductCard.ts
@@ -87,7 +87,6 @@ export default defineComponent({
         return false
       }
 
-
       products.addToCart({ product: myproduct.value, order: myorder, addqty: add }).then((ris) => {
         let strprod = t('ecomm.prodotto')
 
@@ -226,7 +225,7 @@ export default defineComponent({
     }
 
     function enableAddQty() {
-      if (site.value.ecomm!.enablePreOrders) {
+      if (site.value.ecomm && site.value.ecomm.enablePreOrders) {
         return true
       } else {
         return getQtyAvailable() > 0
diff --git a/src/components/CSingleCart/CSingleCart.scss b/src/components/CSingleCart/CSingleCart.scss
index 4f761b1c..109eedf1 100755
--- a/src/components/CSingleCart/CSingleCart.scss
+++ b/src/components/CSingleCart/CSingleCart.scss
@@ -18,4 +18,13 @@
 .ordine_scontato_barrato{
   text-decoration: line-through;
   color: gray;
+}
+.ordine_scontato_nuovo{
+  font-size: 1.1rem;
+  font-weight: bold;
+}
+.ordine_scritta_sconto{
+  font-style: italic;
+  color: green;
+  font-weight: bold;
 }
\ No newline at end of file
diff --git a/src/components/CSingleCart/CSingleCart.ts b/src/components/CSingleCart/CSingleCart.ts
index d0886fbe..cd24df93 100755
--- a/src/components/CSingleCart/CSingleCart.ts
+++ b/src/components/CSingleCart/CSingleCart.ts
@@ -62,8 +62,8 @@ export default defineComponent({
     }
 
     function isApplicatoSconto() {
-      const totalipotetico = order.value.price! * order.value.quantity
-      if (totalipotetico > order.value.TotalPriceProduct!) {
+      const totalipotetico = order.value.price * order.value.quantity
+      if (totalipotetico > order.value.TotalPriceProduct) {
         return true
       }
       return false
diff --git a/src/components/CSingleCart/CSingleCart.vue b/src/components/CSingleCart/CSingleCart.vue
index 92081d2a..218b0c24 100755
--- a/src/components/CSingleCart/CSingleCart.vue
+++ b/src/components/CSingleCart/CSingleCart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="q-pa-xs q-gutter-xs">
+  <div v-if="order && order.product" class="q-pa-xs q-gutter-xs">
 
     <div v-if="order.product" class="row items-center justify-evenly no-wrap">
       <div class="col-2 text-h6 ellipsis">
@@ -31,7 +31,8 @@
         <div v-if="isApplicatoSconto()">
           <span class="ordine_scontato_barrato">€&nbsp; {{ (order.price * order.quantity).toFixed(2) }}</span>
         </div>
-        €&nbsp;{{ order.TotalPriceProduct ? order.TotalPriceProduct.toFixed(2) : 0 }}
+        <span v-if="isApplicatoSconto()" class="ordine_scritta_sconto">{{ $t('ecomm.sconto_applicato') }}</span>
+        <span :class="isApplicatoSconto() ? 'ordine_scontato_nuovo' : ''">€&nbsp;{{ order.TotalPriceProduct ? order.TotalPriceProduct.toFixed(2) : 0 }}</span>
       </div>
       <div class="col-1">
         <q-btn v-if="!nomodif" icon="fas fa-times" color="negative" round size="xs" @click="removeFromCard">
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index bdf36765..fc52b6f9 100755
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -45,12 +45,11 @@ export default function () {
     return ''
   }
 
-  function getnumItemsCart(): any {
+  function getnumItemsCart(): number {
     const products = useProducts()
     const arrcart = products.cart
     if (!!arrcart) {
       if (!!arrcart.items) {
-        // @ts-ignore
         const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity, 0)
         return total
       }
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index c5593a46..f8730701 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -256,6 +256,9 @@ const msg_it = {
     },
     db: {
       recupdated: 'Record Aggiornato',
+      records_imported: '{num} Record Importati',
+      records_updated: '{num} Record Aggiornati',
+      records_errors: '{num} Record con Errori',
       recfailed: 'Errore durante aggiornamento Record',
       reccanceled: 'Annullato Aggiornamento. Ripristinato valore precendente',
       deleterecord: 'Elimina Record',
@@ -1661,6 +1664,7 @@ const msg_it = {
       carrello: 'Carrello',
       settings: 'Impostazioni',
       qta_in_attesa: '(Ordinati In attesa {qty})',
+      sconto_applicato: 'Sconto!',
     },
   },
 
diff --git a/src/store/Products.ts b/src/store/Products.ts
index 6a191b58..0c4c6e4b 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -415,11 +415,13 @@ export const useProducts = defineStore('Products', {
         if (order.quantity === 0)
           order.quantity = 1
 
-        neworder = this.createOrderByProduct(product, order)
+        if (order.idStorehouse) {
+          neworder = this.createOrderByProduct(product, order)
+        }
       }
 
-      if (neworder && !neworder.idStorehouse)
-        return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, 'Nessuno Store')
+      // 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)
 
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 9f28b25a..5ef2fd23 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1754,9 +1754,23 @@ export const useUserStore = defineStore('UserStore', {
 
     async importToServerCmd($q: any, t: any, cmd: number, data: any) {
       return Api.SendReq('/admin/import', 'POST', { cmd, data })
-        .then((res) => {
+        .then((res: any) => {
           if (res) {
-            tools.showPositiveNotif($q, t('db.recupdated'))
+            let msg = ''
+            
+            if (res.data.imported) {
+              msg += ' ' + t('db.records_imported', {num: res.data.imported})
+            }
+            if (res.data.errors) {
+              msg += ' ' + t('db.records_errors', {num: res.data.errors})
+            }
+            if (res.data.updated) {
+              msg += ' ' + t('db.records_updated', {num: res.data.updated})
+            }
+            if (!msg) {
+              msg = t('db.recupdated')
+            }
+            tools.showPositiveNotif($q, msg)
           }
         }).catch((error) => {
           tools.showNegativeNotif($q, t('db.recfailed'))