Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2022-10-25 09:58:17 +00:00
commit 3fd10dfc64
26 changed files with 557 additions and 192 deletions

View File

@ -17,61 +17,50 @@ module.exports = Self => {
});
Self.deleteTrashFiles = async options => {
let tx;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
if (process.env.NODE_ENV == 'test')
throw new UserError(`Action not allowed on the test environment`);
try {
if (process.env.NODE_ENV == 'test')
throw new UserError(`Action not allowed on the test environment`);
const models = Self.app.models;
const DmsContainer = models.DmsContainer;
const models = Self.app.models;
const DmsContainer = models.DmsContainer;
const trashDmsType = await models.DmsType.findOne({
where: {code: 'trash'}
}, myOptions);
const trashDmsType = await models.DmsType.findOne({
where: {code: 'trash'}
}, myOptions);
const date = new Date();
date.setMonth(date.getMonth() - 4);
const date = new Date();
date.setMonth(date.getMonth() - 4);
const dmsToDelete = await models.Dms.find({
where: {
and: [
{dmsTypeFk: trashDmsType.id},
{created: {lt: date}}
]
}
}, myOptions);
for (let dms of dmsToDelete) {
const pathHash = DmsContainer.getHash(dms.id);
const dmsContainer = await DmsContainer.container(pathHash);
const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
try {
await fs.unlink(dstFile);
} catch (err) {
continue;
}
const dstFolder = path.join(dmsContainer.client.root, pathHash);
try {
await fs.rmdir(dstFolder);
} catch (err) {}
await dms.destroy(myOptions);
const dmsToDelete = await models.Dms.find({
where: {
and: [
{dmsTypeFk: trashDmsType.id},
{created: {lt: date}}
]
}
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
}, myOptions);
throw e;
for (let dms of dmsToDelete) {
const pathHash = DmsContainer.getHash(dms.id);
const dmsContainer = await DmsContainer.container(pathHash);
const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
try {
await fs.unlink(dstFile);
} catch (err) {
continue;
}
const dstFolder = path.join(dmsContainer.client.root, pathHash);
try {
await fs.rmdir(dstFolder);
} catch (err) {
continue;
}
await dms.destroy(myOptions);
}
};
};

View File

@ -0,0 +1,31 @@
drop procedure `vn`.`ticket_closeByTicket`;
create
definer = root@localhost procedure `vn`.`ticket_closeByTicket`(IN vTicketFk int)
BEGIN
/**
* Inserta el ticket en la tabla temporal
* para ser cerrado.
*
* @param vTicketFk Id del ticket
*/
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_close;
CREATE TEMPORARY TABLE tmp.ticket_close ENGINE = MEMORY (
SELECT
t.id AS ticketFk
FROM ticket t
JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
JOIN alertLevel al ON al.id = ts.alertLevel
WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
AND t.id = vTicketFk
AND t.refFk IS NULL
GROUP BY t.id);
CALL ticket_close();
DROP TEMPORARY TABLE tmp.ticket_close;
END;

View File

@ -0,0 +1,5 @@
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
VALUES
('ClaimRma', '*', 'READ', 'ALLOW', 'ROLE', 'claimManager'),
('ClaimRma', '*', 'WRITE', 'ALLOW', 'ROLE', 'claimManager');

View File

@ -0,0 +1 @@
ALTER TABLE `vn`.`claim` ADD rma varchar(100) NULL ;

View File

@ -0,0 +1,7 @@
CREATE TABLE `vn`.`claimRma` (
id INT UNSIGNED auto_increment NOT NULL PRIMARY KEY,
code varchar(100) NOT NULL,
created timestamp DEFAULT current_timestamp() NOT NULL,
workerFk INTEGER UNSIGNED NOT NULL
)
ENGINE=InnoDB;

View File

@ -31,7 +31,7 @@ describe('Supplier fiscal data path', () => {
await page.clearInput(selectors.supplierFiscalData.taxNumber);
await page.write(selectors.supplierFiscalData.taxNumber, 'Wrong tax number');
await page.clearInput(selectors.supplierFiscalData.account);
await page.write(selectors.supplierFiscalData.account, 'edited account number');
await page.write(selectors.supplierFiscalData.account, '0123456789');
await page.autocompleteSearch(selectors.supplierFiscalData.sageWihholding, 'retencion estimacion objetiva');
await page.autocompleteSearch(selectors.supplierFiscalData.sageTaxType, 'operaciones no sujetas');
@ -70,7 +70,7 @@ describe('Supplier fiscal data path', () => {
it('should check the account was edited', async() => {
const result = await page.waitToGetProperty(selectors.supplierFiscalData.account, 'value');
expect(result).toEqual('edited account number');
expect(result).toEqual('0123456789');
});
it('should check the sageWihholding was edited', async() => {

View File

@ -6,8 +6,98 @@ export default class Textfield extends Field {
super($element, $scope, $compile);
this.buildInput('text');
}
set maxLength(value) {
this.input.maxLength = value;
}
get maxLength() {
return this.input.maxLength;
}
set insertable(value) {
if (this._insertable === value)
return;
if (this._insertable)
this.input.removeEventListener('keypress', this.keyPressListener);
if (value) {
this.keyPressListener = async e => await this.onKeyPress(e);
this.input.addEventListener('keypress', this.keyPressListener);
}
this._insertable = value;
}
get insertable() {
return this._insertable;
}
async onKeyPress(e) {
if (e.key == 'Enter')
return; // If the enter key is pressed dismiss it
let maxLength = this.maxLength;
// Call the function that obtains the current cursor position
let pointerPosition = getCaretPosition(e.target);
// If the cursor position is on the last allowed character,
// prevent any keystroke from doing anything
if (pointerPosition >= maxLength) {
e.preventDefault();
e.stopPropagation();
return;
}
// In case by any ways the input is longer than the max especified size, cut it to it.
let currentArrValue = e.target.value.slice(0, maxLength);
// Transform said input to a array with each character on one position
currentArrValue = currentArrValue.split('');
// Cut the array in 2 parts, one with everything right of the caret,
// and one with everything left to it
let rightToTheCaret = currentArrValue.slice(pointerPosition);
let leftToTheCaret = currentArrValue.slice(0, pointerPosition);
// Remove the first number on the array that was right of the caret
rightToTheCaret.shift();
// The part that was left to the caret is not modified in any way and is put back into the textField
e.target.value = leftToTheCaret.join('');
// Add one millisecond of delay to give the UI time to update,
// so that it detects the changes on the textField
await new Promise(r => setTimeout(r, 1));
// Add the values that should be right to the Caret back in the textField
e.target.value = e.target.value + rightToTheCaret.join('');
// Update the current pointer position so that it moves 1 position to the right
pointerPosition++;
e.target.setSelectionRange(pointerPosition, pointerPosition);
return false;
}
}
function getCaretPosition(targetElement) {
let caretPosition = 0;
if (targetElement.selectionStart || targetElement.selectionStart == 0) // Firefox Support
caretPosition = targetElement.selectionStart;
return caretPosition;
}
ngModule.vnComponent('vnTextfield', {
controller: Textfield
controller: Textfield,
bindings: {
maxLength: '<?',
insertable: '<?'
}
});

View File

@ -47,7 +47,7 @@ module.exports = Self => {
{
relation: 'claimState',
scope: {
fields: ['id', 'description']
fields: ['id', 'code', 'description']
}
},
{

View File

@ -2,6 +2,9 @@
"Claim": {
"dataSource": "vn"
},
"ClaimContainer": {
"dataSource": "claimStorage"
},
"ClaimBeginning": {
"dataSource": "vn"
},
@ -41,7 +44,7 @@
"ClaimObservation": {
"dataSource": "vn"
},
"ClaimContainer": {
"dataSource": "claimStorage"
}
"ClaimRma": {
"dataSource": "vn"
}
}

View File

@ -0,0 +1,30 @@
{
"name": "ClaimRma",
"base": "VnModel",
"options": {
"mysql": {
"table": "claimRma"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"code": {
"type": "string",
"required": true
},
"created": {
"type": "date"
}
},
"relations": {
"worker": {
"type": "belongsTo",
"model": "worker",
"foreignKey": "workerFk"
}
}
}

View File

@ -46,6 +46,9 @@
},
"packages": {
"type": "number"
},
"rma": {
"type": "string"
}
},
"relations": {
@ -54,6 +57,12 @@
"model": "ClaimState",
"foreignKey": "claimStateFk"
},
"claimRma": {
"type": "belongsTo",
"model": "ClaimRma",
"foreignKey": "rma",
"primaryKey": "code"
},
"client": {
"type": "belongsTo",
"model": "Client",

View File

@ -6,9 +6,9 @@ module.exports = Self => {
accepts: [
{
arg: 'id',
type: 'number',
type: 'string',
required: true,
description: 'The client id',
description: 'The route id',
http: {source: 'path'}
},
{

View File

@ -39,10 +39,7 @@ export default class Controller extends Section {
routes.push(route.id);
const routesId = routes.join(',');
this.vnReport.show('driver-route', {
authorization: this.vnToken.token,
routeId: routesId
});
this.vnReport.show(`Routes/${routesId}/driver-route-pdf`);
}
openClonationDialog() {

View File

@ -49,14 +49,12 @@ describe('Component vnRouteIndex', () => {
const data = controller.$.model.data;
data[0].checked = true;
data[2].checked = true;
const expectedParams = {
authorization: null,
routeId: '1,3'
};
const routeIds = '1,3';
controller.showRouteReport();
expect(controller.vnReport.show).toHaveBeenCalledWith('driver-route', expectedParams);
expect(controller.vnReport.show).toHaveBeenCalledWith(`Routes/${routeIds}/driver-route-pdf`);
});
});

View File

@ -60,6 +60,8 @@
vn-one
label="Account"
ng-model="$ctrl.supplier.account"
insertable="true"
max-length="10"
rule>
</vn-textfield>
<vn-autocomplete vn-one

View File

@ -52,7 +52,7 @@ module.exports = Self => {
JOIN province p ON p.id = c.provinceFk
JOIN country co ON co.id = p.countryFk
LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
WHERE al.code = 'PACKED'
WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
AND util.dayEnd(?)
AND t.refFk IS NULL

View File

@ -13,6 +13,7 @@
},
"dependencies": {
"axios": "^0.25.0",
"bcrypt": "^5.0.1",
"bmp-js": "^0.1.0",
"compression": "^1.7.3",
"fs-extra": "^5.0.0",
@ -40,7 +41,7 @@
"puppeteer": "^18.0.5",
"read-chunk": "^3.2.0",
"require-yaml": "0.0.1",
"sharp": "^0.27.1",
"sharp": "^0.31.0",
"smbhash": "0.0.1",
"strong-error-handler": "^2.3.2",
"uuid": "^3.3.3",

View File

@ -1,54 +0,0 @@
const express = require('express');
const path = require('path');
const fs = require('fs');
const templatesPath = path.resolve(__dirname, './templates');
const componentsPath = path.resolve(__dirname, './core/components');
module.exports = async app => {
global.appPath = __dirname;
process.env.OPENSSL_CONF = '/etc/ssl/';
// Extended locale intl polyfill
const IntlPolyfill = require('intl');
Intl.NumberFormat = IntlPolyfill.NumberFormat;
Intl.DateTimeFormat = IntlPolyfill.DateTimeFormat;
// Init database instance
require('./core/database').init();
// Init SMTP Instance
require('./core/smtp').init();
require('./core/mixins');
require('./core/filters');
require('./core/directives');
// Init router
require('./core/router')(app);
/**
* Serve component static files
*/
const componentsDir = fs.readdirSync(componentsPath);
componentsDir.forEach(componentName => {
const componentDir = path.join(componentsPath, '/', componentName);
const assetsDir = `${componentDir}/assets`;
app.use(`/api/${componentName}/assets`, express.static(assetsDir));
});
/**
* Serve static files
*/
const templatesDir = fs.readdirSync(templatesPath);
templatesDir.forEach(directory => {
const templateTypeDir = path.join(templatesPath, '/', directory);
const templates = fs.readdirSync(templateTypeDir);
templates.forEach(templateName => {
const templateDir = path.join(templatesPath, '/', directory, '/', templateName);
const assetsDir = `${templateDir}/assets`;
app.use(`/api/${templateName}/assets`, express.static(assetsDir));
});
});
};

42
print/core/cluster.js Normal file
View File

@ -0,0 +1,42 @@
const {Cluster} = require('puppeteer-cluster');
const log4js = require('log4js');
const {cpus} = require('os');
module.exports = {
init() {
if (!this.pool) {
Cluster.launch({
concurrency: Cluster.CONCURRENCY_CONTEXT,
maxConcurrency: cpus().length,
puppeteerOptions: {
args: [
'--no-sandbox',
'--disable-setuid-sandbox',
'--no-zygote'
]
}
})
.then(cluster => {
this.pool = cluster;
log4js.configure({
appenders: {
out: {type: 'stdout'}
},
categories: {default: {appenders: ['out'], level: 'info'}},
});
const logger = log4js.getLogger();
cluster.on('taskerror', (err, data, willRetry) => {
if (willRetry)
logger.warn(`[Print] => ${err.message}\nThis job will be retried`);
else
logger.error(`[Print] => ${err.message}`);
});
cluster.on('queue', () => logger.info('Printing task initialized by pool'));
});
}
}
};

View File

@ -1,5 +1,4 @@
const mysql = require('mysql2');
const config = require('./config.js');
const fs = require('fs-extra');
module.exports = {

View File

@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
const config = require('./config');
const Component = require('./component');
const puppeteer = require('puppeteer');
const Cluster = require('./cluster');
if (!process.env.OPENSSL_CONF)
process.env.OPENSSL_CONF = '/etc/ssl/';
@ -32,39 +32,30 @@ class Report extends Component {
if (fs.existsSync(fullPath))
options = require(optionsPath);
const browser = await puppeteer.launch({
headless: true,
args: [
'--no-sandbox',
'--disable-setuid-sandbox',
'--single-process',
'--no-zygote'
]
return new Promise(resolve => {
Cluster.pool.queue({}, async({page}) => {
await page.emulateMediaType('screen');
await page.setContent(template);
const element = await page.$('#pageFooter');
let footer = '\n';
if (element) {
footer = await page.evaluate(el => {
const html = el.innerHTML;
el.remove();
return html;
}, element);
}
options.headerTemplate = '\n';
options.footerTemplate = footer;
const stream = await page.pdf(options);
resolve(stream);
});
});
const page = (await browser.pages())[0];
await page.emulateMediaType('screen');
await page.setContent(template);
const element = await page.$('#pageFooter');
let footer = '\n';
if (element) {
footer = await page.evaluate(el => {
const html = el.innerHTML;
el.remove();
return html;
}, element);
}
options.headerTemplate = '\n';
options.footerTemplate = footer;
const buffer = await page.pdf(options);
await browser.close();
return buffer;
}
/**

View File

@ -7,10 +7,15 @@ const componentsPath = path.resolve(__dirname, './core/components');
module.exports = {
async boot(app) {
// Init database instance
// Extended locale intl polyfill
const IntlPolyfill = require('intl');
Intl.NumberFormat = IntlPolyfill.NumberFormat;
Intl.DateTimeFormat = IntlPolyfill.DateTimeFormat;
// Init database instance
require('./core/database').init(app.dataSources);
require('./core/smtp').init();
require('./core/cluster').init();
require('./core/mixins');
require('./core/filters');

290
print/package-lock.json generated
View File

@ -14,9 +14,10 @@
"js-yaml": "^3.13.1",
"jsonexport": "^3.2.0",
"juice": "^5.2.0",
"log4js": "^6.7.0",
"mysql2": "^1.7.0",
"nodemailer": "^4.7.0",
"puppeteer": "^18.0.5",
"puppeteer-cluster": "^0.23.0",
"qrcode": "^1.4.2",
"strftime": "^0.10.0",
"vue": "^2.6.10",
@ -37,12 +38,14 @@
"node_modules/@types/node": {
"version": "18.8.2",
"license": "MIT",
"optional": true
"optional": true,
"peer": true
},
"node_modules/@types/yauzl": {
"version": "2.10.0",
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"@types/node": "*"
}
@ -58,6 +61,7 @@
"node_modules/agent-base": {
"version": "6.0.2",
"license": "MIT",
"peer": true,
"dependencies": {
"debug": "4"
},
@ -138,7 +142,8 @@
},
"node_modules/balanced-match": {
"version": "1.0.2",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/base64-js": {
"version": "1.5.1",
@ -156,7 +161,8 @@
"url": "https://feross.org/support"
}
],
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/bcrypt-pbkdf": {
"version": "1.0.2",
@ -168,6 +174,7 @@
"node_modules/bl": {
"version": "4.1.0",
"license": "MIT",
"peer": true,
"dependencies": {
"buffer": "^5.5.0",
"inherits": "^2.0.4",
@ -181,6 +188,7 @@
"node_modules/brace-expansion": {
"version": "1.1.11",
"license": "MIT",
"peer": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -203,6 +211,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
@ -211,6 +220,7 @@
"node_modules/buffer-crc32": {
"version": "0.2.13",
"license": "MIT",
"peer": true,
"engines": {
"node": "*"
}
@ -265,7 +275,8 @@
},
"node_modules/chownr": {
"version": "1.1.4",
"license": "ISC"
"license": "ISC",
"peer": true
},
"node_modules/cliui": {
"version": "6.0.0",
@ -303,7 +314,8 @@
},
"node_modules/concat-map": {
"version": "0.0.1",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/core-util-is": {
"version": "1.0.2",
@ -312,6 +324,7 @@
"node_modules/cross-fetch": {
"version": "3.1.5",
"license": "MIT",
"peer": true,
"dependencies": {
"node-fetch": "2.6.7"
}
@ -372,6 +385,14 @@
"node": ">= 4"
}
},
"node_modules/date-format": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
"integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
"engines": {
"node": ">=4.0"
}
},
"node_modules/debug": {
"version": "4.3.4",
"license": "MIT",
@ -417,7 +438,8 @@
},
"node_modules/devtools-protocol": {
"version": "0.0.1045489",
"license": "BSD-3-Clause"
"license": "BSD-3-Clause",
"peer": true
},
"node_modules/dijkstrajs": {
"version": "1.0.2",
@ -468,6 +490,7 @@
"node_modules/end-of-stream": {
"version": "1.4.4",
"license": "MIT",
"peer": true,
"dependencies": {
"once": "^1.4.0"
}
@ -501,6 +524,7 @@
"node_modules/extract-zip": {
"version": "2.0.1",
"license": "BSD-2-Clause",
"peer": true,
"dependencies": {
"debug": "^4.1.1",
"get-stream": "^5.1.0",
@ -534,6 +558,7 @@
"node_modules/fd-slicer": {
"version": "1.1.0",
"license": "MIT",
"peer": true,
"dependencies": {
"pend": "~1.2.0"
}
@ -549,6 +574,11 @@
"node": ">=8"
}
},
"node_modules/flatted": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"node_modules/forever-agent": {
"version": "0.6.1",
"license": "Apache-2.0",
@ -570,7 +600,8 @@
},
"node_modules/fs-constants": {
"version": "1.0.0",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/fs-extra": {
"version": "7.0.1",
@ -586,7 +617,8 @@
},
"node_modules/fs.realpath": {
"version": "1.0.0",
"license": "ISC"
"license": "ISC",
"peer": true
},
"node_modules/function-bind": {
"version": "1.1.1",
@ -609,6 +641,7 @@
"node_modules/get-stream": {
"version": "5.2.0",
"license": "MIT",
"peer": true,
"dependencies": {
"pump": "^3.0.0"
},
@ -629,6 +662,7 @@
"node_modules/glob": {
"version": "7.2.3",
"license": "ISC",
"peer": true,
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@ -723,6 +757,7 @@
"node_modules/https-proxy-agent": {
"version": "5.0.1",
"license": "MIT",
"peer": true,
"dependencies": {
"agent-base": "6",
"debug": "4"
@ -757,7 +792,8 @@
"url": "https://feross.org/support"
}
],
"license": "BSD-3-Clause"
"license": "BSD-3-Clause",
"peer": true
},
"node_modules/image-size": {
"version": "0.7.5",
@ -772,6 +808,7 @@
"node_modules/inflight": {
"version": "1.0.6",
"license": "ISC",
"peer": true,
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@ -976,6 +1013,21 @@
"version": "4.5.0",
"license": "MIT"
},
"node_modules/log4js": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
"integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
"dependencies": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"flatted": "^3.2.7",
"rfdc": "^1.3.0",
"streamroller": "^3.1.3"
},
"engines": {
"node": ">=8.0"
}
},
"node_modules/long": {
"version": "4.0.0",
"license": "Apache-2.0"
@ -1021,6 +1073,7 @@
"node_modules/minimatch": {
"version": "3.1.2",
"license": "ISC",
"peer": true,
"dependencies": {
"brace-expansion": "^1.1.7"
},
@ -1030,7 +1083,8 @@
},
"node_modules/mkdirp-classic": {
"version": "0.5.3",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/ms": {
"version": "2.1.2",
@ -1092,6 +1146,7 @@
"node_modules/node-fetch": {
"version": "2.6.7",
"license": "MIT",
"peer": true,
"dependencies": {
"whatwg-url": "^5.0.0"
},
@ -1131,6 +1186,7 @@
"node_modules/once": {
"version": "1.4.0",
"license": "ISC",
"peer": true,
"dependencies": {
"wrappy": "1"
}
@ -1175,6 +1231,7 @@
"node_modules/path-is-absolute": {
"version": "1.0.1",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@ -1192,7 +1249,8 @@
},
"node_modules/pend": {
"version": "1.2.0",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/performance-now": {
"version": "2.1.0",
@ -1234,13 +1292,15 @@
"node_modules/progress": {
"version": "2.0.3",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/pseudomap": {
"version": "1.0.2",
@ -1253,6 +1313,7 @@
"node_modules/pump": {
"version": "3.0.0",
"license": "MIT",
"peer": true,
"dependencies": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@ -1269,6 +1330,7 @@
"version": "18.2.0",
"hasInstallScript": true,
"license": "Apache-2.0",
"peer": true,
"dependencies": {
"https-proxy-agent": "5.0.1",
"progress": "2.0.3",
@ -1279,9 +1341,21 @@
"node": ">=14.1.0"
}
},
"node_modules/puppeteer-cluster": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/puppeteer-cluster/-/puppeteer-cluster-0.23.0.tgz",
"integrity": "sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==",
"dependencies": {
"debug": "^4.3.3"
},
"peerDependencies": {
"puppeteer": ">=1.5.0"
}
},
"node_modules/puppeteer-core": {
"version": "18.2.0",
"license": "Apache-2.0",
"peer": true,
"dependencies": {
"cross-fetch": "3.1.5",
"debug": "4.3.4",
@ -1396,9 +1470,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/rfdc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
},
"node_modules/rimraf": {
"version": "3.0.2",
"license": "ISC",
"peer": true,
"dependencies": {
"glob": "^7.1.3"
},
@ -1524,6 +1604,32 @@
"node": ">=0.10.0"
}
},
"node_modules/streamroller": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
"integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
"dependencies": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"fs-extra": "^8.1.0"
},
"engines": {
"node": ">=8.0"
}
},
"node_modules/streamroller/node_modules/fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
},
"engines": {
"node": ">=6 <7 || >=8"
}
},
"node_modules/strftime": {
"version": "0.10.1",
"license": "MIT",
@ -1583,6 +1689,7 @@
"node_modules/tar-fs": {
"version": "2.1.1",
"license": "MIT",
"peer": true,
"dependencies": {
"chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2",
@ -1593,6 +1700,7 @@
"node_modules/tar-stream": {
"version": "2.2.0",
"license": "MIT",
"peer": true,
"dependencies": {
"bl": "^4.0.3",
"end-of-stream": "^1.4.1",
@ -1606,7 +1714,8 @@
},
"node_modules/through": {
"version": "2.3.8",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/tough-cookie": {
"version": "2.5.0",
@ -1621,7 +1730,8 @@
},
"node_modules/tr46": {
"version": "0.0.3",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/tunnel-agent": {
"version": "0.6.0",
@ -1640,6 +1750,7 @@
"node_modules/unbzip2-stream": {
"version": "1.4.3",
"license": "MIT",
"peer": true,
"dependencies": {
"buffer": "^5.2.1",
"through": "^2.3.8"
@ -1891,11 +2002,13 @@
},
"node_modules/webidl-conversions": {
"version": "3.0.1",
"license": "BSD-2-Clause"
"license": "BSD-2-Clause",
"peer": true
},
"node_modules/whatwg-url": {
"version": "5.0.0",
"license": "MIT",
"peer": true,
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
@ -1956,11 +2069,13 @@
},
"node_modules/wrappy": {
"version": "1.0.2",
"license": "ISC"
"license": "ISC",
"peer": true
},
"node_modules/ws": {
"version": "8.9.0",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=10.0.0"
},
@ -2026,6 +2141,7 @@
"node_modules/yauzl": {
"version": "2.10.0",
"license": "MIT",
"peer": true,
"dependencies": {
"buffer-crc32": "~0.2.3",
"fd-slicer": "~1.1.0"
@ -2038,11 +2154,13 @@
},
"@types/node": {
"version": "18.8.2",
"optional": true
"optional": true,
"peer": true
},
"@types/yauzl": {
"version": "2.10.0",
"optional": true,
"peer": true,
"requires": {
"@types/node": "*"
}
@ -2057,6 +2175,7 @@
},
"agent-base": {
"version": "6.0.2",
"peer": true,
"requires": {
"debug": "4"
}
@ -2107,10 +2226,12 @@
"version": "1.11.0"
},
"balanced-match": {
"version": "1.0.2"
"version": "1.0.2",
"peer": true
},
"base64-js": {
"version": "1.5.1"
"version": "1.5.1",
"peer": true
},
"bcrypt-pbkdf": {
"version": "1.0.2",
@ -2120,6 +2241,7 @@
},
"bl": {
"version": "4.1.0",
"peer": true,
"requires": {
"buffer": "^5.5.0",
"inherits": "^2.0.4",
@ -2131,6 +2253,7 @@
},
"brace-expansion": {
"version": "1.1.11",
"peer": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -2138,13 +2261,15 @@
},
"buffer": {
"version": "5.7.1",
"peer": true,
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
}
},
"buffer-crc32": {
"version": "0.2.13"
"version": "0.2.13",
"peer": true
},
"camelcase": {
"version": "5.3.1"
@ -2182,7 +2307,8 @@
}
},
"chownr": {
"version": "1.1.4"
"version": "1.1.4",
"peer": true
},
"cliui": {
"version": "6.0.0",
@ -2211,13 +2337,15 @@
"version": "2.20.3"
},
"concat-map": {
"version": "0.0.1"
"version": "0.0.1",
"peer": true
},
"core-util-is": {
"version": "1.0.2"
},
"cross-fetch": {
"version": "3.1.5",
"peer": true,
"requires": {
"node-fetch": "2.6.7"
}
@ -2260,6 +2388,11 @@
"mimer": "^1.0.0"
}
},
"date-format": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
"integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="
},
"debug": {
"version": "4.3.4",
"requires": {
@ -2279,7 +2412,8 @@
"version": "1.5.1"
},
"devtools-protocol": {
"version": "0.0.1045489"
"version": "0.0.1045489",
"peer": true
},
"dijkstrajs": {
"version": "1.0.2"
@ -2322,6 +2456,7 @@
},
"end-of-stream": {
"version": "1.4.4",
"peer": true,
"requires": {
"once": "^1.4.0"
}
@ -2340,6 +2475,7 @@
},
"extract-zip": {
"version": "2.0.1",
"peer": true,
"requires": {
"@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
@ -2358,6 +2494,7 @@
},
"fd-slicer": {
"version": "1.1.0",
"peer": true,
"requires": {
"pend": "~1.2.0"
}
@ -2369,6 +2506,11 @@
"path-exists": "^4.0.0"
}
},
"flatted": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"forever-agent": {
"version": "0.6.1"
},
@ -2381,7 +2523,8 @@
}
},
"fs-constants": {
"version": "1.0.0"
"version": "1.0.0",
"peer": true
},
"fs-extra": {
"version": "7.0.1",
@ -2392,7 +2535,8 @@
}
},
"fs.realpath": {
"version": "1.0.0"
"version": "1.0.0",
"peer": true
},
"function-bind": {
"version": "1.1.1"
@ -2408,6 +2552,7 @@
},
"get-stream": {
"version": "5.2.0",
"peer": true,
"requires": {
"pump": "^3.0.0"
}
@ -2420,6 +2565,7 @@
},
"glob": {
"version": "7.2.3",
"peer": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@ -2478,6 +2624,7 @@
},
"https-proxy-agent": {
"version": "5.0.1",
"peer": true,
"requires": {
"agent-base": "6",
"debug": "4"
@ -2490,13 +2637,15 @@
}
},
"ieee754": {
"version": "1.2.1"
"version": "1.2.1",
"peer": true
},
"image-size": {
"version": "0.7.5"
},
"inflight": {
"version": "1.0.6",
"peer": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@ -2642,6 +2791,18 @@
"lodash.uniq": {
"version": "4.5.0"
},
"log4js": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
"integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
"requires": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"flatted": "^3.2.7",
"rfdc": "^1.3.0",
"streamroller": "^3.1.3"
}
},
"long": {
"version": "4.0.0"
},
@ -2668,12 +2829,14 @@
},
"minimatch": {
"version": "3.1.2",
"peer": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"mkdirp-classic": {
"version": "0.5.3"
"version": "0.5.3",
"peer": true
},
"ms": {
"version": "2.1.2"
@ -2717,6 +2880,7 @@
},
"node-fetch": {
"version": "2.6.7",
"peer": true,
"requires": {
"whatwg-url": "^5.0.0"
}
@ -2735,6 +2899,7 @@
},
"once": {
"version": "1.4.0",
"peer": true,
"requires": {
"wrappy": "1"
}
@ -2758,7 +2923,8 @@
"version": "4.0.0"
},
"path-is-absolute": {
"version": "1.0.1"
"version": "1.0.1",
"peer": true
},
"path-key": {
"version": "2.0.1"
@ -2767,7 +2933,8 @@
"version": "1.0.7"
},
"pend": {
"version": "1.2.0"
"version": "1.2.0",
"peer": true
},
"performance-now": {
"version": "2.1.0"
@ -2787,10 +2954,12 @@
}
},
"progress": {
"version": "2.0.3"
"version": "2.0.3",
"peer": true
},
"proxy-from-env": {
"version": "1.1.0"
"version": "1.1.0",
"peer": true
},
"pseudomap": {
"version": "1.0.2"
@ -2800,6 +2969,7 @@
},
"pump": {
"version": "3.0.0",
"peer": true,
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@ -2810,6 +2980,7 @@
},
"puppeteer": {
"version": "18.2.0",
"peer": true,
"requires": {
"https-proxy-agent": "5.0.1",
"progress": "2.0.3",
@ -2817,8 +2988,17 @@
"puppeteer-core": "18.2.0"
}
},
"puppeteer-cluster": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/puppeteer-cluster/-/puppeteer-cluster-0.23.0.tgz",
"integrity": "sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==",
"requires": {
"debug": "^4.3.3"
}
},
"puppeteer-core": {
"version": "18.2.0",
"peer": true,
"requires": {
"cross-fetch": "3.1.5",
"debug": "4.3.4",
@ -2897,8 +3077,14 @@
"supports-preserve-symlinks-flag": "^1.0.0"
}
},
"rfdc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
},
"rimraf": {
"version": "3.0.2",
"peer": true,
"requires": {
"glob": "^7.1.3"
}
@ -2962,6 +3148,28 @@
"tweetnacl": "~0.14.0"
}
},
"streamroller": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
"integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
"requires": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"fs-extra": "^8.1.0"
},
"dependencies": {
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
}
}
}
},
"strftime": {
"version": "0.10.1"
},
@ -2996,6 +3204,7 @@
},
"tar-fs": {
"version": "2.1.1",
"peer": true,
"requires": {
"chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2",
@ -3005,6 +3214,7 @@
},
"tar-stream": {
"version": "2.2.0",
"peer": true,
"requires": {
"bl": "^4.0.3",
"end-of-stream": "^1.4.1",
@ -3014,7 +3224,8 @@
}
},
"through": {
"version": "2.3.8"
"version": "2.3.8",
"peer": true
},
"tough-cookie": {
"version": "2.5.0",
@ -3024,7 +3235,8 @@
}
},
"tr46": {
"version": "0.0.3"
"version": "0.0.3",
"peer": true
},
"tunnel-agent": {
"version": "0.6.0",
@ -3037,6 +3249,7 @@
},
"unbzip2-stream": {
"version": "1.4.3",
"peer": true,
"requires": {
"buffer": "^5.2.1",
"through": "^2.3.8"
@ -3197,10 +3410,12 @@
}
},
"webidl-conversions": {
"version": "3.0.1"
"version": "3.0.1",
"peer": true
},
"whatwg-url": {
"version": "5.0.0",
"peer": true,
"requires": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
@ -3241,10 +3456,12 @@
}
},
"wrappy": {
"version": "1.0.2"
"version": "1.0.2",
"peer": true
},
"ws": {
"version": "8.9.0",
"peer": true,
"requires": {}
},
"xtend": {
@ -3281,6 +3498,7 @@
},
"yauzl": {
"version": "2.10.0",
"peer": true,
"requires": {
"buffer-crc32": "~0.2.3",
"fd-slicer": "~1.1.0"

View File

@ -18,9 +18,10 @@
"js-yaml": "^3.13.1",
"jsonexport": "^3.2.0",
"juice": "^5.2.0",
"log4js": "^6.7.0",
"mysql2": "^1.7.0",
"nodemailer": "^4.7.0",
"puppeteer": "^18.0.5",
"puppeteer-cluster": "^0.23.0",
"qrcode": "^1.4.2",
"strftime": "^0.10.0",
"vue": "^2.6.10",

View File

@ -20,6 +20,6 @@ phone: Teléfono
warehouse: Almacén
salesPerson: Comercial
import: Importe
route: Ruta
route: Ruta
routeId: Ruta {0}
ticket: Ticket
ticket: Ticket