Merge branch 'dev' into 8316-itemCardWithVnCardBeta

.gitignore

@@ -29,5 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/tests/cypress/videos
+/test/cypress/videos
-/tests/cypress/screenshots
+/test/cypress/screenshots

src/components/ui/CatalogItem.vue

@@ -41,7 +41,7 @@ const card = toRef(props, 'item');
                 </div>
             </div>
             <div class="content">
-                <span class="link">
+                <span class="link" @click.stop>
                     {{ card.name }}
                     <ItemDescriptorProxy :id="card.id" />
                 </span>

src/composables/useArrayData.js

@@ -170,10 +170,9 @@ export function useArrayData(key, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order || [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
 
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        let index = getOrderIndex(order, field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -190,16 +189,23 @@ export function useArrayData(key, userOptions) {
     }
 
     async function deleteOrder(field) {
-        let order = store.order ?? [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
+        const index = getOrderIndex(order, field);
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
+    function getOrderIndex(order, field) {
+        return order.findIndex((o) => o.split(' ')[0] === field);
+    }
+
+    function toArray(str = []) {
+        if (Array.isArray(str)) return str;
+        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -290,8 +296,7 @@ export function useArrayData(key, userOptions) {
 
         Object.assign(params, store.userParams);
         if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order) params.filter.order = toArray(store.order);
-        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
         return { filter, params, limit: filter.limit };

src/css/app.scss

@@ -312,11 +312,11 @@ input::-webkit-inner-spin-button {
 }
 
 .q-item > .q-item__section:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 
 .row > .column:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 .q-field__inner {
     .q-field__control {

src/i18n/locale/en.yml

@@ -5,6 +5,7 @@ globals:
     quantity: Quantity
     language: Language
     entity: Entity
+    preview: Preview
     user: User
     details: Details
     collapseMenu: Collapse lateral menu

src/i18n/locale/es.yml

@@ -5,6 +5,7 @@ globals:
     language: Idioma
     quantity: Cantidad
     entity: Entidad
+    preview: Vista previa
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral

src/pages/Customer/Card/CustomerConsumption.vue

@@ -153,6 +153,7 @@ const updateDateParams = (value, params) => {
         data-key="CustomerConsumption"
         url="Clients/consumption"
         :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"        
+        :filter="{ where: { clientFk: route.params.id } }"
         :columns="columns"
         search-url="consumption"
         :user-params="userParams"

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -187,14 +187,18 @@ const debtWarning = computed(() => {
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountSummary',
+                        name: 'OrderList',
-                        params: { id: entity.id },
+                        query: {
+                            createForm: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
-                    icon="face"
+                    icon="vn:basketadd"
                     color="primary"
                 >
-                    <QTooltip>{{ t('Go to user') }}</QTooltip>
+                    <QTooltip>{{ t('globals.pageTitles.createOrder') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="entity.supplier"
@@ -218,14 +222,9 @@ en:
     unpaidDated: 'Date {dated}'
     unpaidAmount: 'Amount {amount}'
 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
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'
     unpaidAmount: 'Importe {amount}'

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -51,7 +51,6 @@ const openCreateForm = (type) => {
     };
     const clientFk = {
         ticket: 'clientId',
-        order: 'clientFk',
     };
     const key = clientFk[type];
     if (!key) return;
@@ -70,11 +69,6 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -214,7 +214,7 @@ const toCustomerSamples = () => {
             <template #custom-buttons>
                 <QBtn
                     :disabled="isLoading || !sampleType?.hasPreview"
-                    :label="t('Preview')"
+                    :label="t('globals.preview')"
                     :loading="isLoading"
                     @click.stop="getPreview()"
                     color="primary"
@@ -353,7 +353,6 @@ es:
     Its only used when sample is sent: Se utiliza únicamente cuando se envía la plantilla
     To who should the recipient replay?: ¿A quien debería responder el destinatario?
     Edit address: Editar dirección
-    Preview: Vista previa
     Email cannot be blank: Debes introducir un email
     Choose a sample: Selecciona una plantilla
     Choose a company: Selecciona una empresa

src/pages/Entry/Card/EntryDescriptor.vue

@@ -147,7 +147,7 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Go to module index: Ir al índice del modulo
+    Show entry report: Ver informe del pedido
     Inventory entry: Es inventario
     Virtual entry: Es una redada
 </i18n>

src/pages/Item/ItemList.vue

@@ -506,5 +506,4 @@ es:
     New item: Nuevo artículo
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
-    Preview: Vista previa
 </i18n>

src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue

@@ -63,7 +63,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -290,7 +290,7 @@ const columns = computed(() => [
                 },
             },
             {
-                title: t('salesTicketsTable.preview'),
+                title: t('globals.preview'),
                 icon: 'preview',
                 color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),

src/pages/Monitor/locale/en.yml

@@ -33,7 +33,6 @@ salesTicketsTable:
     isFragile: Is fragile
     zone: Zone
     goToLines: Go to lines
-    preview: Preview
     total: Total
     preparation: H.Prep
     payMethod: Pay method

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -115,6 +115,7 @@ const removeTagGroupParam = (params, search, valIndex) => {
     } else {
         params.tagGroups.splice(valIndex, 1);
     }
+    search();
 };
 
 const setCategoryList = (data) => {

src/pages/Route/RouteAutonomous.vue

@@ -142,7 +142,7 @@ const total = computed(() => {
 const openDmsUploadDialog = async () => {
     dmsDialog.value.rowsToCreateInvoiceIn = selectedRows.value
         .filter(
-            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk
+            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk,
         )
         .map((agencyTerm) => ({
             routeFk: agencyTerm.routeFk,
@@ -277,5 +277,4 @@ es:
     Price: Precio
     Received: Recibida
     Autonomous: Autónomos
-    Preview: Vista previa
 </i18n>

src/pages/Route/RouteRoadmap.vue

@@ -112,7 +112,7 @@ const removeSelection = async () => {
     await Promise.all(
         selectedRows.value.map((roadmap) => {
             axios.delete(`Roadmaps/${roadmap.id}`);
-        })
+        }),
     );
 };
 
@@ -236,6 +236,5 @@ es:
     Plate: Matrícula
     Price: Precio
     Observations: Observaciones
-    Preview: Vista previa
     Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida
 </i18n>

src/pages/Route/locale/en.yml

@@ -33,7 +33,6 @@ route:
     Mark as served: Mark as served
     Download selected routes as PDF: Download selected routes as PDF
     Add ticket: Add ticket
-    Preview: Preview
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served

src/pages/Route/locale/es.yml

@@ -33,7 +33,7 @@ route:
     Mark as served: Marcar como servidas
     Download selected routes as PDF: Descargar rutas seleccionadas como PDF
     Add ticket: Añadir tickets
-    Preview: Vista previa
+    preview: Vista previa
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -188,7 +188,6 @@ const getEntryQueryParams = (supplier) => {
 es:
     All entries with current supplier: Todas las entradas con proveedor actual
     Go to client: Ir a cliente
-    Go to module index: Ir al índice del módulo
     Inactive supplier: Proveedor inactivo
     Unverified supplier: Proveedor no verificado
 </i18n>

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -239,7 +239,6 @@ function ticketFilter(ticket) {
 <i18n>
 es:
     This ticket is deleted: Este ticket está eliminado
-    Go to module index: Ir al índice del modulo
     Client inactive: Cliente inactivo
     Client not checked: Cliente no verificado
     Client has debt: Cliente con deuda

src/pages/Travel/Card/TravelCard.vue

@@ -14,6 +14,9 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'isRaid',
+        'isDelivered',
+        'isReceived',
     ],
     include: [
         {

src/pages/Travel/Card/TravelDescriptor.vue

@@ -85,7 +85,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
 
 <i18n>
 es:
-    Go to module index: Ir al índice del módulo
     The travel will be deleted: El envío será eliminado
     Do you want to delete this travel?: ¿Quieres eliminar este envío?
     All travels with current agency: Todos los envíos con la agencia actual

src/pages/Wagon/WagonCounter.vue

@@ -11,7 +11,7 @@ const { t } = useI18n();
 const counters = ref({
     alquilerBandeja: { count: 0, id: 96001, title: 'CC Bandeja', isTray: true },
     bandejaRota: { count: 0, id: 88381, title: 'CC Bandeja Rota', isTray: true },
-    carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG5' },
+    carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG6' },
     candadoRojo: { count: 0, id: 96002, title: 'CC Carry NO OFICIAL' },
     sacadores: { count: 0, id: 142260, title: 'CC Sacadores' },
     sinChapa: { count: 0, id: 2214, title: 'DC Carry Sin Placa CC' },

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -10,6 +10,7 @@ import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
+import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 
 const $props = defineProps({
     id: {
@@ -115,10 +116,13 @@ const handlePhotoUpdated = (evt = false) => {
                 :value="entity.user?.emailUser?.email"
                 copy
             />
-            <VnLv
+            <VnLv :label="t('worker.list.department')">
-                :label="t('worker.list.department')"
+                <template #value>
-                :value="entity.department ? entity.department.department.name : null"
+                    <span class="link" v-text="entity.department?.department?.name" />
-            />
+                    <DepartmentDescriptorProxy :id="entity.department?.department?.id" />
+                </template>
+            </VnLv>
+
             <VnLv :value="entity.phone">
                 <template #label>
                     {{ t('globals.phone') }}

src/pages/Zone/Card/ZoneDescriptor.vue

@@ -66,7 +66,3 @@ const setData = (entity) => {
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>

src/pages/Zone/ZoneClosingTable.vue

@@ -90,7 +90,7 @@ const redirectToZoneSummary = (id) => {
                             color="primary"
                             @click.stop="viewSummary(props.row.id, ZoneSummary)"
                         >
-                            <QTooltip>{{ t('zoneClosingTable.preview') }}</QTooltip>
+                            <QTooltip>{{ t('globals.preview') }}</QTooltip>
                         </QIcon>
                     </div>
                 </QTd>

src/pages/Zone/locale/en.yml

@@ -50,8 +50,7 @@ deliveryPanel:
     postcode: Postcode
     query: Query
     noEventsWarning: No service for the specified zone
-zoneClosingTable:
+
-    preview: Preview
 warehouses:
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?