back/methods/image/upload.js

@@ -1,7 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
-const fs = require('fs-extra');
+const fs = require('fs/promises');
 const path = require('path');
-const uuid = require('uuid');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
@@ -36,7 +35,7 @@ module.exports = Self => {
         const fileOptions = {};
         const args = ctx.args;
 
-        let srcFile;
+        let tempFilePath;
         try {
             const hasWriteRole = await models.ImageCollection.hasWriteRole(ctx, args.collection);
             if (!hasWriteRole)
@@ -53,15 +52,20 @@ module.exports = Self => {
             });
 
             const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
-            srcFile = path.join(file.client.root, file.container, file.name);
+            tempFilePath = path.join(file.client.root, file.container, file.name);
 
-            const fileName = `${uuid.v4()}.png`;
+            const fileName = `${args.id}.png`;
-            await models.Image.registerImage(args.collection, srcFile, fileName, args.id);
-        } catch (e) {
-            if (fs.existsSync(srcFile))
-                await fs.unlink(srcFile);
 
-            throw e;
+            await models.Image.resize({
+                collectionName: args.collection,
+                srcFile: tempFilePath,
+                fileName: fileName,
+                entityId: args.id
+            });
+        } finally {
+            try {
+                await fs.unlink(tempFilePath);
+            } catch (error) { }
         }
     };
 };

back/models/image.js

@@ -1,161 +1,110 @@
 const fs = require('fs-extra');
-const sharp = require('sharp');
 const path = require('path');
-const readChunk = require('read-chunk');
+const gm = require('gm');
-const imageType = require('image-type');
-const bmp = require('bmp-js');
 
 module.exports = Self => {
     require('../methods/image/download')(Self);
     require('../methods/image/upload')(Self);
 
-    // Function extracted from jimp package (utils)
+    Self.resize = async function({collectionName, srcFile, fileName, entityId}) {
-    function scan(image, x, y, w, h, f) {
-        // round input
-        x = Math.round(x);
-        y = Math.round(y);
-        w = Math.round(w);
-        h = Math.round(h);
-
-        for (let _y = y; _y < y + h; _y++) {
-            for (let _x = x; _x < x + w; _x++) {
-                const idx = (image.bitmap.width * _y + _x) << 2;
-                f.call(image, _x, _y, idx);
-            }
-        }
-
-        return image;
-    }
-
-    // Function extracted from jimp package (type-bmp)
-    function fromAGBR(bitmap) {
-        return scan({bitmap}, 0, 0, bitmap.width, bitmap.height, function(
-            x,
-            y,
-            index
-        ) {
-            const alpha = this.bitmap.data[index + 0];
-            const blue = this.bitmap.data[index + 1];
-            const green = this.bitmap.data[index + 2];
-            const red = this.bitmap.data[index + 3];
-
-            this.bitmap.data[index + 0] = red;
-            this.bitmap.data[index + 1] = green;
-            this.bitmap.data[index + 2] = blue;
-            this.bitmap.data[index + 3] = bitmap.is_with_alpha ? alpha : 0xff;
-        }).bitmap;
-    }
-
-    Self.registerImage = async(collectionName, srcFilePath, fileName, entityId) => {
         const models = Self.app.models;
-        const tx = await Self.beginTransaction({});
-        const myOptions = {transaction: tx};
 
-        try {
+        const collection = await models.ImageCollection.findOne(
-            const collection = await models.ImageCollection.findOne({
+            {
                 fields: [
                     'id',
-                    'name',
                     'maxWidth',
                     'maxHeight',
                     'model',
-                    'property'
+                    'property',
                 ],
                 where: {name: collectionName},
                 include: {
                     relation: 'sizes',
                     scope: {
-                        fields: ['width', 'height', 'crop']
+                        fields: ['width', 'height', 'crop'],
-                    }
+                    },
-                }
+                },
-            }, myOptions);
+            }
+        );
 
-            const data = {
+        // Insert image row
+        await models.Image.upsertWithWhere(
+            {
                 name: fileName,
                 collectionFk: collectionName
-            };
+            },
-            const newImage = await Self.upsertWithWhere(data, {
+            {
                 name: fileName,
                 collectionFk: collectionName,
-                updated: Date.vnNow()
+                updated: Date.vnNow() / 1000,
-            }, myOptions);
-
-            // Resizes and saves the image
-            const container = await models.ImageContainer.container(collectionName);
-            const rootPath = container.client.root;
-            const collectionDir = path.join(rootPath, collectionName);
-            const dstDir = path.join(collectionDir, 'full');
-            const dstFile = path.join(dstDir, fileName);
-
-            const buffer = readChunk.sync(srcFilePath, 0, 12);
-            const type = imageType(buffer);
-
-            let sharpOptions;
-            let imgSrc = srcFilePath;
-            if (type.mime == 'image/bmp') {
-                const bmpBuffer = fs.readFileSync(srcFilePath);
-                const bmpData = fromAGBR(bmp.decode(bmpBuffer));
-                imgSrc = bmpData.data;
-                sharpOptions = {
-                    raw: {
-                        width: bmpData.width,
-                        height: bmpData.height,
-                        channels: 4
-                    },
-                    failOn: 'none'
-                };
             }
+        );
 
-            const resizeOpts = {
+        // Update entity image file name
-                withoutEnlargement: true,
+        const model = models[collection.model];
-                fit: 'inside'
+        if (!model) throw new Error('No matching model found');
-            };
 
-            await fs.mkdir(dstDir, {recursive: true});
+        const entity = await model.findById(entityId);
-            await sharp(imgSrc, sharpOptions)
+        if (entity) {
-                .resize(collection.maxWidth, collection.maxHeight, resizeOpts)
+            await entity.updateAttribute(
-                .png()
+                collection.property,
-                .toFile(dstFile);
+                fileName
+            );
+        }
 
-            const sizes = collection.sizes();
+        // Resize
-            for (let size of sizes) {
+        const container = await models.ImageContainer.container(
-                const dstDir = path.join(collectionDir, `${size.width}x${size.height}`);
+            collectionName
-                const dstFile = path.join(dstDir, fileName);
+        );
-                const resizeOpts = {
+        const rootPath = container.client.root;
-                    withoutEnlargement: true,
+        const collectionDir = path.join(rootPath, collectionName);
-                    fit: size.crop ? 'cover' : 'inside'
-                };
 
-                await fs.mkdir(dstDir, {recursive: true});
+        // To max size
-                await sharp(imgSrc, sharpOptions)
+        const {maxWidth, maxHeight} = collection;
-                    .resize(size.width, size.height, resizeOpts)
+        const fullSizePath = path.join(collectionDir, 'full');
-                    .png()
+        const toFullSizePath = `${fullSizePath}/${fileName}`;
-                    .toFile(dstFile);
-            }
 
-            const model = models[collection.model];
+        await fs.mkdir(fullSizePath, {recursive: true});
+        await new Promise((resolve, reject) => {
+            gm(srcFile)
+                .resize(maxWidth, maxHeight, '>')
+                .setFormat('png')
+                .quality(100)
+                .write(toFullSizePath, function(err) {
+                    if (err) reject(err);
+                    if (!err) resolve();
+                });
+        });
 
-            if (!model)
+        // To collection sizes
-                throw new Error('Matching model not found');
+        for (const size of collection.sizes()) {
+            const {width, height} = size;
 
-            const item = await model.findById(entityId, null, myOptions);
+            const sizePath = path.join(collectionDir, `${width}x${height}`);
-            if (item) {
+            const toSizePath = `${sizePath}/${fileName}`;
-                await item.updateAttribute(
-                    collection.property,
-                    fileName,
-                    myOptions
-                );
-            }
 
-            if (fs.existsSync(srcFilePath))
+            await fs.mkdir(sizePath, {recursive: true});
-                await fs.unlink(srcFilePath);
+            await new Promise((resolve, reject) => {
+                const gmInstance = gm(srcFile);
 
-            await tx.commit();
+                if (size.crop) {
+                    gmInstance
+                        .resize(width, height, '^')
+                        .gravity('Center')
+                        .crop(width, height);
+                }
 
-            return newImage;
+                if (!size.crop) gmInstance.resize(width, height, '>');
-        } catch (e) {
+
-            await tx.rollback();
+                gmInstance
-            throw e;
+                    .setFormat('png')
+                    .quality(100)
+                    .write(toSizePath, function(err) {
+                        if (err) reject(err);
+                        if (!err) resolve();
+                    });
+            });
         }
     };
 };

db/changes/230801/00-ticketConfig.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`ticketConfig` ADD daysForWarningClaim INT DEFAULT 2 NOT NULL COMMENT 'dias restantes hasta que salte el aviso de reclamación fuerade plazo';

db/changes/231401/00-hotfixDelivery.sql

@@ -0,0 +1,70 @@
+DROP TABLE IF EXISTS `vn`.`dmsRecover`;
+
+ALTER TABLE `vn`.`delivery` DROP COLUMN addressFk;
+ALTER TABLE `vn`.`delivery` DROP CONSTRAINT delivery_ticketFk_FK;
+ALTER TABLE `vn`.`delivery` DROP COLUMN ticketFk;
+ALTER TABLE `vn`.`delivery` ADD ticketFk INT DEFAULT NULL;
+ALTER TABLE `vn`.`delivery` ADD CONSTRAINT delivery_ticketFk_FK FOREIGN KEY (`ticketFk`) REFERENCES `vn`.`ticket`(`id`);
+
+DROP PROCEDURE IF EXISTS vn.route_getTickets;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`route_getTickets`(vRouteFk INT)
+BEGIN
+/**
+ * Pasado un RouteFk devuelve la información
+ * de sus tickets.
+ *
+ * @param vRouteFk
+ *
+ * @select Información de los tickets
+ */
+
+    SELECT
+            t.id Id,
+            t.clientFk Client,
+            a.id Address,
+            t.packages Packages,
+            a.street AddressName,
+            a.postalCode PostalCode,
+            a.city City,
+            sub2.itemPackingTypeFk PackingType,
+            c.phone ClientPhone,
+            c.mobile ClientMobile,
+            a.phone AddressPhone,
+            a.mobile AddressMobile,
+            d.longitude Longitude,
+            d.latitude Latitude,
+            wm.mediaValue SalePersonPhone,
+            tob.Note Note,
+            t.isSigned Signed
+        FROM ticket t
+            JOIN client c ON t.clientFk = c.id
+            JOIN address a ON t.addressFk = a.id
+            LEFT JOIN delivery d ON t.id = d.ticketFk
+            LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
+            LEFT JOIN
+                (SELECT tob.description Note, t.id
+                    FROM ticketObservation tob
+                        JOIN ticket t ON tob.ticketFk = t.id
+                        JOIN observationType ot ON ot.id = tob.observationTypeFk
+                    WHERE t.routeFk = vRouteFk
+                        AND ot.code = 'delivery'
+                )tob ON tob.id = t.id
+            LEFT JOIN
+                (SELECT sub.ticketFk,
+                    CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeFk
+                    FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items
+                        FROM ticket t
+                        JOIN sale s ON s.ticketFk = t.id
+                        JOIN item i ON i.id = s.itemFk
+                        WHERE t.routeFk = vRouteFk
+                        GROUP BY t.id,i.itemPackingTypeFk)sub
+                    GROUP BY sub.ticketFk
+                ) sub2 ON sub2.ticketFk = t.id
+        WHERE t.routeFk = vRouteFk
+        GROUP BY t.id
+        ORDER BY t.priority;
+END$$
+DELIMITER ;

db/changes/231601/00-observationEmailACL.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Defaulter', 'observationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee');

e2e/helpers/selectors.js

@@ -989,7 +989,7 @@ export default {
         saveButton: 'vn-worker-basic-data button[type=submit]'
     },
     workerNotes: {
-        addNoteFloatButton: 'vn-float-button',
+        addNoteFloatButton: 'vn-worker-note vn-float-button',
         note: 'vn-textarea[ng-model="$ctrl.note.text"]',
         saveButton: 'button[type=submit]',
         firstNoteText: 'vn-worker-note .text'

e2e/paths/02-client/21_defaulter.spec.js

@@ -50,7 +50,7 @@ describe('Client defaulter path', () => {
         expect(message.text).toContain(`The message can't be empty`);
     });
 
-    it('shoul checked all defaulters', async() => {
+    it('should checked all defaulters', async() => {
         await page.loginAndModule('insurance', 'client');
         await page.accessToSection('client.defaulter');
 

e2e/paths/03-worker/08_add_notes.spec.js

@@ -7,7 +7,7 @@ describe('Worker Add notes path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('employee', 'worker');
+        await page.loginAndModule('hr', 'worker');
         await page.accessToSearchResult('Bruce Banner');
         await page.accessToSection('worker.card.note.index');
     });

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -249,6 +249,7 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
+        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

front/salix/components/upload-photo/index.js

@@ -162,14 +162,8 @@ export default class UploadPhoto extends Component {
             if (!this.newPhoto.files)
                 throw new Error(`Select an image`);
 
-            const viewportType = this.viewportSelection;
-            const output = viewportType.output;
             const options = {
                 type: 'blob',
-                size: {
-                    width: output.width,
-                    height: output.height
-                }
             };
             return this.editor.result(options)
                 .then(blob => this.newPhoto.blob = blob)

modules/item/back/methods/item-image-queue/download.js

@@ -1,9 +1,7 @@
 const axios = require('axios');
-const uuid = require('uuid');
 const fs = require('fs/promises');
 const {createWriteStream} = require('fs');
 const path = require('path');
-const gm = require('gm');
 
 module.exports = Self => {
     Self.remoteMethod('download', {
@@ -27,13 +25,9 @@ module.exports = Self => {
         const maxAttempts = 3;
         const collectionName = 'catalog';
 
-        const tx = await Self.beginTransaction({});
-
         let tempFilePath;
         let queueRow;
         try {
-            const myOptions = {transaction: tx};
-
             queueRow = await Self.findOne(
                 {
                     fields: ['id', 'itemFk', 'url', 'attempts'],
@@ -44,58 +38,14 @@ module.exports = Self => {
                         },
                     },
                     order: 'priority, attempts, updated',
-                },
+                }
-                myOptions
             );
 
             if (!queueRow) return;
 
-            const collection = await models.ImageCollection.findOne(
+            const fileName = `${queueRow.itemFk}.png`;
-                {
-                    fields: [
-                        'id',
-                        'maxWidth',
-                        'maxHeight',
-                        'model',
-                        'property',
-                    ],
-                    where: {name: collectionName},
-                    include: {
-                        relation: 'sizes',
-                        scope: {
-                            fields: ['width', 'height', 'crop'],
-                        },
-                    },
-                },
-                myOptions
-            );
-
-            const fileName = `${uuid.v4()}.png`;
             tempFilePath = path.join(tempPath, fileName);
 
-            // Insert image row
-            await models.Image.create(
-                {
-                    name: fileName,
-                    collectionFk: collectionName,
-                    updated: Date.vnNow(),
-                },
-                myOptions
-            );
-
-            // Update item
-            const model = models[collection.model];
-            if (!model) throw new Error('No matching model found');
-
-            const item = await model.findById(queueRow.itemFk, null, myOptions);
-            if (item) {
-                await item.updateAttribute(
-                    collection.property,
-                    fileName,
-                    myOptions
-                );
-            }
-
             // Download remote image
             const response = await axios.get(queueRow.url, {
                 responseType: 'stream',
@@ -108,71 +58,22 @@ module.exports = Self => {
                 writeStream.on('error', error => reject(error));
             });
 
-            // Resize
+            await models.Image.resize({
-            const container = await models.ImageContainer.container(
+                collectionName: collectionName,
-                collectionName
+                srcFile: tempFilePath,
-            );
+                fileName: fileName,
-            const rootPath = container.client.root;
+                entityId: queueRow.itemFk
-            const collectionDir = path.join(rootPath, collectionName);
-
-            // To max size
-            const {maxWidth, maxHeight} = collection;
-            const fullSizePath = path.join(collectionDir, 'full');
-            const toFullSizePath = `${fullSizePath}/${fileName}`;
-
-            await fs.mkdir(fullSizePath, {recursive: true});
-            await new Promise((resolve, reject) => {
-                gm(tempFilePath)
-                    .resize(maxWidth, maxHeight, '>')
-                    .setFormat('png')
-                    .write(toFullSizePath, function(err) {
-                        if (err) reject(err);
-                        if (!err) resolve();
-                    });
             });
 
-            // To collection sizes
-            for (const size of collection.sizes()) {
-                const {width, height} = size;
-
-                const sizePath = path.join(collectionDir, `${width}x${height}`);
-                const toSizePath = `${sizePath}/${fileName}`;
-
-                await fs.mkdir(sizePath, {recursive: true});
-                await new Promise((resolve, reject) => {
-                    const gmInstance = gm(tempFilePath);
-
-                    if (size.crop) {
-                        gmInstance
-                            .resize(width, height, '^')
-                            .gravity('Center')
-                            .crop(width, height);
-                    }
-
-                    if (!size.crop) gmInstance.resize(width, height, '>');
-
-                    gmInstance
-                        .setFormat('png')
-                        .write(toSizePath, function(err) {
-                            if (err) reject(err);
-                            if (!err) resolve();
-                        });
-                });
-            }
-
             try {
                 await fs.unlink(tempFilePath);
             } catch (error) { }
 
-            await queueRow.destroy(myOptions);
+            await queueRow.destroy();
 
             // Restart queue
             Self.download();
-
-            await tx.commit();
         } catch (error) {
-            await tx.rollback();
-
             if (queueRow.attempts < maxAttempts) {
                 await queueRow.updateAttributes({
                     error: error,

modules/ticket/back/methods/ticket/saveSign.js

@@ -34,6 +34,8 @@ module.exports = Self => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
+        let dms;
+        let gestDocCreated = false;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -96,11 +98,12 @@ module.exports = Self => {
                 warehouseId: ticket.warehouseFk,
                 companyId: ticket.companyFk,
                 dmsTypeId: dmsType.id,
-                reference: id,
+                reference: '',
-                description: `Ticket ${id} Cliente ${ticket.client().name} Ruta ${ticket.route().id}`,
+                description: `Firma del cliente - Ruta ${ticket.route().id}`,
                 hasFile: true
             };
-            await models.Ticket.uploadFile(ctxUploadFile, id, myOptions);
+            dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
+            gestDocCreated = true;
         }
 
         try {
@@ -118,12 +121,16 @@ module.exports = Self => {
                     throw new UserError('This ticket cannot be signed because it has not been boxed');
                 else if (!await gestDocExists(args.tickets[i])) {
                     if (args.location) setLocation(args.tickets[i]);
-                    await createGestDoc(args.tickets[i]);
+                    if (!gestDocCreated) await createGestDoc(args.tickets[i]);
+                    await models.TicketDms.create({ticketFk: args.tickets[i], dmsFk: dms[0].id}, myOptions);
+                    const ticket = await models.Ticket.findById(args.tickets[i], null, myOptions);
+                    await ticket.updateAttribute('isSigned', true, myOptions);
                     await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
                 }
             }
 
             if (tx) await tx.commit();
+            return;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/ticket/back/models/ticket-config.json

@@ -14,6 +14,15 @@
         },
         "scopeDays": {
             "type": "number"
+        },
+        "pickingDelay": {
+            "type": "number"
+        },
+        "packagingInvoicingDated": {
+            "type": "date"
+        },
+        "daysForWarningClaim": {
+            "type": "number"
         }
     }
 }

modules/ticket/front/sale/index.html

@@ -481,6 +481,13 @@
     on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)">
 </vn-confirm>
 
+<vn-confirm 
+    vn-id="claimConfirm"
+    question="Do you want to continue?"
+    message="Claim out of time"
+    on-accept="$ctrl.onCreateClaimAccepted()">
+</vn-confirm>
+
 <vn-menu vn-id="moreOptions">
     <vn-item translate
         name="sms"
@@ -503,6 +510,7 @@
         ng-click="$ctrl.createClaim()"
         ng-if="$ctrl.isClaimable">
         Add claim
+    
     </vn-item>
     <vn-item translate
         name="reserve"

modules/ticket/front/sale/index.js

@@ -7,6 +7,7 @@ class Controller extends Section {
         super($element, $);
         this._sales = [];
         this.manaCode = 'mana';
+        this.getConfig();
     }
 
     get manaCode() {
@@ -43,6 +44,15 @@ class Controller extends Section {
 
         return ticketState && ticketState.state.code;
     }
+    getConfig() {
+        let filter = {
+            fields: ['daysForWarningClaim'],
+        };
+        this.$http.get(`TicketConfigs`, {filter})
+            .then(res => {
+                this.ticketConfig = res.data;
+            });
+    }
 
     get isClaimable() {
         if (this.ticket) {
@@ -184,6 +194,16 @@ class Controller extends Section {
     }
 
     createClaim() {
+        const timeDifference = new Date().getTime() - new Date(this.ticket.shipped).getTime();
+        const pastDays = Math.floor(timeDifference / 86400000);
+
+        if (pastDays >= this.ticketConfig[0].daysForWarningClaim)
+            this.$.claimConfirm.show();
+        else
+            this.onCreateClaimAccepted();
+    }
+
+    onCreateClaimAccepted() {
         const sales = this.selectedValidSales();
         const params = {ticketId: this.ticket.id, sales: sales};
         this.resetChanges();

modules/ticket/front/sale/index.spec.js

@@ -45,6 +45,7 @@ describe('Ticket', () => {
             $scope.model = crudModel;
             $scope.editDiscount = {relocate: () => {}, hide: () => {}};
             $scope.editPricePopover = {relocate: () => {}};
+            $scope.claimConfirm = {show: () => {}};
             $httpBackend = _$httpBackend_;
             Object.defineProperties($state.params, {
                 id: {
@@ -61,6 +62,10 @@ describe('Ticket', () => {
             controller.card = {reload: () => {}};
             controller._ticket = ticket;
             controller._sales = sales;
+            controller.ticketConfig = [
+                {daysForWarningClaim: 1}
+            ];
+            $httpBackend.expect('GET', 'TicketConfigs').respond(200);
         }));
 
         describe('ticket() setter', () => {
@@ -113,7 +118,6 @@ describe('Ticket', () => {
             it('should make an HTTP GET query and return the worker mana', () => {
                 controller.edit = {};
                 const expectedAmount = 250;
-
                 $httpBackend.expect('GET', 'Tickets/1/getSalesPersonMana').respond(200, expectedAmount);
                 $httpBackend.expect('GET', 'Sales/usesMana').respond(200);
                 $httpBackend.expect('GET', 'WorkerManas/getCurrentWorkerMana').respond(200, expectedAmount);
@@ -279,7 +283,17 @@ describe('Ticket', () => {
         });
 
         describe('createClaim()', () => {
-            it('should perform a query and call windows open', () => {
+            it('should call to the claimConfirm show() method', () => {
+                jest.spyOn(controller.$.claimConfirm, 'show').mockReturnThis();
+
+                controller.createClaim();
+
+                expect(controller.$.claimConfirm.show).toHaveBeenCalledWith();
+            });
+        });
+
+        describe('onCreateClaimAccepted()', () => {
+            it('should perform a query and call window open', () => {
                 jest.spyOn(controller, 'resetChanges').mockReturnThis();
                 jest.spyOn(controller.$state, 'go').mockReturnThis();
 
@@ -290,7 +304,7 @@ describe('Ticket', () => {
 
                 const expectedParams = {ticketId: 1, sales: [firstSale]};
                 $httpBackend.expect('POST', `Claims/createFromSales`, expectedParams).respond(200, {id: 1});
-                controller.createClaim();
+                controller.onCreateClaimAccepted();
                 $httpBackend.flush();
 
                 expect(controller.resetChanges).toHaveBeenCalledWith();

modules/ticket/front/sale/locale/es.yml

@@ -40,4 +40,5 @@ Refund: Abono
 Promotion mana: Maná promoción
 Claim mana: Maná reclamación
 History: Historial
-Select lines to see the options: Seleccione lineas para ver las opciones
+Do you want to continue?: ¿Desea continuar?
+Claim out of time: Reclamación fuera de plazo

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.08.01",
+    "version": "23.12.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.08.01",
+            "version": "23.12.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
@@ -41,7 +41,6 @@
                 "puppeteer": "^18.0.5",
                 "read-chunk": "^3.2.0",
                 "require-yaml": "0.0.1",
-                "sharp": "^0.31.3",
                 "smbhash": "0.0.1",
                 "strong-error-handler": "^2.3.2",
                 "uuid": "^3.3.3",
@@ -5444,17 +5443,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/color": {
-            "version": "4.2.3",
-            "license": "MIT",
-            "dependencies": {
-                "color-convert": "^2.0.1",
-                "color-string": "^1.9.0"
-            },
-            "engines": {
-                "node": ">=12.5.0"
-            }
-        },
         "node_modules/color-convert": {
             "version": "2.0.1",
             "license": "MIT",
@@ -5469,14 +5457,6 @@
             "version": "1.1.4",
             "license": "MIT"
         },
-        "node_modules/color-string": {
-            "version": "1.9.1",
-            "license": "MIT",
-            "dependencies": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
-            }
-        },
         "node_modules/color-support": {
             "version": "1.1.3",
             "license": "ISC",
@@ -6149,6 +6129,7 @@
         },
         "node_modules/deep-extend": {
             "version": "0.6.0",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=4.0.0"
@@ -7630,13 +7611,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/expand-template": {
-            "version": "2.0.3",
-            "license": "(MIT OR WTFPL)",
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/expand-tilde": {
             "version": "2.0.2",
             "dev": true,
@@ -8891,10 +8865,6 @@
                 "assert-plus": "^1.0.0"
             }
         },
-        "node_modules/github-from-package": {
-            "version": "0.0.0",
-            "license": "MIT"
-        },
         "node_modules/glob": {
             "version": "7.2.0",
             "license": "ISC",
@@ -11516,6 +11486,7 @@
         },
         "node_modules/ini": {
             "version": "1.3.8",
+            "dev": true,
             "license": "ISC"
         },
         "node_modules/internal-ip": {
@@ -11645,10 +11616,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-arrayish": {
-            "version": "0.3.2",
-            "license": "MIT"
-        },
         "node_modules/is-bigint": {
             "version": "1.0.4",
             "dev": true,
@@ -15610,10 +15577,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/napi-build-utils": {
-            "version": "1.0.2",
-            "license": "MIT"
-        },
         "node_modules/natural-compare": {
             "version": "1.4.0",
             "dev": true,
@@ -15655,43 +15618,6 @@
                 "node": ">=4.0.0"
             }
         },
-        "node_modules/node-abi": {
-            "version": "3.28.0",
-            "license": "MIT",
-            "dependencies": {
-                "semver": "^7.3.5"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/semver": {
-            "version": "7.3.8",
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/node-abi/node_modules/yallist": {
-            "version": "4.0.0",
-            "license": "ISC"
-        },
         "node_modules/node-addon-api": {
             "version": "5.0.0",
             "license": "MIT"
@@ -17539,30 +17465,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/prebuild-install": {
-            "version": "7.1.1",
-            "license": "MIT",
-            "dependencies": {
-                "detect-libc": "^2.0.0",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^3.3.0",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^4.0.0",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            },
-            "bin": {
-                "prebuild-install": "bin.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/precond": {
             "version": "0.2.3",
             "engines": {
@@ -18057,6 +17959,7 @@
         },
         "node_modules/rc": {
             "version": "1.2.8",
+            "dev": true,
             "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
             "dependencies": {
                 "deep-extend": "^0.6.0",
@@ -19786,55 +19689,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/sharp": {
-            "version": "0.31.3",
-            "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-            "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "color": "^4.2.3",
-                "detect-libc": "^2.0.1",
-                "node-addon-api": "^5.0.0",
-                "prebuild-install": "^7.1.1",
-                "semver": "^7.3.8",
-                "simple-get": "^4.0.1",
-                "tar-fs": "^2.1.1",
-                "tunnel-agent": "^0.6.0"
-            },
-            "engines": {
-                "node": ">=14.15.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/libvips"
-            }
-        },
-        "node_modules/sharp/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/sharp/node_modules/semver": {
-            "version": "7.3.8",
-            "license": "ISC",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/sharp/node_modules/yallist": {
-            "version": "4.0.0",
-            "license": "ISC"
-        },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "license": "MIT",
@@ -19893,77 +19747,6 @@
             "version": "3.0.7",
             "license": "ISC"
         },
-        "node_modules/simple-concat": {
-            "version": "1.0.1",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/simple-get": {
-            "version": "4.0.1",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "decompress-response": "^6.0.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            }
-        },
-        "node_modules/simple-get/node_modules/decompress-response": {
-            "version": "6.0.0",
-            "license": "MIT",
-            "dependencies": {
-                "mimic-response": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/simple-get/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/simple-swizzle": {
-            "version": "0.2.2",
-            "license": "MIT",
-            "dependencies": {
-                "is-arrayish": "^0.3.1"
-            }
-        },
         "node_modules/simple-update-notifier": {
             "version": "1.0.7",
             "dev": true,
@@ -20864,6 +20647,7 @@
         },
         "node_modules/strip-json-comments": {
             "version": "2.0.1",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
@@ -30018,13 +29802,6 @@
                 "object-visit": "^1.0.0"
             }
         },
-        "color": {
-            "version": "4.2.3",
-            "requires": {
-                "color-convert": "^2.0.1",
-                "color-string": "^1.9.0"
-            }
-        },
         "color-convert": {
             "version": "2.0.1",
             "requires": {
@@ -30034,13 +29811,6 @@
         "color-name": {
             "version": "1.1.4"
         },
-        "color-string": {
-            "version": "1.9.1",
-            "requires": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
-            }
-        },
         "color-support": {
             "version": "1.1.3"
         },
@@ -30487,7 +30257,8 @@
             }
         },
         "deep-extend": {
-            "version": "0.6.0"
+            "version": "0.6.0",
+            "dev": true
         },
         "deep-is": {
             "version": "0.1.4"
@@ -31501,9 +31272,6 @@
                 }
             }
         },
-        "expand-template": {
-            "version": "2.0.3"
-        },
         "expand-tilde": {
             "version": "2.0.2",
             "dev": true,
@@ -32389,9 +32157,6 @@
                 "assert-plus": "^1.0.0"
             }
         },
-        "github-from-package": {
-            "version": "0.0.0"
-        },
         "glob": {
             "version": "7.2.0",
             "requires": {
@@ -34296,7 +34061,8 @@
             "version": "2.0.4"
         },
         "ini": {
-            "version": "1.3.8"
+            "version": "1.3.8",
+            "dev": true
         },
         "internal-ip": {
             "version": "4.3.0",
@@ -34372,9 +34138,6 @@
                 "has-tostringtag": "^1.0.0"
             }
         },
-        "is-arrayish": {
-            "version": "0.3.2"
-        },
         "is-bigint": {
             "version": "1.0.4",
             "dev": true,
@@ -37151,9 +36914,6 @@
                 "to-regex": "^3.0.1"
             }
         },
-        "napi-build-utils": {
-            "version": "1.0.2"
-        },
         "natural-compare": {
             "version": "1.4.0",
             "dev": true
@@ -37182,29 +36942,6 @@
         "nocache": {
             "version": "2.1.0"
         },
-        "node-abi": {
-            "version": "3.28.0",
-            "requires": {
-                "semver": "^7.3.5"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.8",
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "yallist": {
-                    "version": "4.0.0"
-                }
-            }
-        },
         "node-addon-api": {
             "version": "5.0.0"
         },
@@ -38439,23 +38176,6 @@
             "version": "3.3.1",
             "dev": true
         },
-        "prebuild-install": {
-            "version": "7.1.1",
-            "requires": {
-                "detect-libc": "^2.0.0",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^3.3.0",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^4.0.0",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            }
-        },
         "precond": {
             "version": "0.2.3"
         },
@@ -38789,6 +38509,7 @@
         },
         "rc": {
             "version": "1.2.8",
+            "dev": true,
             "requires": {
                 "deep-extend": "^0.6.0",
                 "ini": "~1.3.0",
@@ -40001,38 +39722,6 @@
                 "kind-of": "^6.0.2"
             }
         },
-        "sharp": {
-            "version": "0.31.3",
-            "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
-            "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
-            "requires": {
-                "color": "^4.2.3",
-                "detect-libc": "^2.0.1",
-                "node-addon-api": "^5.0.0",
-                "prebuild-install": "^7.1.1",
-                "semver": "^7.3.8",
-                "simple-get": "^4.0.1",
-                "tar-fs": "^2.1.1",
-                "tunnel-agent": "^0.6.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "semver": {
-                    "version": "7.3.8",
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                },
-                "yallist": {
-                    "version": "4.0.0"
-                }
-            }
-        },
         "shebang-command": {
             "version": "2.0.0",
             "requires": {
@@ -40073,34 +39762,6 @@
         "signal-exit": {
             "version": "3.0.7"
         },
-        "simple-concat": {
-            "version": "1.0.1"
-        },
-        "simple-get": {
-            "version": "4.0.1",
-            "requires": {
-                "decompress-response": "^6.0.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            },
-            "dependencies": {
-                "decompress-response": {
-                    "version": "6.0.0",
-                    "requires": {
-                        "mimic-response": "^3.1.0"
-                    }
-                },
-                "mimic-response": {
-                    "version": "3.1.0"
-                }
-            }
-        },
-        "simple-swizzle": {
-            "version": "0.2.2",
-            "requires": {
-                "is-arrayish": "^0.3.1"
-            }
-        },
         "simple-update-notifier": {
             "version": "1.0.7",
             "dev": true,
@@ -40746,7 +40407,8 @@
             }
         },
         "strip-json-comments": {
-            "version": "2.0.1"
+            "version": "2.0.1",
+            "dev": true
         },
         "strong-error-handler": {
             "version": "2.3.2",

package.json

@@ -44,7 +44,6 @@
         "puppeteer": "^18.0.5",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
-        "sharp": "^0.31.3",
         "smbhash": "0.0.1",
         "strong-error-handler": "^2.3.2",
         "uuid": "^3.3.3",