diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bc8ae021..dfdc563fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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
+
+### Added
+### Changed
+### Fixed
+
## [2350.01] - 2023-12-14
### Added
diff --git a/back/tests.js b/back/tests.js
index 97e548d33..efade4d7d 100644
--- a/back/tests.js
+++ b/back/tests.js
@@ -7,6 +7,10 @@ process.on('warning', warning => {
console.log(warning.stack);
});
+process.on('SIGUSR2', async() => {
+ if (container) await container.rm();
+});
+
process.on('exit', async function() {
if (container) await container.rm();
});
diff --git a/db/changes/235201/.gitkeep b/db/changes/235201/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index af181fd3b..3354e95c2 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -5,10 +5,6 @@ SET DEFAULT ROLE 'salix' FOR 'root'@'%';
CREATE SCHEMA IF NOT EXISTS `vn2008`;
CREATE SCHEMA IF NOT EXISTS `tmp`;
-CREATE ROLE 'salix';
-GRANT 'salix' TO 'root'@'%';
-SET DEFAULT ROLE 'salix' FOR 'root'@'%';
-
UPDATE `util`.`config`
SET `environment`= 'development';
@@ -2351,9 +2347,11 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`)
(8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'),
(10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun');
-INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`)
+INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`, `weekDays`)
VALUES
- (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
+ (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR), 'mon'),
+ (9, 'range', util.VN_CURDATE(), NULL, 'tue'),
+ (9, 'range', NULL, util.VN_CURDATE(), 'wed');
INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`)
VALUES
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index bed41c63b..8ed58a4e4 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -18,6 +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
# Actions
diff --git a/front/salix/module.js b/front/salix/module.js
index f8fa0faf0..62d6cac98 100644
--- a/front/salix/module.js
+++ b/front/salix/module.js
@@ -120,7 +120,7 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
messageT = 'Invalid login';
break;
case 403:
- messageT = 'Access denied';
+ messageT = exception.data?.error?.message || 'Access denied';
break;
case 502:
messageT = 'It seems that the server has fall down';
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index afefa77d1..7c2225dc9 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -130,13 +130,15 @@ module.exports = Self => {
am.name agencyName,
u.name AS workerUserName,
v.numberPlate AS vehiclePlateNumber,
- Date_format(r.time, '%H:%i') hour
+ Date_format(r.time, '%H:%i') hour,
+ eu.email
FROM route r
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
LEFT JOIN agency a ON a.id = am.agencyFk
LEFT JOIN vehicle v ON v.id = r.vehicleFk
LEFT JOIN worker w ON w.id = r.workerFk
- LEFT JOIN account.user u ON u.id = w.id`
+ LEFT JOIN account.user u ON u.id = w.id
+ LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk`
);
stmt.merge(conn.makeSuffix(filter));
diff --git a/modules/route/back/methods/route/getExternalCmrs.js b/modules/route/back/methods/route/getExternalCmrs.js
index 4750e53a1..3fc9798b0 100644
--- a/modules/route/back/methods/route/getExternalCmrs.js
+++ b/modules/route/back/methods/route/getExternalCmrs.js
@@ -3,99 +3,101 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => {
- Self.remoteMethod('getExternalCmrs', {
- description: 'Returns an array of external cmrs',
- accessType: 'READ',
- accepts: [
- {
- arg: 'filter',
- type: 'object',
- description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
- },
- {
- arg: 'cmrFk',
- type: 'integer',
- description: 'Searchs the route by id',
- },
- {
- arg: 'ticketFk',
- type: 'integer',
- description: 'The worker id',
- },
- {
- arg: 'routeFk',
- type: 'integer',
- description: 'The route id',
- },
- {
- arg: 'country',
- type: 'string',
- description: 'The agencyMode id',
- },
- {
- arg: 'clientFk',
- type: 'integer',
- description: 'The vehicle id',
- },
- {
- arg: 'hasCmrDms',
- type: 'boolean',
- description: 'The vehicle id',
- },
- {
- arg: 'shipped',
- type: 'date',
- description: 'The to date filter',
- },
- ],
- returns: {
- type: ['object'],
- root: true
- },
- http: {
- path: `/getExternalCmrs`,
- verb: 'GET'
- }
- });
+ Self.remoteMethod('getExternalCmrs', {
+ description: 'Returns an array of external cmrs',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+ },
+ {
+ arg: 'cmrFk',
+ type: 'integer',
+ description: 'Searchs the route by id',
+ },
+ {
+ arg: 'ticketFk',
+ type: 'integer',
+ description: 'The worker id',
+ },
+ {
+ arg: 'routeFk',
+ type: 'integer',
+ description: 'The route id',
+ },
+ {
+ arg: 'country',
+ type: 'string',
+ description: 'The agencyMode id',
+ },
+ {
+ arg: 'clientFk',
+ type: 'integer',
+ description: 'The vehicle id',
+ },
+ {
+ arg: 'hasCmrDms',
+ type: 'boolean',
+ description: 'The vehicle id',
+ },
+ {
+ arg: 'shipped',
+ type: 'date',
+ description: 'The to date filter',
+ },
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/getExternalCmrs`,
+ verb: 'GET'
+ }
+ });
- Self.getExternalCmrs = async(
- filter,
- cmrFk,
- ticketFk,
- routeFk,
- country,
- clientFk,
- hasCmrDms,
- shipped,
- options
- ) => {
- const params = {
- cmrFk,
- ticketFk,
- routeFk,
- country,
- clientFk,
- hasCmrDms,
- shipped,
- };
- const conn = Self.dataSource.connector;
+ Self.getExternalCmrs = async(
+ filter,
+ cmrFk,
+ ticketFk,
+ routeFk,
+ country,
+ clientFk,
+ hasCmrDms,
+ shipped,
+ options
+ ) => {
+ const params = {
+ cmrFk,
+ ticketFk,
+ routeFk,
+ country,
+ clientFk,
+ hasCmrDms,
+ shipped,
+ };
+ const conn = Self.dataSource.connector;
- let where = buildFilter(params, (param, value) => {return {[param]: value}});
- filter = mergeFilters(filter, {where});
+ let where = buildFilter(params, (param, value) => {
+ return {[param]: value};
+ });
+ filter = mergeFilters(filter, {where});
- if (!filter.where) {
- const yesterday = new Date();
- yesterday.setDate(yesterday.getDate() - 1);
- filter.where = {'shipped': yesterday.toISOString().split('T')[0]}
- }
+ if (!filter.where) {
+ const yesterday = new Date();
+ yesterday.setDate(yesterday.getDate() - 1);
+ filter.where = {'shipped': yesterday.toISOString().split('T')[0]};
+ }
- const myOptions = {};
+ const myOptions = {};
- if (typeof options == 'object')
- Object.assign(myOptions, options);
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
- let stmts = [];
- const stmt = new ParameterizedSQL(`
+ let stmts = [];
+ const stmt = new ParameterizedSQL(`
SELECT *
FROM (
SELECT t.cmrFk,
@@ -129,13 +131,13 @@ module.exports = Self => {
AND dm.code = 'DELIVERY'
AND t.cmrFk
) sub
- `);
+ `);
- stmt.merge(conn.makeSuffix(filter));
- const itemsIndex = stmts.push(stmt) - 1;
+ stmt.merge(conn.makeSuffix(filter));
+ const itemsIndex = stmts.push(stmt) - 1;
- const sql = ParameterizedSQL.join(stmts, ';');
- const result = await conn.executeStmt(sql);
- return itemsIndex === 0 ? result : result[itemsIndex];
- };
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql);
+ return itemsIndex === 0 ? result : result[itemsIndex];
+ };
};
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index 00310f33c..e782bd66e 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -63,7 +63,7 @@ module.exports = Self => {
const isAvailable = itemStock.available > 0;
- if (!isAvailable)
+ if (!isAvailable || !ctx.args.quantity)
throw new UserError(`This item is not available`);
if (request.saleFk)
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index 43f3c3680..c1d3f1a9c 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -141,7 +141,6 @@ describe('ticket filter()', () => {
});
it('should return the tickets that are not pending', async() => {
- pending('#6010 test intermitente');
const tx = await models.Ticket.beginTransaction({});
try {
diff --git a/modules/zone/back/methods/zone/getEventsFiltered.js b/modules/zone/back/methods/zone/getEventsFiltered.js
index b7875785d..85db76a58 100644
--- a/modules/zone/back/methods/zone/getEventsFiltered.js
+++ b/modules/zone/back/methods/zone/getEventsFiltered.js
@@ -35,44 +35,39 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- query = `
- SELECT *
- FROM vn.zoneEvent
- WHERE zoneFk = ?
- AND ((type = 'indefinitely')
- OR (type = 'day' AND dated BETWEEN ? AND ?)
- OR (type = 'range'
- AND (
- (started BETWEEN ? AND ?)
- OR
- (ended BETWEEN ? AND ?)
- OR
- (started <= ? AND ended >= ?)
- )
- )
- )
- ORDER BY type='indefinitely' DESC, type='range' DESC, type='day' DESC;`;
- const events = await Self.rawSql(query,
- [zoneFk, started, ended, started, ended, started, ended, started, ended], myOptions);
+ ended = simpleDate(ended);
+ started = simpleDate(started);
query = `
- SELECT e.*
- FROM vn.zoneExclusion e
- LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
- WHERE e.zoneFk = ?
- AND e.dated BETWEEN ? AND ?
- AND eg.zoneExclusionFk IS NULL;`;
+ SELECT *
+ FROM vn.zoneEvent
+ WHERE zoneFk = ?
+ AND (IFNULL(started, ?) <= ? AND IFNULL(ended,?) >= ?)
+ ORDER BY type='indefinitely' DESC, type='range' DESC, type='day' DESC;`;
+ const events = await Self.rawSql(query,
+ [zoneFk, started, ended, ended, started], myOptions);
+
+ query = `
+ SELECT e.*
+ FROM vn.zoneExclusion e
+ LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE e.zoneFk = ?
+ AND e.dated BETWEEN ? AND ?
+ AND eg.zoneExclusionFk IS NULL;`;
const exclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
query = `
- SELECT eg.*, e.zoneFk, e.dated, e.created, e.userFk
- FROM vn.zoneExclusion e
- LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
- WHERE e.zoneFk = ?
- AND e.dated BETWEEN ? AND ?
- AND eg.zoneExclusionFk IS NOT NULL;`;
+ SELECT eg.*, e.zoneFk, e.dated, e.created, e.userFk
+ FROM vn.zoneExclusion e
+ LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE e.zoneFk = ?
+ AND e.dated BETWEEN ? AND ?
+ AND eg.zoneExclusionFk IS NOT NULL;`;
const geoExclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
return {events, exclusions, geoExclusions};
};
+ function simpleDate(date) {
+ return date.toISOString().split('T')[0];
+ }
};
diff --git a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
index 6fd6bb994..7167b83de 100644
--- a/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
+++ b/modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js
@@ -30,7 +30,7 @@ describe('zone getEventsFiltered()', () => {
const result = await models.Zone.getEventsFiltered(9, today, today, options);
- expect(result.events.length).toEqual(1);
+ expect(result.events.length).toEqual(3);
expect(result.exclusions.length).toEqual(0);
await tx.rollback();
@@ -47,11 +47,12 @@ describe('zone getEventsFiltered()', () => {
const options = {transaction: tx};
const date = Date.vnNew();
date.setFullYear(date.getFullYear() - 2);
- const dateTomorrow = new Date(date.setDate(date.getDate() + 1));
+ const dateTomorrow = new Date(date);
+ dateTomorrow.setDate(dateTomorrow.getDate() + 1);
const result = await models.Zone.getEventsFiltered(9, date, dateTomorrow, options);
- expect(result.events.length).toEqual(0);
+ expect(result.events.length).toEqual(1);
expect(result.exclusions.length).toEqual(0);
await tx.rollback();
diff --git a/package.json b/package.json
index 586c963dd..66a5cd2fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.50.01",
+ "version": "23.52.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
diff --git a/print/templates/reports/driver-route/sql/tickets.sql b/print/templates/reports/driver-route/sql/tickets.sql
index 09e73819b..9d548c2b3 100644
--- a/print/templates/reports/driver-route/sql/tickets.sql
+++ b/print/templates/reports/driver-route/sql/tickets.sql
@@ -20,7 +20,7 @@ SELECT
u.nickName salesPersonName,
ipkg.itemPackingTypes
FROM route r
- LEFT JOIN ticket t ON t.routeFk = r.id
+ JOIN ticket t ON t.routeFk = r.id
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 45b6c3934..af1aaa423 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -16,6 +16,7 @@
| {{$t('clientId')}} |
{{client.id}} |
+
| {{$t('invoice')}} |
@@ -80,6 +81,9 @@
{{formatDate(ticket.shipped, '%d-%m-%Y')}}
+
+ {{ticket.street}}
+
{{ticket.nickname}}
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index a8385599c..35828c5de 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -2,9 +2,12 @@ SELECT
t.id,
t.shipped,
t.nickname,
- tto.description
+ tto.description,
+ t.addressFk,
+ a.street
FROM invoiceOut io
JOIN ticket t ON t.refFk = io.REF
+ JOIN `address` a ON a.id = t.addressFk
LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
AND tto.observationTypeFk = ot.id