merge(dev): refs #6259 merge dev

2023-12-21 18:46:12 +01:00 · 2023-12-21 18:46:12 +01:00 · 35750bc93f
parent 27a369bef4 36698c1ace
commit 35750bc93f
27 changed files with 161 additions and 43 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -3,7 +3,7 @@
    // Carácter predeterminado de final de línea.
    "files.eol": "\n",
    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
    },
    "search.useIgnoreFiles": false,
    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [2352.01] - 2023-12-28
+## [2402.01] - 2024-01-11
+
+### Added
+### Changed
+### Fixed
+
+## [2400.01] - 2024-01-04

 ### Added
 ### Changed
@ -13,9 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [2350.01] - 2023-12-14

-### Added
-### Changed
-### Fixed
+### Características Añadidas 🆕
+- **Tickets → Expediciones:** Añadido soporte para Viaexpress


 ## [2348.01] - 2023-11-30
--- a/back/methods/docuware/specs/upload.spec.js
+++ b/back/methods/docuware/specs/upload.spec.js
@ -24,15 +24,40 @@ describe('docuware upload()', () => {
    });

    it('should try upload file', async() => {
+        const tx = await models.Docuware.beginTransaction({});
        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));

        let error;
        try {
-            await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
+            const options = {transaction: tx};
+            const user = await models.UserConfig.findById(userId, null, options);
+            await user.updateAttribute('tabletFk', 'Tablet1');
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
        } catch (e) {
-            error = e.message;
+            error = e;
+            await tx.rollback();
        }

-        expect(error).toEqual('Action not allowed on the test environment');
+        expect(error.message).toEqual('Action not allowed on the test environment');
+    });
+
+    it('should throw error when not have tablet assigned', async() => {
+        const tx = await models.Docuware.beginTransaction({});
+        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This user does not have an assigned tablet');
    });
 });
--- a/back/methods/docuware/upload.js
+++ b/back/methods/docuware/upload.js
@ -29,12 +29,24 @@ module.exports = Self => {
        }
    });

-    Self.upload = async function(ctx, ticketIds, fileCabinet) {
+    Self.upload = async function(ctx, ticketIds, fileCabinet, options) {
        delete ctx.args.ticketIds;
        const models = Self.app.models;
        const action = 'store';

-        const options = await Self.getOptions();
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const userConfig = await models.UserConfig.findById(ctx.req.accessToken.userId, {
+            fields: ['tabletFk']
+        }, myOptions);
+
+        if (!userConfig?.tabletFk)
+            throw new UserError('This user does not have an assigned tablet');
+
+        const docuwareOptions = await Self.getOptions();
        const fileCabinetId = await Self.getFileCabinet(fileCabinet);
        const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);

@ -45,7 +57,7 @@ module.exports = Self => {
            const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
                id,
                type: 'deliveryNote'
-            });
+            }, myOptions);
            // get ticket data
            const ticket = await models.Ticket.findById(id, {
                include: [{
@ -54,7 +66,7 @@ module.exports = Self => {
                        fields: ['id', 'name', 'fi']
                    }
                }]
-            });
+            }, myOptions);

            // upload file
            const templateJson = {
@ -102,7 +114,7 @@ module.exports = Self => {
                    {
                        'FieldName': 'FILTRO_TABLET',
                        'ItemElementName': 'string',
-                        'Item': 'Tablet1',
+                        'Item': userConfig.tabletFk,
                    }
                ]
            };
@ -116,11 +128,11 @@ module.exports = Self => {
                const deleteJson = {
                    'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
                };
-                const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
-                await axios.put(deleteUri, deleteJson, options.headers);
+                const deleteUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+                await axios.put(deleteUri, deleteJson, docuwareOptions.headers);
            }

-            const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+            const uploadUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
            const FormData = require('form-data');
            const data = new FormData();

@ -130,7 +142,7 @@ module.exports = Self => {
                headers: {
                    'Content-Type': 'multipart/form-data',
                    'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': options.headers.headers.Cookie,
+                    'Cookie': docuwareOptions.headers.headers.Cookie,
                    ...data.getHeaders()
                },
            };
@ -141,11 +153,11 @@ module.exports = Self => {
                const $t = ctx.req.__;
                const message = $t('Failed to upload delivery note', {id});
                if (uploaded.length)
-                    await models.TicketTracking.setDelivered(ctx, uploaded);
+                    await models.TicketTracking.setDelivered(ctx, uploaded, myOptions);
                throw new UserError(message);
            }
            uploaded.push(id);
        }
-        return models.TicketTracking.setDelivered(ctx, ticketIds);
+        return models.TicketTracking.setDelivered(ctx, ticketIds, myOptions);
    };
 };
--- a/back/models/docuwareTablet.json
+++ b/back/models/docuwareTablet.json
@ -0,0 +1,17 @@
+{
+	"name": "docuwareTablet",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "docuwareTablet"
+		}
+	},
+	"properties": {
+        "tablet": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        }
+    }
+}
--- a/back/models/user-config.json
+++ b/back/models/user-config.json
@ -26,6 +26,9 @@
        },
        "darkMode": {
            "type": "boolean"
+        },
+        "tabletFk": {
+            "type": "string"
        }
    },
    "relations": {
@ -43,6 +46,11 @@
            "type": "belongsTo",
            "model": "VnUser",
            "foreignKey": "userFk"
-          }
+        },
+        "Tablet": {
+            "type": "belongsTo",
+            "model": "docuwareTablet",
+            "foreignKey": "tabletFk"
+        }
    }
 }
--- a/db/changes/240001/00-alterTable.sql
+++ b/db/changes/240001/00-alterTable.sql
--- a/db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql
+++ b/db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql
@ -1,4 +1,4 @@
 RENAME TABLE `vn`.`clientCreditLimit` TO `vn`.`roleCreditLimit`;
-ALTER TABLE `vn`.`clientCreditLimit` DROP FOREIGN KEY `clientCreditLimit_FK`;
+ALTER TABLE `vn`.`roleCreditLimit` DROP FOREIGN KEY `clientCreditLimit_FK`;
 ALTER TABLE `vn`.`roleCreditLimit` ADD CONSTRAINT `roleCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;

--- a/db/changes/240001/00-ticketSmsToClientSms.sql
+++ b/db/changes/240001/00-ticketSmsToClientSms.sql
--- a/db/changes/240001/01-procedures.sql
+++ b/db/changes/240001/01-procedures.sql
--- a/db/changes/240001/02-views.sql
+++ b/db/changes/240001/02-views.sql
@ -1,6 +1,9 @@
+CREATE SCHEMA IF NOT EXISTS `vn2008`;
+USE `vn`;
+
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
-	VIEW `vn`.`ticketState`
+	VIEW `ticketState`
 AS SELECT `tt`.`created` AS `updated`,
 	`tt`.`stateFk` AS `stateFk`,
 	`tt`.`userFk` AS `workerFk`,
@ -15,10 +18,10 @@ AS SELECT `tt`.`created` AS `updated`,
 	`s`.`isPicked` AS `isPicked`
 FROM (
 		(
-			`vn`.`ticketLastState` `tls`
-			JOIN `vn`.`ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
+			`ticketLastState` `tls`
+			JOIN `ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
 		)
-		JOIN `vn`.`state` `s` ON(`s`.`id` = `tt`.`stateFk`)
+		JOIN `state` `s` ON(`s`.`id` = `tt`.`stateFk`)
 	);

 CREATE OR REPLACE DEFINER=`root`@`localhost`
@ -33,9 +36,10 @@ AS SELECT `tt`.`id` AS `inter_id`,
 	`tt`.`supervisorFk` AS `Id_supervisor`
 FROM `vn`.`ticketTracking` `tt`;

-CREATE OR REPLACE
-ALGORITHM = UNDEFINED VIEW `ticketStateToday` AS
-SELECT
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+    SQL SECURITY DEFINER
+    VIEW `ticketStateToday`
+AS SELECT
    `ts`.`ticket` AS `ticket`,
    `ts`.`state` AS `state`,
    `ts`.`productionOrder` AS `productionOrder`,
--- a/db/changes/240201/.gitkeep
+++ b/db/changes/240201/.gitkeep
--- a/db/changes/240201/00-tabletDocuware.sql
+++ b/db/changes/240201/00-tabletDocuware.sql
@ -0,0 +1,10 @@
+-- vn.docuwareTablet definition
+
+CREATE TABLE `vn`.`docuwareTablet` (
+  `tablet` varchar(100) NOT NULL PRIMARY KEY,
+  `description` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`userConfig`
+ADD COLUMN tabletFk varchar(100) DEFAULT NULL,
+ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(tablet);
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -3010,6 +3010,11 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
        (2, 'Error in sales details'),
        (3, 'Error in customer data');

+INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
+	VALUES
+        ('Tablet1','Jarvis tablet'),
+	    ('Tablet2','Avengers tablet');
+
 INSERT INTO `vn`.`sms` (`id`, `senderFk`, `sender`, `destination`, `message`, `statusCode`, `status`, `created`) 
    VALUES (1, 66, '111111111', '0001111111111', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()),
        (2, 66, '222222222', '0002222222222', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'PENDING', util.VN_CURDATE()),
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -26391,6 +26391,7 @@ CREATE TABLE `cplusCorrectingType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;

+
 --
 -- Table structure for table `cplusRectificationType`
 --
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@ -18,7 +18,7 @@ Show summary: Mostrar vista previa
 What is new: Novedades de la versión
 Settings: Ajustes
 There is a new version, click here to reload: Hay una nueva versión, pulse aquí para recargar
-This ticket is locked.: Este ticket está bloqueado
+This ticket is locked: Este ticket está bloqueado

 # Actions

--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -183,7 +183,7 @@
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
 	"You don't have enough privileges.": "You don't have enough privileges.",
-	"This ticket is locked.": "This ticket is locked.",
+	"This ticket is locked": "This ticket is locked",
 	"This ticket is not editable.": "This ticket is not editable.",
 	"The ticket doesn't exist.": "The ticket doesn't exist.",
 	"The sales do not exists": "The sales do not exists",
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -312,7 +312,7 @@
 	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
 	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
 	"You don't have enough privileges.": "No tienes suficientes permisos.",
-	"This ticket is locked.": "Este ticket está bloqueado.",
+	"This ticket is locked": "Este ticket está bloqueado.",
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
 	"Social name should be uppercase": "La razón social debe ir en mayúscula",
@ -329,5 +329,6 @@
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
 }
--- a/modules/route/back/locale/route/en.yml
+++ b/modules/route/back/locale/route/en.yml
@ -17,3 +17,18 @@ columns:
    agencyModeFk: agency
    routeFk: route
    zoneFk: zone
+    name: name
+    beachFk: beach
+    ticketPacked: tickets packed
+    ticketFree: tickets free
+    ticketProduction: tickets production
+    packages: packages
+    note: note
+    dated: dated
+    dockFk: dock
+    priority: priority
+    etd: etd
+    expeditionTruckFk: truck
+    m3boxes: m3 boxes
+    bufferFk: buffer
+    isPickingAllowed: is picking allowed
--- a/modules/route/back/locale/route/es.yml
+++ b/modules/route/back/locale/route/es.yml
@ -17,3 +17,18 @@ columns:
    agencyModeFk: agencia
    routeFk: ruta
    zoneFk: zona
+    name: nombre
+    beachFk: playa
+    ticketPacked: tickets encajados
+    ticketFree: tickets libres
+    ticketProduction: tickets producción
+    packages: paquetes
+    note: nota
+    dated: fecha
+    dockFk: muelle
+    priority: prioridad
+    etd: etd
+    expeditionTruckFk: camión
+    m3boxes: m3 cajas
+    bufferFk: buffer
+    isPickingAllowed: está permitido recoger
--- a/modules/ticket/back/methods/ticket/isEditableOrThrow.js
+++ b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
@ -41,7 +41,7 @@ module.exports = Self => {
            throw new ForbiddenError(`This ticket is not editable.`);

        if (isLocked && !isWeekly)
-            throw new ForbiddenError(`This ticket is locked.`);
+            throw new ForbiddenError(`This ticket is locked`);

        if (isWeekly && !canEditWeeklyTicket)
            throw new ForbiddenError(`You don't have enough privileges.`);
--- a/modules/ticket/back/methods/ticket/specs/addSale.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/addSale.spec.js
@ -89,6 +89,6 @@ describe('ticket addSale()', () => {
            error = e;
        }

-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
    });
 });
--- a/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
@ -40,7 +40,7 @@ describe('ticket isEditableOrThrow()', () => {
        expect(error.message).toEqual(`This ticket is not editable.`);
    });

-    it('should throw an error  as this ticket is locked.', async() => {
+    it('should throw an error  as This ticket is locked', async() => {
        const tx = await models.Ticket.beginTransaction({});
        let error;
        try {
@ -57,7 +57,7 @@ describe('ticket isEditableOrThrow()', () => {
            await tx.rollback();
        }

-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
    });

    it('should throw an error as you do not have enough privileges.', async() => {
--- a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
@ -39,6 +39,6 @@ describe('ticket recalculateComponents()', () => {
            error = e;
        }

-        expect(error).toEqual(new ForbiddenError(`This ticket is locked.`));
+        expect(error).toEqual(new ForbiddenError(`This ticket is locked`));
    });
 });
--- a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
@ -23,7 +23,7 @@ describe('Ticket transferClient()', () => {
            error = e;
        }

-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
    });

    it('should be assigned a different clientFk', async() => {
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "salix-back",
-    "version": "23.50.01",
+    "version": "24.02.01",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "salix-back",
-            "version": "23.50.01",
+            "version": "24.02.01",
            "license": "GPL-3.0",
            "dependencies": {
                "axios": "^1.2.2",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "23.52.01",
+    "version": "24.02.01",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",