From 1bafdf1b858ff097859770e4db8347ad2e10ee41 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Sun, 20 Oct 2024 15:01:37 +0200
Subject: [PATCH 1/7] fix: refs #6389 ipt

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 4 +++-
 src/pages/Monitor/Ticket/MonitorTickets.vue      | 6 ++++++
 src/pages/Monitor/locale/en.yml                  | 1 +
 src/pages/Monitor/locale/es.yml                  | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 57248d580..7a5d296a5 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -43,6 +43,7 @@ const getLocale = (label) => {
                 (groupedStates = data.map((x) => Object.assign(x, { code: t(x.code) })))
         "
     />
+    <FetchData url="departments" auto-load />
     <VnFilterPanel
         :data-key="dataKey"
         :search-button="true"
@@ -146,6 +147,7 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
+
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -258,7 +260,7 @@ en:
     ON_PREVIOUS: On previous
     PACKED: Packed
     No one: No one
-    
+
 es:
     params:
         orderFk: Id cesta
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index d24230c64..b17f50327 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -203,6 +203,12 @@ const columns = computed(() => [
             },
         },
     },
+    {
+        label: t('salesTicketsTable.payMethod'),
+        name: 'payMethod',
+        align: 'left',
+        columnFilter: false,
+    },
     {
         label: t('salesTicketsTable.total'),
         name: 'totalWithVat',
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..9a7317469 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -42,6 +42,7 @@ salesTicketsTable:
     preview: Preview
     total: Total
     preparation: Preparation
+    payMethod: Pay method
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..60760b70d 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -42,6 +42,7 @@ salesTicketsTable:
     preview: Vista previa
     total: Total
     preparation: Preparación
+    payMethod: Método de pago
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias

From daf57c9b2bfb4d8001a520cd0bec7be23efacef5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 23 Oct 2024 12:20:53 +0200
Subject: [PATCH 2/7] fix: refs #6389 front filters

---
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 13 +++++++++++-
 src/pages/Monitor/Ticket/MonitorTickets.vue   | 21 +++++++++++++++++++
 src/pages/Monitor/locale/en.yml               |  1 +
 src/pages/Monitor/locale/es.yml               |  1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 7a5d296a5..ae5dc7a56 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -43,7 +43,6 @@ const getLocale = (label) => {
                 (groupedStates = data.map((x) => Object.assign(x, { code: t(x.code) })))
         "
     />
-    <FetchData url="departments" auto-load />
     <VnFilterPanel
         :data-key="dataKey"
         :search-button="true"
@@ -211,6 +210,18 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        outlined
+                        dense
+                        rounded
+                        :label="t('globals.params.departmentFk')"
+                        v-model="params.department"
+                        url="Departments"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index b17f50327..0c4ef1358 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -48,6 +48,7 @@ function exprBuilder(param, value) {
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
+        case 'departmentId':
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }
@@ -222,6 +223,26 @@ const columns = computed(() => [
             },
         },
     },
+    {
+        label: t('salesTicketsTable.department'),
+        name: 'department',
+        align: 'left',
+        component: 'select',
+        attrs: {
+            url: 'Departments',
+            optionValue: 'name',
+            optionLabel: 'name',
+        },
+        columnFilter: {
+            component: 'select',
+            url: 'Departments',
+            attrs: {
+                optionValue: 'name',
+                optionLabel: 'name',
+                dense: true,
+            },
+        },
+    },
     {
         align: 'right',
         name: 'tableActions',
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 9a7317469..083c24e4e 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -43,6 +43,7 @@ salesTicketsTable:
     total: Total
     preparation: Preparation
     payMethod: Pay method
+    department: Department
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 60760b70d..a3037d75b 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -43,6 +43,7 @@ salesTicketsTable:
     total: Total
     preparation: Preparación
     payMethod: Método de pago
+    department: Departamento
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias

From e8fd3c0a8f2bcb057c41396e211f099be62b7537 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 23 Oct 2024 14:58:03 +0200
Subject: [PATCH 3/7] fix: refs #6389 fix front, filters, itp

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 12 +++++
 src/pages/Monitor/Ticket/MonitorTickets.vue   | 48 ++++++++++++++++---
 src/pages/Monitor/locale/en.yml               |  1 +
 src/pages/Monitor/locale/es.yml               |  1 +
 6 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fa0a14f45..8fd495e68 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -308,6 +308,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+        packing: ITP
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
 errors:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 5dfe90e98..f777089a6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -312,6 +312,7 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+        packing: ITP
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
 errors:
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index ae5dc7a56..f952850d2 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -222,6 +222,18 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        outlined
+                        dense
+                        rounded
+                        :label="t('globals.params.packing')"
+                        v-model="params.packing"
+                        url="ItemPackingTypes"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 0c4ef1358..dbf2465c1 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -23,6 +23,8 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
+const DepartmentOpts = ref([]);
+const ItemPackingTypeOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
 const from = Date.vnNew();
@@ -48,7 +50,10 @@ function exprBuilder(param, value) {
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
-        case 'departmentId':
+        case 'department':
+            return { 'd.name': value };
+        case 'packing':
+            return { ItemPackingTypeFk: value };
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }
@@ -135,6 +140,7 @@ const columns = computed(() => [
         align: 'left',
         format: (row) => row.practicalHour,
         columnFilter: false,
+        dense: true,
     },
     {
         label: t('salesTicketsTable.preparation'),
@@ -227,22 +233,32 @@ const columns = computed(() => [
         label: t('salesTicketsTable.department'),
         name: 'department',
         align: 'left',
-        component: 'select',
-        attrs: {
-            url: 'Departments',
-            optionValue: 'name',
-            optionLabel: 'name',
-        },
         columnFilter: {
             component: 'select',
             url: 'Departments',
             attrs: {
+                options: DepartmentOpts.value,
                 optionValue: 'name',
                 optionLabel: 'name',
                 dense: true,
             },
         },
     },
+    {
+        label: t('salesTicketsTable.packing'),
+        name: 'packing',
+        align: 'left',
+        columnFilter: {
+            component: 'select',
+            url: 'ItemPackingTypes',
+            attrs: {
+                options: ItemPackingTypeOpts.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -349,6 +365,24 @@ const openTab = (id) =>
         auto-load
         @on-fetch="(data) => (zoneOpts = data)"
     />
+    <FetchData
+        url="ItemPackingTypes"
+        :filter="{
+            fields: ['code'],
+            order: 'code ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (ItemPackingTypeOpts = data)"
+    />
+    <FetchData
+        url="Departments"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (DepartmentOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 083c24e4e..309bfadad 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -44,6 +44,7 @@ salesTicketsTable:
     preparation: Preparation
     payMethod: Pay method
     department: Department
+    packing: ITP
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index a3037d75b..6889c5db1 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -44,6 +44,7 @@ salesTicketsTable:
     preparation: Preparación
     payMethod: Método de pago
     department: Departamento
+    packing: ITP
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias

From 8dd2c94b3793e2e44234ed5a4294ec00c6ca2034 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 28 Oct 2024 09:01:00 +0100
Subject: [PATCH 4/7] fix: refs #6389 packing

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index dbf2465c1..07c4635e4 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -53,7 +53,7 @@ function exprBuilder(param, value) {
         case 'department':
             return { 'd.name': value };
         case 'packing':
-            return { ItemPackingTypeFk: value };
+            return { packing: value };
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }

From af7f7aa8f30cb9ede442b78cc81e3bcf2dd18051 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 19 Nov 2024 10:54:51 +0100
Subject: [PATCH 5/7] fix: refs #6389 fix filter trad

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 2 ++
 src/pages/Monitor/Ticket/MonitorTickets.vue      | 1 +
 src/pages/Monitor/locale/en.yml                  | 6 +++---
 src/pages/Monitor/locale/es.yml                  | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index f952850d2..7546f8f91 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -231,6 +231,8 @@ const getLocale = (label) => {
                         :label="t('globals.params.packing')"
                         v-model="params.packing"
                         url="ItemPackingTypes"
+                        option-label="code"
+                        option-value="code"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 090a99394..8c1478bb1 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -194,6 +194,7 @@ const columns = computed(() => [
             'false-value': 0,
             'true-value': 1,
         },
+        component: false,
     },
     {
         label: t('salesTicketsTable.zone'),
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 25369b4fe..d8c7672d6 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -27,8 +27,8 @@ salesTicketsTable:
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier
-    theoretical: Theoretical
-    practical: Practical
+    theoretical: H.Theor
+    practical: H.Prac
     province: Province
     state: State
     isFragile: Is fragile
@@ -36,7 +36,7 @@ salesTicketsTable:
     goToLines: Go to lines
     preview: Preview
     total: Total
-    preparation: Preparation
+    preparation: H.Prep
     payMethod: Pay method
     department: Department
     packing: ITP
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index ce7f516ad..e21262505 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -27,8 +27,8 @@ salesTicketsTable:
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador
-    theoretical: Teórica
-    practical: Práctica
+    theoretical: H.Teór
+    practical: H.Prác
     province: Provincia
     state: Estado
     isFragile: Es frágil
@@ -36,7 +36,7 @@ salesTicketsTable:
     goToLines: Ir a líneas
     preview: Vista previa
     total: Total
-    preparation: Preparación
+    preparation: H.Prep
     payMethod: Método de pago
     department: Departamento
     packing: ITP

From 0ecc103fc2c9e243cccaed791262153c253cb436 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Dec 2024 09:59:05 +0100
Subject: [PATCH 6/7] fix: refs #6389 front

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 7153791f4..31954ae48 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -57,7 +57,7 @@ function exprBuilder(param, value) {
         case 'department':
             return { 'd.name': value };
         case 'packing':
-            return { packing: value };
+            return { 'i.itemPackingTypeFk': { like: `%${value}%` } };
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }

From 3d666338ce01ede85942c56994a004095e3b0867 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Dec 2024 11:50:37 +0100
Subject: [PATCH 7/7] fix: refs #6389 front add packing filter

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 31954ae48..3f73c8360 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -56,8 +56,6 @@ function exprBuilder(param, value) {
         case 'zoneFk':
         case 'department':
             return { 'd.name': value };
-        case 'packing':
-            return { 'i.itemPackingTypeFk': { like: `%${value}%` } };
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }
@@ -400,7 +398,7 @@ const openTab = (id) =>
         auto-load
         :row-click="({ id }) => openTab(id)"
         :disable-option="{ card: true }"
-        :user-params="{ from, to, scopeDays: 0 }"
+        :user-params="{ from, to, scopeDays: 0, packing }"
     >
         <template #top-left>
             <QBtn