From a82e07b4ce82eaa1d1635f45c21bdafdc3b3b184 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Thu, 15 Feb 2024 18:59:13 +0100
Subject: [PATCH] - corretto cancellazione ordine

---
 src/components/CSingleCart/CSingleCart.vue  | 19 ++++++++++++++-----
 src/store/Products.ts                       | 13 ++++++++++---
 src/views/admin/dbop/dbop.vue               |  8 ++++++++
 src/views/ecommerce/orderInfo/orderInfo.ts  | 21 +++++++++++++++++++++
 src/views/ecommerce/orderInfo/orderInfo.vue |  5 +++++
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/components/CSingleCart/CSingleCart.vue b/src/components/CSingleCart/CSingleCart.vue
index ec6a8b98..eaaca3f2 100755
--- a/src/components/CSingleCart/CSingleCart.vue
+++ b/src/components/CSingleCart/CSingleCart.vue
@@ -3,7 +3,6 @@
     v-if="order && order.product && order.product.productInfo"
     class="q-pa-xs q-gutter-xs"
   >
-  order: {{order}}
     <div v-if="order.product">
       <q-item>
         <q-item-section top thumbnail class="q-ml-none">
@@ -26,7 +25,7 @@
             </div>
             {{ order.product.productInfo.name }}
           </q-item-label>
-          
+
           <q-item-label caption>
             <div
               class="text-black text-h8"
@@ -65,7 +64,16 @@
             </div>
             <div class="row q-mb-xs no-wrap items-center centeritems">
               <q-btn
-                v-if="showall && !nomodif"
+                v-if="showall && !nomodif && products.CanDeleteIfSub(order)"
+                icon="fas fa-trash"
+                color="negative"
+                round
+                size="xs"
+                @click="removeFromCard"
+              >
+              </q-btn>
+              <q-btn
+                v-else-if="showall && !nomodif"
                 :disable="!products.enableSubQty(order)"
                 size="sm"
                 icon="fas fa-cart-arrow-down"
@@ -123,7 +131,7 @@
                     updateOrder({
                       quantitypreordered: order.quantitypreordered,
                       quantity: order.quantity,
-                      price: order.price,                    
+                      price: order.price,
                     })
                   "
                 >
@@ -167,7 +175,8 @@
               <span
                 v-if="
                   tools.isManager() &&
-                  order.TotalPriceProduct.toFixed(2) !== order.TotalPriceProductCalc.toFixed(2)
+                  order.TotalPriceProduct.toFixed(2) !==
+                    order.TotalPriceProductCalc.toFixed(2)
                 "
                 :class="isApplicatoSconto() ? 'ordine_scontato_nuovo' : ''"
               >
diff --git a/src/store/Products.ts b/src/store/Products.ts
index 359a1cd9..564104b3 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -197,7 +197,7 @@ export const useProducts = defineStore('Products', {
 
     getOrdersAllCart: (state: IProductsState) => (idGasordine: string): IOrderCart[] => {
       return state.orders.filter((rec: IOrderCart) => {
-        if ((idGasordine && !rec.items?.some(item => item.order.idGasordine === idGasordine))) {
+        if ((idGasordine && !rec.items?.some(item => item.order && item.order.idGasordine === idGasordine))) {
           return false; // Skip records not matching gasordine condition
         }
         return true
@@ -210,11 +210,11 @@ export const useProducts = defineStore('Products', {
 
     getOrdersCart: (state: IProductsState) => (tipoord: number, hasGasordine: any, idGasordine: string): IOrderCart[] | undefined => {
       return state.orders.filter((rec: IOrderCart) => {
-        if (idGasordine && !rec.items?.some(item => item.order.idGasordine === idGasordine)) {
+        if (idGasordine && !rec.items?.some(item => item.order && item.order.idGasordine === idGasordine)) {
           return false; // Skip records not matching gasordine condition
         }
 
-        if (hasGasordine && !rec.items?.some(item => item.order.idGasordine)) {
+        if (hasGasordine && !rec.items?.some(item => item.order && item.order.idGasordine)) {
           return false; // Skip records not matching gasordine condition
         }
 
@@ -1013,6 +1013,13 @@ export const useProducts = defineStore('Products', {
       return qty ? qty > 0 : false
     },
 
+    CanDeleteIfSub(myorder: IOrder): boolean {
+      let qty = myorder.quantity + myorder.quantitypreordered
+
+      qty = qty - this.qtaNextSub(myorder, myorder.product!)
+      return qty === 0
+    },
+
     enableAddQty(myorder: IOrder, myproduct: IProduct): boolean {
       const globalStore = useGlobalStore()
       if (globalStore.site.ecomm && globalStore.site.ecomm.enablePreOrders) {
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index bf5f47e6..61fca5e8 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -650,6 +650,14 @@
     ></q-btn>
     <br />
   </div>
+  <div class="row">
+    <q-btn
+      label="Remove DeletedOrders InOrderscart"
+      color="primary"
+      @click="EseguiFunz('RemoveDeletedOrdersInOrderscart')"
+    ></q-btn>
+    <br />
+  </div>
 </template>
 <script lang="ts" src="./dbop.ts">
 </script>
diff --git a/src/views/ecommerce/orderInfo/orderInfo.ts b/src/views/ecommerce/orderInfo/orderInfo.ts
index cb43c29d..dc1de964 100755
--- a/src/views/ecommerce/orderInfo/orderInfo.ts
+++ b/src/views/ecommerce/orderInfo/orderInfo.ts
@@ -55,6 +55,14 @@ export default defineComponent({
     const statusnow = ref(0)
     const arrnumstatus = ref(<any[]>[])
     const columns = ref(<any>[
+      {
+        name: 'ind',
+        required: true,
+        align: 'left',
+        label: 'Ind',
+        field: 'ind',
+        sortable: true
+      },
       {
         name: 'apri',
         align: 'center',
@@ -104,6 +112,14 @@ export default defineComponent({
     ])
 
     const columns_Admin = ref(<any>[
+      {
+        name: 'ind',
+        required: true,
+        align: 'left',
+        label: 'Ind',
+        field: 'ind',
+        sortable: true
+      },
       {
         name: 'apri',
         align: 'center',
@@ -220,6 +236,11 @@ export default defineComponent({
           rowsWithTotals.push(totals);
         }
 
+        // Supponendo che rowsWithTotals sia il tuo array di record
+        rowsWithTotals.forEach((record: any, index: number) => {
+          record.ind = index;
+        });
+
         return rowsWithTotals;
       } else {
         return []
diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue
index 5ebc6ae7..76f573f9 100755
--- a/src/views/ecommerce/orderInfo/orderInfo.vue
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -198,6 +198,11 @@
           </template>
           <template v-else v-slot:body="props">
             <q-tr :props="props">
+              <q-td key="ind" :props="props">
+                <div class="q-pa-sm">
+                  {{index}}
+                </div>
+              </q-td>
               <q-td key="apri" :props="props">
                 <div class="q-pa-sm">
                   <q-btn