From 2891e1363a9b71b7c0d263583883c6c715e025ed Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:36:20 +0100
Subject: [PATCH 1/6] feat: #6943 CustomerDescriptor actions

---
 .../Customer/Card/CustomerDescriptor.vue      | 10 ++++-
 .../Customer/Card/CustomerDescriptorMenu.vue  | 42 +++++++++++++------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 43103bd68..15683dc48 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -37,6 +37,9 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value.credit ? 'negative' : 'primary';
+});
 </script>
 
 <template>
@@ -107,11 +110,12 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
+
                 <QIcon
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    color="primary"
+                    :color="debtWarning"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -168,6 +172,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
+
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -179,6 +184,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
+
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -215,6 +221,8 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
+    New order: Nuevo pedido
+    New ticket: Nuevo ticket
     Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 178bba7db..5ef217a31 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -8,9 +8,6 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
-import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
-import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -44,13 +41,38 @@ const sendSms = async (payload) => {
     }
 };
 
-const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
-    ticketCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientId: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('ticket', query);
 };
-const orderCreateFormDialog = ref(null);
 const openOrderCreateForm = () => {
-    orderCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientFk: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('order', query);
+};
+
+const openWindow = (type, { createForm, table }) => {
+    window.open(
+        `/#/${type}/list?createForm=${JSON.stringify(createForm)}&table=${JSON.stringify(
+            table
+        )}`,
+        '_blank'
+    );
 };
 </script>
 
@@ -58,17 +80,11 @@ const openOrderCreateForm = () => {
     <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createTicket') }}
-            <QDialog ref="ticketCreateFormDialog">
-                <TicketCreateDialog />
-            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable @click="openOrderCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createOrder') }}
-            <QDialog ref="orderCreateFormDialog">
-                <OrderCreateDialog :client-fk="customer.id" />
-            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>

From 8e52bd0688ab447211d9d2558c5b2337e4a399a8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:37:27 +0100
Subject: [PATCH 2/6] perf: #6943 improve OrderList

---
 src/pages/Order/OrderList.vue | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 6b6b41828..72c9eb7ec 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
@@ -142,8 +141,13 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-async function fetchClientAddress(id, formData) {
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
     });
@@ -170,13 +174,6 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
     <OrderSearchbar />

From 87ba74bcfc419a3e9722cea5aa473fdecc2b4c47 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:39:43 +0100
Subject: [PATCH 3/6] perf: #6943 Create ticket from client

---
 src/pages/Ticket/Card/TicketSummary.vue |  5 --
 src/pages/Ticket/TicketList.vue         | 69 +++++++++++++++++--------
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5fb99b849..61751357c 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -19,7 +19,6 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
@@ -87,10 +86,6 @@ async function changeState(value) {
 function toTicketUrl(section) {
     return '#/ticket/' + entityId.value + '/' + section;
 }
-function isOnTicketCard() {
-    const currentPath = route.path;
-    return currentPath.startsWith('/ticket');
-}
 </script>
 
 <template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..2cad174ae 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -24,6 +24,8 @@ import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
+const router = useRouter();
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -40,16 +42,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
     from: null,
     to: null,
 };
-// Método para inicializar las variables desde la query string
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+    if (!route.query.createForm) return;
+    onClientSelected(JSON.parse(route.query.createForm));
+});
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
     from.value = query.from || from.toISOString();
     to.value = query.to || to.toISOString();
     Object.assign(userParams, { from, to });
@@ -206,13 +210,19 @@ const columns = computed(() => [
             {
                 title: t('ticketList.summary'),
                 icon: 'preview',
-                isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row, evt) => {
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
             },
         ],
     },
 ]);
-
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
@@ -268,9 +278,8 @@ const fetchAddresses = async (formData) => {
         if (!formData.clientId) return;
 
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id'],
-            where: { isActive: true },
-            order: 'nickname ASC',
+            fields: ['nickname', 'street', 'city', 'id', 'isActive'],
+            order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
         };
         const params = { filter: JSON.stringify(filter) };
         const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -302,11 +311,6 @@ const getDateColor = (date) => {
     if (comparation < 0) return 'bg-success';
 };
 
-onMounted(() => {
-    initializeFromQuery();
-    stateStore.rightDrawer = true;
-});
-
 async function makeInvoice(ticket) {
     const ticketsIds = ticket.map((item) => item.id);
     const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
@@ -472,7 +476,7 @@ function setReference(data) {
             urlCreate: 'Tickets/new',
             title: t('ticketList.createTicket'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
         }"
         default-mode="table"
         :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@@ -616,6 +620,7 @@ function setReference(data) {
                     option-value="id"
                     option-label="name"
                     hide-selected
+                    required
                     @update:model-value="(client) => onClientSelected(data)"
                     :sort-by="'id ASC'"
                 >
@@ -635,7 +640,7 @@ function setReference(data) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Addresses"
+                    required
                     :label="t('ticket.create.address')"
                     v-model="data.addressId"
                     :options="addressesOptions"
@@ -646,7 +651,22 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
+                        <QItem
+                            v-bind="scope.itemProps"
+                            :class="{ disabled: !scope.opt.isActive }"
+                        >
+                            <QItemSection style="min-width: min-content" avatar>
+                                <QIcon
+                                    v-if="
+                                        scope.opt.isActive &&
+                                        selectedClient?.defaultAddressFk === scope.opt.id
+                                    "
+                                    size="sm"
+                                    color="grey"
+                                    name="star"
+                                    class="fill-icon"
+                                />
+                            </QItemSection>
                             <QItemSection>
                                 <QItemLabel>
                                     {{ scope.opt.nickname }}
@@ -680,6 +700,7 @@ function setReference(data) {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        required
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
                 </div>
@@ -693,7 +714,6 @@ function setReference(data) {
                         option-value="agencyModeFk"
                         option-label="agencyMode"
                         hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                     />
                 </div>
             </VnRow>
@@ -829,7 +849,14 @@ function setReference(data) {
         </QTooltip>
     </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
     Search ticket: Buscar ticket

From bdd36f6ba17bc7a8ef261a5d0e99abf4d0ddd62e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:44:41 +0100
Subject: [PATCH 4/6] Merge branch 'master' into
 hotfix-customerDescriptor_actions

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 955383a35..2b7665ba1 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -110,7 +110,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
-
                 <QIcon
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
@@ -172,7 +171,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
-
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -184,7 +182,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -221,8 +218,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
     Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago

From 4d8432feb5ae21be83a110414e741f2713135768 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:46:55 +0100
Subject: [PATCH 5/6] revert: #6943 address star feature

---
 src/pages/Ticket/TicketList.vue | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2cad174ae..d51ec1277 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -278,8 +278,9 @@ const fetchAddresses = async (formData) => {
         if (!formData.clientId) return;
 
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-            order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
         };
         const params = { filter: JSON.stringify(filter) };
         const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -651,22 +652,7 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            :class="{ disabled: !scope.opt.isActive }"
-                        >
-                            <QItemSection style="min-width: min-content" avatar>
-                                <QIcon
-                                    v-if="
-                                        scope.opt.isActive &&
-                                        selectedClient?.defaultAddressFk === scope.opt.id
-                                    "
-                                    size="sm"
-                                    color="grey"
-                                    name="star"
-                                    class="fill-icon"
-                                />
-                            </QItemSection>
+                        <QItem v-bind="scope.itemProps">
                             <QItemSection>
                                 <QItemLabel>
                                     {{ scope.opt.nickname }}

From e64ea2db199c250af6e2cd327b565e69ccfc9fc0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:48:19 +0100
Subject: [PATCH 6/6] feat: #6943 CustomerList salesPerson

---
 src/pages/Customer/CustomerList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..815ec57fa 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -68,7 +68,6 @@ const columns = computed(() => [
             fields: ['id', 'name'],
             where: { role: 'salesPerson' },
             optionFilter: 'firstName',
-            useLike: false,
         },
         create: false,
         columnField: {
@@ -429,9 +428,10 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'code']"
                 sort-by="nickname ASC"
-                :use-like="false"
+                option-label="nickname"
+                option-value="id"
                 emit-value
                 auto-load
             >