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

db/dump/fixtures.sql

@@ -2351,9 +2351,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

modules/route/back/methods/route/getExternalCmrs.js

@@ -80,13 +80,15 @@ module.exports = Self => {
         };
         const conn = Self.dataSource.connector;
 
-		let where = buildFilter(params, (param, value) => {return {[param]: value}});
+        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]}
+            filter.where = {'shipped': yesterday.toISOString().split('T')[0]};
         }
 
         const myOptions = {};

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)

modules/zone/back/methods/zone/getEventsFiltered.js

@@ -35,25 +35,17 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
+        ended = simpleDate(ended);
+        started = simpleDate(started);
+
         query = `
             SELECT *
                 FROM vn.zoneEvent
                 WHERE zoneFk = ?
-                AND ((type = 'indefinitely')
+                    AND (IFNULL(started, ?) <= ? AND IFNULL(ended,?) >= ?)
-                    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);
+            [zoneFk, started, ended, ended, started], myOptions);
 
         query = `
             SELECT e.*
@@ -75,4 +67,7 @@ module.exports = Self => {
 
         return {events, exclusions, geoExclusions};
     };
+    function simpleDate(date) {
+        return date.toISOString().split('T')[0];
+    }
 };

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();

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",