.husky/addReferenceTag.js

@@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('path');
+
+function getCurrentBranchName(p = process.cwd()) {
+    if (!fs.existsSync(p)) return false;
+
+    const gitHeadPath = path.join(p, '.git', 'HEAD');
+
+    if (!fs.existsSync(gitHeadPath))
+        return getCurrentBranchName(path.resolve(p, '..'));
+
+    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
+    return headContent.trim().split('/')[2];
+}
+
+const branchName = getCurrentBranchName();
+
+if (branchName) {
+    const msgPath = `.git/COMMIT_EDITMSG`;
+    const msg = fs.readFileSync(msgPath, 'utf-8');
+    const reference = branchName.match(/^\d+/);
+
+    const referenceTag = `refs #${reference}`;
+    if (!msg.includes(referenceTag) && reference) {
+        const splitedMsg = msg.split(':');
+
+        if (splitedMsg.length > 1) {
+            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
+            fs.writeFileSync(msgPath, finalMsg);
+        }
+    }
+}
+

.husky/commit-msg

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+echo "Running husky commit-msg hook"
+npx --no-install commitlint --edit
+echo "Adding reference tag to commit message"
+node .husky/addReferenceTag.js
+

CHANGELOG.md

@@ -5,6 +5,8 @@ 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).
 
+## [24.18.01] - 2024-05-02
+
 ## [24.16.01] - 2024-04-18
 
 ## [2414.01] - 2024-04-04

back/methods/chat/spec/send.spec.js

@@ -3,14 +3,14 @@ const {models} = require('vn-loopback/server/server');
 describe('Chat send()', () => {
     it('should return true as response', async() => {
         let ctx = {req: {accessToken: {userId: 1}}};
-        let response = await models.Chat.send(ctx, '@salesPerson', 'I changed something');
+        let response = await models.Chat.send(ctx, '@salesperson', 'I changed something');
 
         expect(response).toEqual(true);
     });
 
     it('should return false as response', async() => {
         let ctx = {req: {accessToken: {userId: 18}}};
-        let response = await models.Chat.send(ctx, '@salesPerson', 'I changed something');
+        let response = await models.Chat.send(ctx, '@salesperson', 'I changed something');
 
         expect(response).toEqual(false);
     });

back/methods/collection/getSales.js

@@ -29,6 +29,7 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
         const $t = ctx.req.__;

back/methods/notification/getList.js

@@ -45,7 +45,6 @@ module.exports = Self => {
             });
             availableNotificationsMap.delete(active.notificationFk);
         }
-
         return {
             active: [...activeNotificationsMap.entries()],
             available: [...availableNotificationsMap.entries()]

back/methods/notification/specs/getList.spec.js

@@ -4,8 +4,8 @@ describe('NotificationSubscription getList()', () => {
     it('should return a list of available and active notifications of a user', async() => {
         const userId = 9;
         const {active, available} = await models.NotificationSubscription.getList(userId);
-        const notifications = await models.Notification.find({});
-        const totalAvailable = notifications.length - active.length;
+        const notifications = await models.NotificationSubscription.getAvailable(userId);
+        const totalAvailable = notifications.size - active.length;
 
         expect(active.length).toEqual(3);
         expect(available.length).toEqual(totalAvailable);

back/methods/url/getUrl.js

@@ -19,12 +19,12 @@ module.exports = Self => {
         }
     });
     Self.getUrl = async(appName = 'salix') => {
-        const {url} = await Self.app.models.Url.findOne({
+        const url = await Self.app.models.Url.findOne({
             where: {
                 appName,
                 environment: process.env.NODE_ENV || 'development'
             }
         });
-        return url;
+        return url?.url;
     };
 };

back/model-config.json

@@ -174,5 +174,8 @@
     },
     "WorkerActivityType": {
         "dataSource": "vn"
+    },
+    "ProductionConfig": {
+        "dataSource": "vn"
     }
 }

back/models/production-config.json

@@ -0,0 +1,19 @@
+{
+	"name": "ProductionConfig",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+		  "table": "productionConfig"
+		}
+	  },
+	"properties": {
+		"id": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"backupPrinterNotificationDelay": {
+			"type": "string"
+		}
+	}
+}

back/models/specs/notificationSubscription.spec.js

@@ -41,8 +41,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 9}};
-            const notificationSubscriptionId = 2;
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 2}, options);
 
             await tx.rollback();
         } catch (e) {
@@ -76,8 +75,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 9}};
-            const notificationSubscriptionId = 6;
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 6}, options);
 
             await tx.rollback();
         } catch (e) {
@@ -111,8 +109,7 @@ describe('loopback model NotificationSubscription', () => {
 
         try {
             const options = {transaction: tx, accessToken: {userId: 19}};
-            const notificationSubscriptionId = 4;
-            await models.NotificationSubscription.destroyAll({id: notificationSubscriptionId}, options);
+            await models.NotificationSubscription.destroyAll({id: 4}, options);
 
             await tx.rollback();
         } catch (e) {

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']};

db/dump/.dump/data.sql

@@ -3,7 +3,7 @@ USE `util`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-INSERT INTO `version` VALUES ('vn-database','10970','7ea917dc4db761955007c73bbd4667a0e44b8e9c','2024-04-05 07:49:24','10981');
+INSERT INTO `version` VALUES ('vn-database','10970','273507d3b711f272078e83880802d0ef7278d062','2024-04-05 10:33:29','10983');
 
 INSERT INTO `versionLog` VALUES ('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL);
 INSERT INTO `versionLog` VALUES ('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL);
@@ -762,7 +762,7 @@ INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 09:04:5
 INSERT INTO `role` VALUES (2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 09:04:58','2023-06-02 22:33:28',NULL);
 INSERT INTO `role` VALUES (3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
 INSERT INTO `role` VALUES (5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
-INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 09:04:58','2017-05-19 09:04:58',NULL);
+INSERT INTO `role` VALUES (6,'guest','Privilegios para usuarios no autenticados',1,'2017-05-19 09:04:58','2024-04-06 12:05:08',1437);
 INSERT INTO `role` VALUES (9,'developer','Desarrollador raso',1,'2017-05-19 09:04:58','2024-03-27 14:14:58',1437);
 INSERT INTO `role` VALUES (11,'account','Privilegios relacionados con el login',0,'2017-05-19 09:04:58','2017-09-20 19:06:35',NULL);
 INSERT INTO `role` VALUES (13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 09:04:58','2021-06-30 15:29:30',NULL);
@@ -1819,7 +1819,7 @@ INSERT INTO `ACL` VALUES (819,'Ticket','addSaleByCode','WRITE','ALLOW','ROLE','p
 INSERT INTO `ACL` VALUES (820,'TicketCollection','*','READ','ALLOW','ROLE','production');
 INSERT INTO `ACL` VALUES (821,'Ticket','clone','WRITE','ALLOW','ROLE','administrative');
 INSERT INTO `ACL` VALUES (822,'SupplierDms','*','*','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (823,'MailAlias','*','*','ALLOW','ROLE','developer');
+INSERT INTO `ACL` VALUES (823,'MailAlias','*','*','ALLOW','ROLE','developerBoss');
 
 INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee');
 INSERT INTO `fieldAcl` VALUES (2,'Client','contact','update','employee');

db/dump/.dump/privileges.sql

@@ -1378,6 +1378,7 @@ INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','maintenanceBos','machineDetai
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','deliveryBoss','vehicleState','jgallego@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','srt','grafana','expeditionState','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','buyer','specialPrice','jgallego@db-proxy1.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select,Insert,Update,Delete','');
+INSERT  IGNORE INTO `tables_priv` VALUES ('','vn','grafana','claimRatio','guillermo@db-proxy2.servers.dc.verdnatura.es','0000-00-00 00:00:00','Select','');
 /*!40000 ALTER TABLE `tables_priv` ENABLE KEYS */;
 
 /*!40000 ALTER TABLE `columns_priv` DISABLE KEYS */;

db/dump/.dump/structure.sql

@@ -11740,6 +11740,417 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Current Database: `floranet`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `floranet` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci */;
+
+USE `floranet`;
+
+--
+-- Table structure for table `addressPostCode`
+--
+
+DROP TABLE IF EXISTS `addressPostCode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `addressPostCode` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `addressFk` int(11) NOT NULL,
+  `postCode` varchar(30) NOT NULL,
+  `hoursInAdvance` int(10) unsigned NOT NULL DEFAULT 24,
+  `dayOfWeek` int(10) unsigned NOT NULL,
+  `deliveryCost` decimal(10,2) NOT NULL DEFAULT 0.00,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `addressPostCode_unique` (`postCode`,`addressFk`,`dayOfWeek`),
+  KEY `addressPostCode_address_FK` (`addressFk`),
+  CONSTRAINT `addressPostCode_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Client''s address registered for floranet network';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `builder`
+--
+
+DROP TABLE IF EXISTS `builder`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `builder` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemFk` int(11) NOT NULL,
+  `elementFk` int(11) NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  KEY `builder_FK` (`itemFk`),
+  KEY `builder_FK_1` (`elementFk`),
+  CONSTRAINT `builder_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `builder_FK_1` FOREIGN KEY (`elementFk`) REFERENCES `element` (`itemFk`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links handmade products with their elements';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `catalogue`
+--
+
+DROP TABLE IF EXISTS `catalogue`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `catalogue` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `price` decimal(10,2) NOT NULL,
+  `itemFk` int(11) NOT NULL,
+  `dated` date DEFAULT NULL,
+  `postalCode` varchar(12) DEFAULT NULL,
+  `type` varchar(50) DEFAULT NULL,
+  `image` varchar(255) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  `payed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `itemFk` (`itemFk`),
+  CONSTRAINT `catalogue_ibfk_1` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `element`
+--
+
+DROP TABLE IF EXISTS `element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `element` (
+  `itemFk` int(11) NOT NULL,
+  `typeFk` smallint(5) unsigned DEFAULT NULL,
+  `size` int(11) DEFAULT NULL,
+  `inkFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `name` varchar(30) DEFAULT NULL,
+  `quantity` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`itemFk`),
+  KEY `element_FK` (`itemFk`),
+  KEY `element_FK_1` (`typeFk`),
+  KEY `element_FK_2` (`inkFk`),
+  KEY `element_FK_3` (`originFk`),
+  CONSTRAINT `element_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_2` FOREIGN KEY (`inkFk`) REFERENCES `vn`.`ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `element_FK_3` FOREIGN KEY (`originFk`) REFERENCES `vn`.`origin` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Filtro para localizar posibles items que coincidan con la descripción';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `order`
+--
+
+DROP TABLE IF EXISTS `order`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `order` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `catalogueFk` int(11) DEFAULT NULL,
+  `customerName` varchar(100) DEFAULT NULL,
+  `email` varchar(100) DEFAULT NULL,
+  `customerPhone` varchar(15) DEFAULT NULL,
+  `message` varchar(255) DEFAULT NULL,
+  `deliveryName` varchar(100) DEFAULT NULL,
+  `address` varchar(200) DEFAULT NULL,
+  `deliveryPhone` varchar(100) DEFAULT NULL,
+  `isPaid` tinyint(1) NOT NULL DEFAULT 0,
+  `payed` datetime DEFAULT NULL,
+  `created` timestamp NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `catalogueFk` (`catalogueFk`),
+  CONSTRAINT `order_ibfk_1` FOREIGN KEY (`catalogueFk`) REFERENCES `catalogue` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping events for database 'floranet'
+--
+/*!50106 SET @save_time_zone= @@TIME_ZONE */ ;
+/*!50106 DROP EVENT IF EXISTS `clean` */;
+DELIMITER ;;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;;
+/*!50003 SET character_set_client  = utf8mb4 */ ;;
+/*!50003 SET character_set_results = utf8mb4 */ ;;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;;
+/*!50003 SET @saved_time_zone      = @@time_zone */ ;;
+/*!50003 SET time_zone             = 'SYSTEM' */ ;;
+/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `clean` ON SCHEDULE EVERY 1 DAY STARTS '2024-01-01 23:00:00' ON COMPLETION PRESERVE ENABLE DO BEGIN
+	DELETE 
+		FROM `order`
+		WHERE created < CURDATE()
+			AND isPaid = FALSE;
+
+	DELETE c.*
+		FROM catalogue c
+			LEFT JOIN `order` o ON o.catalogueFk = c.id 
+		WHERE c.created < CURDATE()
+			AND o.id IS NULL;
+END */ ;;
+/*!50003 SET time_zone             = @saved_time_zone */ ;;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;;
+/*!50003 SET character_set_results = @saved_cs_results */ ;;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;;
+DELIMITER ;
+/*!50106 SET TIME_ZONE= @save_time_zone */ ;
+
+--
+-- Dumping routines for database 'floranet'
+--
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `catalogue_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `catalogue_get`(vLanded DATE, vPostalCode VARCHAR(15))
+    READS SQL DATA
+BEGIN
+/**
+ * Returns list, price and all the stuff regarding the floranet items
+ * 
+ * @param vLanded Delivery date
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vLastCatalogueFk INT;
+
+	START TRANSACTION;
+
+	SELECT * FROM catalogue FOR UPDATE;
+
+	SELECT MAX(id) INTO vLastCatalogueFk
+		FROM catalogue;
+
+	INSERT INTO catalogue(
+					name,
+					price,
+					itemFk,
+					dated,
+					postalCode,
+					`type`,
+					image,
+					description
+				)
+		SELECT 	i.name,
+				i.`size`,
+				i.id,
+				vLanded,
+				vPostalCode,
+				it.name, 
+				CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), 
+				i.description
+			FROM vn.item i
+				JOIN vn.itemType it ON it.id = i.typeFk
+			WHERE it.code IN ('FNR','FNP');
+
+	SELECT *
+		FROM catalogue
+		WHERE id > IFNULL(vLastCatalogueFk,0);
+
+	COMMIT;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `contact_request` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `contact_request`(
+	vName VARCHAR(100),
+	vPhone VARCHAR(15),
+	vEmail VARCHAR(100),
+	vMessage TEXT)
+    READS SQL DATA
+BEGIN
+/**
+ * Set actions for contact request.
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `deliveryDate_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `deliveryDate_get`(vPostalCode VARCHAR(15))
+    READS SQL DATA
+BEGIN
+/**
+ * Returns available dates for this postalCode, in the next seven days
+ * 
+ * @param vPostalCode Delivery address postal code
+ */
+	DECLARE vCurrentDayOfWeek INT;
+
+	SET vCurrentDayOfWeek = DAYOFWEEK(NOW());
+
+	SELECT DISTINCT nextDay 
+		FROM (
+				SELECT CURDATE() + INTERVAL IF(
+					apc.dayOfWeek >= vCurrentDayOfWeek,
+					apc.dayOfWeek - vCurrentDayOfWeek,
+					7 - apc.dayOfWeek
+					) DAY nextDay,
+	NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
+	FROM addressPostCode apc
+		WHERE apc.postCode = vPostalCode
+	HAVING nextDay > minDeliveryTime) sub;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `order_confirm` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_confirm`(vCatalogueFk INT)
+    READS SQL DATA
+BEGIN
+/** Update order.isPaid field
+ *  
+ *  @param vCatalogueFk floranet.catalogue.id
+ * 
+ *  @returns floranet.order.isPaid
+ */
+	UPDATE `order`
+		SET isPaid = TRUE,
+			payed = NOW()
+		WHERE catalogueFk = vCatalogueFk;
+
+	SELECT isPaid
+		FROM `order`
+		WHERE catalogueFk = vCatalogueFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `order_put` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `order_put`(vOrder JSON)
+    READS SQL DATA
+BEGIN
+/**
+ *  Get and process an order
+ * 
+ * @param vOrder Data of the order
+ *
+ *	Customer data: <customerName>, <email>, <customerPhone>
+ *
+ *	Item data: <catalogueFk>, <message>	
+ *
+ *	Delivery data: <deliveryName>, <address>, <deliveryPhone>
+ *
+ */
+	INSERT IGNORE INTO `order`(
+							catalogueFk,
+							customerName,
+							email,
+							customerPhone,
+							message,
+							deliveryName,
+							address,
+							deliveryPhone
+	)
+		VALUES (JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.catalogueFk')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.email')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.customerPhone')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.message')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryName')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.address')),
+				JSON_UNQUOTE(JSON_EXTRACT(vOrder,'$.deliveryPhone'))
+		);
+
+	SELECT LAST_INSERT_ID() orderFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sliders_get` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection  = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sliders_get`()
+    READS SQL DATA
+BEGIN
+/**
+ * Returns list of url for sliders
+ */
+	SELECT 
+        CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
+        i.longName
+    FROM vn.item i
+        JOIN vn.itemType it ON it.id = i.typeFk
+    WHERE it.code IN ('FNR','FNP');
+    
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+
 --
 -- Current Database: `hedera`
 --
@@ -86045,6 +86456,12 @@ USE `edi`;
 /*!50001 SET character_set_results     = @saved_cs_results */;
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
+--
+-- Current Database: `floranet`
+--
+
+USE `floranet`;
+
 --
 -- Current Database: `hedera`
 --
@@ -91244,4 +91661,4 @@ USE `vn2008`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-04-05  7:59:52
+-- Dump completed on 2024-04-08  7:13:58

db/dump/.dump/triggers.sql

@@ -820,6 +820,12 @@ DELIMITER ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
 
+--
+-- Current Database: `floranet`
+--
+
+USE `floranet`;
+
 --
 -- Current Database: `hedera`
 --
@@ -10991,4 +10997,4 @@ USE `vn2008`;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-04-05  8:00:14
+-- Dump completed on 2024-04-08  7:14:22

db/dump/fixtures.after.sql

@@ -9,6 +9,10 @@ SET foreign_key_checks = 0;
 
 INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled)
     VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE);
+
+INSERT INTO util.binlogQueue (code,logName, `position`)
+    VALUES ('mylogger', 'bin.000001', 4);
+
 /* #5483
 INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk)
     VALUES(1, NULL, 1, 300, 1);
@@ -113,9 +117,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
     (100, 4, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 4, NULL, 1, 567, 1, '2022-07-12', 0, 0, 6, NULL, NULL, NULL, NULL, NULL),
     (100, 5, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 5, NULL, 1, 567, 1, '2022-07-12', 0, 0, 1, NULL, NULL, NULL, NULL, NULL);
 */
-INSERT INTO vn.sector (description,warehouseFk) VALUES
-    ('Sector One',1);
-
 INSERT INTO vn.saleGroup (userFk,parkingFk,sectorFk) VALUES
     (100,1,1);
 
@@ -156,16 +157,6 @@ INSERT INTO `vn`.`occupationCode` (`code`, `name`)
         ('b', 'Representantes de comercio'),
         ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras');
 
-INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`codempresa`)
-    VALUES
-        (36,20),
-        (43,20),
-        (76,20),
-        (1106,20),
-        (1107,20),
-        (1108,20),
-        (1109,20),
-        (1110,20);
 
 INSERT INTO `vn`.`trainingCourseType` (`id`, `name`)
     VALUES

db/dump/fixtures.before.sql

@@ -81,7 +81,7 @@ INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPre
 CALL `account`.`role_sync`;
 
 INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`)
-    SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
+    SELECT id, LOWER(name), CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2'
         FROM `account`.`role`
             ORDER BY id;
 
@@ -118,18 +118,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
 
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
-        (1101, 'BruceWayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
-        (1102, 'PetterParker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
-        (1103, 'ClarkKent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
-        (1104, 'TonyStark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
-        (1105, 'MaxEisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
-        (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
-        (1107, 'HankPym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
-        (1108, 'CharlesXavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
-        (1109, 'BruceBanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
-        (1110, 'JessicaJones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
-        (1111, 'Missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
-        (1112, 'Trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
+        (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
+        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
+        (1103, 'clarkkent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
+        (1104, 'tonystark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
+        (1105, 'maxeisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
+        (1106, 'davidcharleshaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'),
+        (1107, 'hankpym',            'Hank Pym',             '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com',            'en','1107'),
+        (1108, 'charlesxavier',      'Charles Xavier',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com',      'en','1108'),
+        (1109, 'brucebanner',        'Bruce Banner',         '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com',        'en','1109'),
+        (1110, 'jessicajones',       'Jessica Jones',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com',       'en','1110'),
+        (1111, 'missing',            'Missing',              '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29'),
+        (1112, 'trash',              'Trash',                '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL,                              'en','e7723f0b24ff05b32ed09d95196f2f29');
 
 UPDATE account.`user`
     SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR)
@@ -198,7 +198,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
         (2, 'printer2', 'path2', 1, 1   , NULL),
         (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
-UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
+UPDATE `vn`.`sector` SET `backupPrinterFk` = 1 WHERE id = 1;
 
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
@@ -1827,9 +1827,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`,
 
 INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`)
     VALUES
-        (1, util.VN_CURDATE(), 1,   1101, 18, 3, 0, util.VN_CURDATE(), 0,  11),
+        (1, util.VN_CURDATE(), 1,   1101, 19, 3, 0, util.VN_CURDATE(), 0,  11),
         (2, util.VN_CURDATE(), 4,   1101, 18, 3, 0, util.VN_CURDATE(), 1, 16),
-        (3, util.VN_CURDATE(), 3,   1101, 18, 1, 1, util.VN_CURDATE(), 5, 7),
+        (3, util.VN_CURDATE(), 3,   1101, 19, 1, 1, util.VN_CURDATE(), 5, 7),
         (4, util.VN_CURDATE(), 3,   1104, 18, 5, 0, util.VN_CURDATE(), 10, 8);
 
 INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
@@ -1880,7 +1880,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
 
 INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
+        (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
         (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
         (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
         (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
@@ -1973,6 +1973,15 @@ INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxC
         (4, 'Documentos',    1, 2.00,  1, 9,  1),
         (5, 'Documentos',    1, 2.00,  1, 8,  1);
 
+INSERT INTO `pbx`.`config` (id,defaultPrefix)
+    VALUES (1,'0034');
+
+INSERT INTO `pbx`.`prefix` (country, prefix)
+    VALUES
+        ('es', '0034'),
+        ('fr', '0033'),
+        ('pt', '00351');
+
 INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
     VALUES
         (1, 1010),
@@ -2813,7 +2822,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
         (5, 'modified-entry', 'An entry has been modified'),
         (6, 'book-entry-deleted', 'accounting entries deleted'),
-        (7, 'zone-included','An email to notify zoneCollisions');
+        (7, 'zone-included','An email to notify zoneCollisions'),
+        (8, 'backup-printer-selected','A backup printer has been selected');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2825,7 +2835,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (4, 1),
         (5, 9),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
@@ -2845,15 +2856,16 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
 	    (1, 9),
         (1, 3),
         (6, 9),
-        (7, 9);
+        (7, 9),
+        (8, 66);
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
 
-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
     VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
 
 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
     VALUES
@@ -2913,7 +2925,8 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'development', 'http://localhost:9000/#/'),
         ('hedera', 'development', 'http://localhost:9090/'),
-        ('salix', 'development', 'http://localhost:5000/#!/');
+        ('salix', 'development', 'http://localhost:5000/#!/'),
+        ('docuware', 'development', 'http://docuware');
 
 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
     VALUES
@@ -3742,5 +3755,23 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
 	VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man');
 
 INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
+    VALUES (1, 10, 9);
+
+INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
 	VALUES
-        (1, 10, 9);
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
+		(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
+
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
+	VALUES (1, 1);
+
+
+INSERT INTO vn.workerTeam(id, team, workerFk)
+    VALUES
+        (8, 1, 19);

db/routines/account/procedures/user_checkName.sql

@@ -7,7 +7,7 @@ BEGIN
  * The user name must only contain lowercase letters or, starting with second
  * character, numbers or underscores.
  */
-	IF vUserName NOT REGEXP '^[a-z0-9_-]*$' THEN
+	IF vUserName NOT REGEXP BINARY '^[a-z0-9_-]+$' THEN
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'INVALID_USER_NAME';
 	END IF;

db/routines/bi/procedures/greuge_dif_porte_add.sql

@@ -1,8 +1,19 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
 BEGIN
-	DECLARE datSTART DATETIME DEFAULT TIMESTAMPADD(DAY,-60,util.VN_CURDATE()); -- '2019-07-01'
-	DECLARE datEND DATETIME DEFAULT TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+
+/**
+ * Calculates the greuge based on a specific date in the 'grievanceConfig' table
+ */
+
+	DECLARE vDateStarted DATETIME;
+	DECLARE vDateEnded DATETIME DEFAULT (util.VN_CURDATE() - INTERVAL 1 DAY);
+	DECLARE vDaysAgoOffset INT;
+
+	SELECT daysAgoOffset INTO vDaysAgoOffset
+		FROM vn.greugeConfig;
+
+	SET vDateStarted = util.VN_CURDATE() - INTERVAL vDaysAgoOffset DAY;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.dp;
 
@@ -11,35 +22,34 @@ BEGIN
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT t.id ticketFk,
-			SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
+				SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) teorico,
+				00000.00 practico,
+				00000.00 greuge,
 				t.clientFk,
 				t.shipped
-		FROM
-			vn.ticket t
-			JOIN vn2008.Clientes cli ON cli.Id_cliente = t.clientFk
+			FROM vn.ticket t
+				JOIN vn.client c ON c.id = t.clientFk
 				LEFT JOIN vn.expedition e ON e.ticketFk = t.id
 				JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 				JOIN vn.zone z ON t.zoneFk = z.id
-		WHERE
-			t.shipped between datSTART AND datEND
-				AND cli.`real`
-				AND t.companyFk IN (442 , 567)
-				AND z.isVolumetric = FALSE
+				JOIN vn.company cp ON cp.id = t.companyFk
+			WHERE t.shipped BETWEEN vDateStarted AND vDateEnded
+				AND c.isRelevant
+				AND cp.code IN ('VNL', 'VNH')
+				AND NOT z.isVolumetric
 			GROUP BY t.id;
 
 	-- Agencias que cobran por volumen
 	INSERT INTO tmp.dp
 		SELECT sv.ticketFk,
-			SUM(IFNULL(sv.freight,0)) AS teorico,
-			00000.00 as practico,
-			00000.00 as greuge,
+				SUM(IFNULL(sv.freight,0)) teorico,
+				00000.00 practico,
+				00000.00 greuge,
 				sv.clientFk,
 				sv.shipped
 			FROM vn.saleVolume sv
 				JOIN vn.zone z ON z.id = sv.zoneFk
-				AND sv.shipped BETWEEN datSTART AND datEND
+					AND sv.shipped BETWEEN vDateStarted AND vDateEnded
 					AND z.isVolumetric != FALSE
 			GROUP BY sv.ticketFk;
 
@@ -48,11 +58,12 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(Cantidad * Valor) as valor
+		SELECT dp.ticketFk, SUM(s.quantity * sc.value) valor
 			FROM tmp.dp
-		JOIN vn2008.Movimientos m ON m.Id_Ticket = dp.ticketFk
-		JOIN vn2008.Movimientos_componentes mc using(Id_Movimiento)
-		WHERE mc.Id_Componente = 15
+				JOIN vn.sale s ON s.ticketFk = dp.ticketFk
+				JOIN vn.saleComponent sc ON sc.saleFk = s.id
+				JOIN vn.component c ON c.id = sc.componentFk
+			WHERE c.code = 'delivery'
 			GROUP BY dp.ticketFk;
 
 	UPDATE tmp.dp
@@ -64,10 +75,11 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.dp_aux
 		(PRIMARY KEY (ticketFk))
 		ENGINE = MEMORY
-		SELECT dp.ticketFk, sum(g.amount) Importe
+		SELECT dp.ticketFk, SUM(g.amount) Importe
 			FROM tmp.dp
 				JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
-				WHERE g.greugeTypeFk = 1 -- dif_porte
+				JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
+			WHERE gt.code = 'freightDifference' -- dif_porte
 			GROUP BY dp.ticketFk;
 
 	UPDATE tmp.dp
@@ -75,12 +87,12 @@ BEGIN
 		SET greuge = IFNULL(Importe,0);
 
 	INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk)
-		SELECT dp.clientFk
-			  , concat('dif_porte ', dp.ticketFk)
-			  , round(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) as Importe
-			  , date(dp.shipped)
-			  , 1
-			  ,dp.ticketFk
+		SELECT dp.clientFk,
+				CONCAT('dif_porte ', dp.ticketFk), 
+				ROUND(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) Importe,
+				date(dp.shipped), 
+				1,
+				dp.ticketFk
 			FROM tmp.dp
 				JOIN vn.client c ON c.id = dp.clientFk
 			WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1

db/routines/floranet/procedures/catalogue_get.sql

@@ -4,18 +4,30 @@ DELIMITER $$
 $$
 CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15))
 READS SQL DATA
-BEGIN
+proc:BEGIN
 /**
- * Returns list, price and all the stuff regarding the floranet items
+ * Returns list, price and all the stuff regarding the floranet items.
  * 
  * @param vLanded Delivery date
  * @param vPostalCode Delivery address postal code
  */
 	DECLARE vLastCatalogueFk INT;
+	DECLARE vLockName VARCHAR(20);
+	DECLARE vLockTime INT;
 
-	START TRANSACTION;
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK(vLockName);
 
-	SELECT * FROM catalogue FOR UPDATE;
+		RESIGNAL;
+	END;
+	
+	SET vLockName = 'catalogue_get';
+	SET vLockTime = 15;
+
+	IF NOT GET_LOCK(vLockName, vLockTime) THEN
+		LEAVE proc;
+	END IF;
 
 	SELECT MAX(id) INTO vLastCatalogueFk
 		FROM catalogue;
@@ -46,7 +58,7 @@ BEGIN
 		FROM catalogue
 		WHERE id > IFNULL(vLastCatalogueFk,0);
 
-	COMMIT;
+	DO RELEASE_LOCK(vLockName);
 
 END$$
 DELIMITER ;

db/routines/floranet/procedures/contact_request.sql

@@ -11,7 +11,7 @@ PROCEDURE floranet.contact_request(
 READS SQL DATA
 BEGIN
 /**
- * Set actions for contact request.
+ * Set actions for contact request
  * 
  * @param vPostalCode Delivery address postal code
  */

db/routines/floranet/procedures/deliveryDate_get.sql

@@ -6,7 +6,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPosta
     READS SQL DATA
 BEGIN
 /**
- * Returns available dates for this postalCode, in the next seven days
+ * Returns available dates for this postalCode, in the next seven days.
  * 
  * @param vPostalCode Delivery address postal code
  */

db/routines/floranet/procedures/order_confirm.sql

@@ -7,7 +7,7 @@ CREATE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk I
 READS SQL DATA
 
 BEGIN
-/** Update order.isPaid field
+/** Update order.isPaid field.
  *  
  *  @param vCatalogueFk floranet.catalogue.id
  * 

db/routines/floranet/procedures/order_put.sql

@@ -6,7 +6,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vOrder JSON)
 READS SQL DATA
 BEGIN
 /**
- *  Get and process an order
+ *  Get and process an order.
  * 
  * @param vOrder Data of the order
  *

db/routines/floranet/procedures/sliders_get.sql

@@ -6,14 +6,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.sliders_get()
 READS SQL DATA
 BEGIN
 /**
- * Returns list of url for sliders
+ * Returns list of url for sliders.
  */
 	SELECT 
         CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image) url,
         i.longName
     FROM vn.item i
         JOIN vn.itemType it ON it.id = i.typeFk
-    WHERE it.code IN ('FNR','FNP');
+    WHERE it.code IN ('FNR','FNP')
+   	LIMIT 3;
     
 END$$
 DELIMITER ;

db/routines/util/functions/binlogQueue_getDelay.sql

@@ -0,0 +1,45 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`binlogQueue_getDelay`(vCode VARCHAR(255))
+	RETURNS BIGINT
+	NOT DETERMINISTIC
+BEGIN
+/**
+ * Returns the difference between the current position of the binary log and
+ * the passed queue.
+ *
+ * @param vCode The queue code
+ * @return The difference in MB
+ */
+	DECLARE vCurLogName VARCHAR(255);
+	DECLARE vCurPosition BIGINT;
+	DECLARE vQueueLogName VARCHAR(255);
+	DECLARE vQueuePosition BIGINT;
+	DECLARE vDelay BIGINT;
+
+	SELECT VARIABLE_VALUE INTO vCurLogName
+		FROM information_schema.GLOBAL_STATUS
+		WHERE VARIABLE_NAME = 'BINLOG_SNAPSHOT_FILE';
+
+	SELECT VARIABLE_VALUE INTO vCurPosition
+		FROM information_schema.GLOBAL_STATUS
+		WHERE VARIABLE_NAME = 'BINLOG_SNAPSHOT_POSITION';
+
+	SELECT logName, `position`
+		INTO vQueueLogName, vQueuePosition
+		FROM binlogQueue
+		WHERE code = vCode;
+
+	IF vQueuePosition IS NULL THEN
+		RETURN NULL;
+	END IF;
+
+	SET vDelay =
+		vCurPosition - CAST(vQueuePosition AS SIGNED) +
+		@@max_binlog_size * (
+			CAST(REGEXP_SUBSTR(vCurLogName, '[0-9]+') AS SIGNED) -
+			CAST(REGEXP_SUBSTR(vQueueLogName, '[0-9]+') AS SIGNED)
+		);
+
+	RETURN ROUND(vDelay / POW(1024, 2));
+END$$
+DELIMITER ;

db/routines/vn/procedures/addAccountReconciliation.sql

@@ -0,0 +1,66 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
+BEGIN
+/**
+ * Updates duplicate records in the accountReconciliation table,
+ * by assigning them a new identifier and then inserts a new entry in the till table.
+ */
+	UPDATE accountReconciliation ar
+			JOIN (
+				SELECT id,
+						calculatedCode,
+						CONCAT(
+							calculatedCode, 
+							'(', 
+							ROW_NUMBER() OVER (PARTITION BY calculatedCode ORDER BY id),
+							')'
+						) newId
+					FROM accountReconciliation ar
+					WHERE calculatedCode IN (
+						SELECT calculatedCode
+							FROM accountReconciliation
+							GROUP BY calculatedCode
+							HAVING COUNT(*) > 1
+					)
+					ORDER BY calculatedCode, id
+			) sub2 ON ar.id = sub2.id
+		SET ar.calculatedCode = sub2.newId;
+	
+	INSERT INTO till(
+		dated,
+		isAccountable,
+		serie,
+		concept,
+		`in`,
+		`out`,
+		bankFk,
+		companyFk,
+		warehouseFk,
+		supplierAccountFk,
+		calculatedCode,
+		InForeignValue,
+		OutForeignValue,
+		workerFk
+	)
+		SELECT ar.operationDated,
+				TRUE,
+				'MB',
+				ar.concept, 
+				IF(ar.debitCredit = 'credit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				IF(ar.debitCredit = 'debit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				a.id,
+				sa.supplierFk,
+				arc.warehouseFk,
+				ar.supplierAccountFk,
+				ar.calculatedCode,
+				IF(ar.debitCredit = 'credit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				IF(ar.debitCredit = 'debit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
+				account.myUser_getId()
+			FROM accountReconciliation ar
+				JOIN supplierAccount sa ON sa.id = ar.supplierAccountFk
+				JOIN accounting a ON a.id = sa.accountingFk
+				LEFT JOIN till t ON t.calculatedCode = ar.calculatedCode
+				JOIN accountReconciliationConfig arc
+			WHERE t.id IS NULL;
+END$$
+DELIMITER ;

db/routines/vn/procedures/agencyVolume.sql

@@ -0,0 +1,38 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
+BEGIN
+/**
+ * Calculates and presents information on shipment and packaging volumes 
+ * for agencies that are not owned for a specific period.
+ */
+	DECLARE vStarted DATETIME DEFAULT util.VN_CURDATE();
+	DECLARE vEnded DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
+
+	SELECT ag.id agency_id,
+			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
+			COUNT(*) expediciones,
+			SUM(t.packages) Bultos,
+			SUM(tpe.boxes) Faltan
+		FROM ticket t
+			JOIN warehouse w ON w.id = t.warehouseFk
+			JOIN country c ON w.countryFk = c.id
+			JOIN address a ON a.id = t.addressFk
+			JOIN agencyMode am ON am.id = t.agencyModeFk
+			JOIN agency ag ON ag.id = am.agencyFk
+			JOIN (
+				SELECT sv.ticketFk, 
+						CEIL(1000 * SUM(sv.volume) / vc.standardFlowerBox) boxes
+					FROM ticket t
+						JOIN saleVolume sv ON sv.ticketFk = t.id
+						JOIN volumeConfig vc
+					WHERE t.shipped BETWEEN vStarted AND vEnded
+						AND (t.packages IS NULL OR NOT t.packages)
+					GROUP BY t.id
+			) tpe ON tpe.ticketFk = t.id
+		WHERE t.shipped BETWEEN vStarted AND vEnded
+			AND NOT ag.isOwn
+		GROUP BY ag.id
+		ORDER BY Agencia;
+
+END$$
+DELIMITER ;

db/routines/vn/procedures/client_getRisk.sql

@@ -0,0 +1,35 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_getRisk`(
+	vDate DATE
+)
+BEGIN
+/**
+ * Retorna el riesgo de los clientes activos.
+ *
+ * @param vDate Fecha a calcular
+ */
+	CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt
+		(PRIMARY KEY (clientFk))
+		ENGINE = MEMORY
+		SELECT id clientFk
+			FROM client
+			WHERE isActive;
+
+	CALL client_getDebt(vDate);
+
+	SELECT c.socialName,
+			r.clientFk,
+			c.credit,
+			CAST(r.risk AS DECIMAL (10,2)) risk,
+			CAST(c.credit - r.risk AS DECIMAL (10,2)) difference,
+			co.country
+		FROM client c
+			JOIN tmp.risk r ON r.clientFk = c.id
+			JOIN country co ON co.id = c.countryFk
+		GROUP BY c.id;
+
+	DROP TEMPORARY TABLE
+		tmp.risk,
+		tmp.clientGetDebt;
+END$$
+DELIMITER ;

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -1,42 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`creditInsurance_getRisk`()
-BEGIN
-/**
- * Devuelve el riesgo de los clientes que estan asegurados
- */
-	CREATE OR REPLACE TEMPORARY TABLE tmp.client_list
-	    (PRIMARY KEY (Id_Cliente))
-	    ENGINE = MEMORY
-	        SELECT * FROM (
-	                SELECT cc.client Id_Cliente, ci.grade
-	                    FROM creditClassification cc
-	                        JOIN creditInsurance ci ON cc.id = ci.creditClassification
-	                    WHERE dateEnd IS NULL
-	                ORDER BY ci.creationDate DESC
-	                LIMIT 10000000000000000000) t1
-	            GROUP BY Id_Cliente;
-
-	CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
-
-	SELECT
-	        c.id,
-	        c.name,
-	        c.credit clientCredit,
-	        c.creditInsurance solunion,
-	        CAST(r.risk AS DECIMAL(10,0)) risk,
-	        CAST(c.creditInsurance - r.risk AS DECIMAL(10,0)) riskAlive,
-	        cac.invoiced billedAnnually,
-	        c.dueDay,
-	        ci.grade,
-	        c2.country
-	    FROM tmp.client_list ci
-	        LEFT JOIN tmp.risk r ON r.Id_Cliente = ci.Id_Cliente
-	        JOIN client c ON c.id = ci.Id_Cliente
-	        JOIN bs.clientAnnualConsumption cac ON c.id = cac.clientFk
-	        JOIN country c2 ON c2.id = c.countryFk
-	    GROUP BY c.id;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-END$$
-DELIMITER ;

db/routines/vn/procedures/entry_checkBooked.sql

@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry`
 		WHERE id = vSelf;
 
-	IF vIsBooked THEN
+	IF vIsBooked AND NOT @isModeInventory THEN
 		CALL util.throw('Entry is already booked');
 	END IF;
 END$$

db/routines/vn/procedures/inventoryMake.sql

@@ -233,8 +233,6 @@ BEGIN
 
 	UPDATE config SET inventoried = vInventoryDate;
 	
-	SET @isModeInventory := FALSE;
-	
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		(INDEX(entryId)) ENGINE = MEMORY
 		SELECT e.id entryId,
@@ -262,6 +260,8 @@ BEGIN
 		FROM travel t
 			JOIN tEntryToDelete tmp ON tmp.travelId = t.id;
 
+	SET @isModeInventory := FALSE;
+
 	DROP TEMPORARY TABLE IF EXISTS tEntryToDelete;
 
 	COMMIT;

db/routines/vn/procedures/invoiceOut_new.sql

@@ -68,16 +68,21 @@ BEGIN
 	DELETE ti.*
 		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
+			LEFT JOIN address a ON a.id = t.addressFk
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
 			JOIN supplier su ON su.id = t.companyFk
 			JOIN client c ON c.id = t.clientFk
-			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+				AND itc.countryFk = su.countryFk
 		WHERE (YEAR(t.shipped) < 2001 AND  t.isDeleted)
 			OR c.isTaxDataChecked = FALSE
 			OR t.isDeleted
 			OR c.hasToInvoice = FALSE
-			OR itc.id IS NULL;
+			OR itc.id IS NULL
+			OR a.id IS NULL 
+			OR (vTaxArea = 'WORLD' 
+				AND (a.customsAgentFk IS NULL OR a.incotermsFk IS NULL));
 
 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice

db/routines/vn/procedures/itemShelving_add.sql

@@ -21,7 +21,6 @@ BEGIN
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
-
 	SET vQuantity = vQuantity * vPacking;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN

db/routines/vn/procedures/riskAllClients.sql

@@ -1,29 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`riskAllClients`(maxRiskDate DATE)
-BEGIN
-	
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-    CREATE TEMPORARY TABLE tmp.client_list
-    (PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT id Id_Cliente, null grade FROM vn.client;
-    
-    CALL vn2008.risk_vs_client_list(maxRiskDate);
-    
-	SELECT 
-		c.RazonSocial,
-        c.Id_Cliente,
-        c.Credito,
-        CAST(r.risk as DECIMAL (10,2)) risk,
-        CAST(c.Credito - r.risk as DECIMAL (10,2)) Diferencia,
-        c.Id_Pais
-	FROM
-		vn2008.Clientes c
-			JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente
-			JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
-		GROUP BY c.Id_cliente;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-    DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
-END$$
-DELIMITER ;

db/routines/vn/procedures/ticket_doCmr.sql

@@ -29,7 +29,6 @@ BEGIN
 				JOIN province p ON p.id = a.provinceFk
 				JOIN country co ON co.id = p.countryFk
 				JOIN agencyMode am ON am.id = t.agencyModeFk
-				JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 				JOIN warehouse w ON w.id = t.warehouseFk
 				JOIN company com ON com.id = t.companyFk
 				JOIN client c2 ON c2.id = com.clientFk
@@ -38,12 +37,10 @@ BEGIN
 				LEFT JOIN route r ON r.id = t.routeFk
 				LEFT JOIN worker wo ON wo.id = r.workerFk
 				LEFT JOIN vehicle v ON v.id = r.vehicleFk
-			WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
-				AND al.code IN ('PACKED', 'DELIVERED')
+			WHERE al.code IN ('PACKED', 'DELIVERED')
 				AND co.code <> 'ES'
 				AND am.name <> 'ABONO'
 				AND w.code = 'ALG'
-				AND dm.code = 'DELIVERY'
 				AND t.id = vSelf
 			GROUP BY t.id;
 	

db/routines/vn2008/procedures/account_conciliacion_add.sql

@@ -1,33 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`account_conciliacion_add`()
-BEGIN
-	UPDATE account_conciliacion ac
-		JOIN
-		(
-			SELECT idaccount_conciliacion, @c:= if(@id = id_calculated, @c + 1, 1) contador, 
-					@id:= id_calculated as id_calculated, concat(id_calculated,'(',@c,')') as new_id   
-				FROM account_conciliacion
-			JOIN
-				(
-				select id_calculated, count(*) rep, @c:= 0, @id:= concat('-',id_calculated) 
-					from account_conciliacion
-					group by id_calculated
-					having rep > 1
-				) sub using(id_calculated)
-		) sub2 using(idaccount_conciliacion)
-	SET ac.id_calculated = sub2.new_id;
-
-	INSERT INTO Cajas(Cajafecha, Partida, Serie, Concepto, Entrada, 
-					Salida, Id_Banco,empresa_id, warehouse_id,
-					Proveedores_account_id, id_calculated, InForeignValue, OutForeignValue, Id_Trabajador)
-		SELECT Fechaoperacion, TRUE, 'MB', ac.Concepto, IF(DebeHaber = 2 AND currencyFk = 1, importe,null), 
-				IF(DebeHaber = 1 AND currencyFk = 1, importe, null), a.id, sa.supplierFk, 1,
-				ac.Id_Proveedores_account, ac.id_calculated, IF(DebeHaber = 2 AND NOT currencyFk = 1, importe, null),
-				IF(DebeHaber = 1 AND NOT currencyFk = 1, importe, null), account.myUser_getId()
-			FROM account_conciliacion ac
-				JOIN vn.supplierAccount sa on sa.id = ac.Id_Proveedores_account
-				JOIN vn.accounting a ON a.id = sa.accountingFk
-				LEFT JOIN Cajas c on c.id_calculated = ac.id_calculated
-			WHERE c.Id_Caja IS NULL;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/agencia_volume.sql

@@ -1,44 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencia_volume`()
-BEGIN
-	DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
-	DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-	CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-	(
-		ticketFk INT PRIMARY KEY
-		,boxes INT DEFAULT 0
-	);
-
-	INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
-	SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
-		FROM vn.ticket t
-			JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-			JOIN vn.volumeConfig vc
-		WHERE t.shipped BETWEEN vStarted AND vEnded
-			AND IFNULL(t.packages,0) = 0
-		GROUP BY t.id;
-	SELECT * FROM 
-	(
-	SELECT 	ag.id agency_id,
-			CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia, 
-			count(*) expediciones, 
-			sum(t.packages) Bultos, 
-			sum(tpe.boxes) Faltan
-		FROM vn.ticket t
-			JOIN vn.warehouse w ON w.id = t.warehouseFk 
-			JOIN vn.country c ON w.countryFk = c.id
-			JOIN vn.address a ON a.id = t.addressFk 
-			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-			JOIN vn.agency ag ON ag.id = am.agencyFk 
-			JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-		WHERE t.shipped BETWEEN vStarted AND vEnded
-			AND ag.isOwn = FALSE
-		GROUP BY ag.id
-	) sub 
-	ORDER BY Agencia;
-			
-	DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/article.sql

@@ -1,15 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article`()
-BEGIN
-/**
- * Crea la tabla temporal: article_inventory
- */  
-	DROP TEMPORARY TABLE IF EXISTS article_inventory;
-	CREATE TEMPORARY TABLE article_inventory
-	(
-		`article_id` INT(11) NOT NULL PRIMARY KEY,
-		`future` DATETIME
-	)
-	ENGINE = MEMORY;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/risk_vs_client_list.sql

@@ -1,84 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`risk_vs_client_list`(maxRiskDate DATE)
-BEGIN
-/**
- * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list
- *
- * @deprecated usar vn.client_getDebt
- * @param maxRiskDate Fecha maxima de los registros
- * @return table tmp.risk
- */
-	DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(util.VN_CURDATE()) - 60, util.VN_CURDATE());
-	DECLARE endingDate DATETIME;
-	DECLARE MAX_RISK_ALLOWED INT DEFAULT 200;
-
-	SET maxRiskDate = IFNULL(maxRiskDate, util.VN_CURDATE());
-	SET endingDate = TIMESTAMP(maxRiskDate, '23:59:59');
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_2;
-	CREATE TEMPORARY TABLE tmp.client_list_2
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.client_list_3;
-	CREATE TEMPORARY TABLE tmp.client_list_3
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT *
-			FROM tmp.client_list;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.tickets_sin_facturar;
-	CREATE TEMPORARY TABLE tmp.tickets_sin_facturar
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-			SELECT t.Id_Cliente, floor(IF(cl.isVies, 1, 1.1) * sum(Cantidad * Preu * (100 - Descuento) / 100)) as total
-			FROM Movimientos m
-				JOIN Tickets t on m.Id_Ticket = t.Id_Ticket
-				JOIN tmp.client_list c on c.Id_Cliente = t.Id_Cliente
-				JOIN vn.client cl ON cl.id = t.Id_Cliente
-			WHERE Factura IS NULL
-				AND Fecha BETWEEN startingDate AND endingDate
-			GROUP BY t.Id_Cliente;      
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.risk;
-	CREATE TEMPORARY TABLE tmp.risk
-		(PRIMARY KEY (Id_Cliente))
-		ENGINE = MEMORY
-		SELECT Id_Cliente, SUM(amount) risk, sum(saldo) saldo
-			FROM Clientes c
-			JOIN (
-				SELECT clientFk, SUM(amount) amount,SUM(amount) saldo 
-					FROM vn.clientRisk
-						JOIN tmp.client_list on Id_Cliente = clientFk
-					GROUP BY clientFk
-				UNION ALL
-				SELECT Id_Cliente, SUM(Entregado),SUM(Entregado)
-					FROM Recibos
-						JOIN tmp.client_list_2 using(Id_Cliente)
-					WHERE  Fechacobro > endingDate
-					GROUP BY Id_Cliente
-				UNION ALL
-				SELECT Id_Cliente, total,0
-					FROM tmp.tickets_sin_facturar
-				UNION ALL
-				SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)), CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2))
-					FROM hedera.tpvTransaction t
-						JOIN tmp.client_list_3 on Id_Cliente = t.clientFk
-					WHERE  t.receiptFk IS NULL
-						AND t.status = 'ok'
-					GROUP BY t.clientFk
-			) t ON c.Id_Cliente = t.clientFk
-			WHERE c.activo != FALSE 
-			GROUP BY c.Id_Cliente;
-			
-	DELETE r.*
-		FROM tmp.risk r
-			JOIN vn2008.Clientes c on c.Id_Cliente = r.Id_Cliente
-			JOIN vn2008.pay_met pm on pm.id = c.pay_met_id
-		WHERE IFNULL(r.saldo,0) < 10
-			AND r.risk <= MAX_RISK_ALLOWED
-			AND pm.`name` = 'TARJETA';
-END$$
-DELIMITER ;

db/routines/vn2008/views/Proveedores.sql

@@ -23,7 +23,7 @@ AS SELECT `s`.`id` AS `Id_Proveedor`,
 	`s`.`isOfficial` AS `oficial`,
 	`s`.`workerFk` AS `workerFk`,
 	`s`.`payDay` AS `pay_day`,
-	`s`.`isSerious` AS `serious`,
+	`s`.`isReal` AS `serious`,
 	`s`.`note` AS `notas`,
 	`s`.`taxTypeSageFk` AS `taxTypeSageFk`,
 	`s`.`withholdingSageFk` AS `withholdingSageFk`,

db/versions/10895-pinkArborvitae/00-firstScript.sql

@@ -0,0 +1,11 @@
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_4`;
+ALTER TABLE `vn`.`arcRead` DROP FOREIGN KEY IF EXISTS `worker_printer_FK`;
+ALTER TABLE `vn`.`host` DROP FOREIGN KEY IF EXISTS  `configHost_FK`;
+ALTER TABLE `vn`.`operator` DROP FOREIGN KEY IF EXISTS `operator_FK_5`;
+ALTER TABLE `vn`.`packingSite` DROP FOREIGN KEY IF EXISTS `packingSite_FK_1`;
+ALTER TABLE `vn`.`printQueue` DROP FOREIGN KEY IF EXISTS `printQueue_printerFk`;
+ALTER TABLE `vn`.`sector` DROP FOREIGN KEY IF EXISTS `sector_FK_1`;
+ALTER TABLE `vn`.`worker` DROP FOREIGN KEY IF EXISTS `worker_FK`;
+ALTER TABLE dipole.printer DROP FOREIGN KEY IF EXISTS printer_FK;
+ALTER TABLE dipole.expedition_PrintOut DROP FOREIGN KEY IF EXISTS expedition_PrintOut_FK;
+

db/versions/10895-pinkArborvitae/01-secondScript.sql

@@ -0,0 +1,28 @@
+ALTER TABLE `vn`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned auto_increment NOT NULL;
+
+ALTER TABLE `vn`.`arcRead` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`arcRead` ADD CONSTRAINT `arcRead_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`host` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`host` ADD CONSTRAINT `host_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`operator` MODIFY COLUMN IF EXISTS `labelerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`operator` ADD CONSTRAINT `operator_FK_4` FOREIGN KEY IF NOT EXISTS (labelerFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN  IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_1` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+
+ALTER TABLE `vn`.`packingSite` MODIFY COLUMN IF EXISTS `printerRfidFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`packingSite` ADD CONSTRAINT `packingSite_FK_4` FOREIGN KEY IF NOT EXISTS(printerRfidFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`printQueue` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`printQueue` ADD CONSTRAINT `printQueue_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES vn.printer(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`sector` MODIFY COLUMN IF EXISTS `mainPrinterFk` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `vn`.`sector` ADD CONSTRAINT `sector_FK` FOREIGN KEY IF NOT EXISTS (mainPrinterFk) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`printer` MODIFY COLUMN IF EXISTS `id` int unsigned DEFAULT NULL NULL;
+ALTER TABLE `dipole`.`printer` ADD CONSTRAINT `vnPrinter_FK` FOREIGN KEY IF NOT EXISTS (id) REFERENCES vn.printer(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `dipole`.`expedition_PrintOut` MODIFY COLUMN IF EXISTS `printerFk` int unsigned DEFAULT 0 NOT NULL;
+ALTER TABLE `dipole`.`expedition_PrintOut` ADD CONSTRAINT `expedition_PrintOut_FK` FOREIGN KEY IF NOT EXISTS (printerFk) REFERENCES printer(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/02-thirdScript.sql

@@ -0,0 +1,17 @@
+
+ALTER TABLE `vn`.`productionConfig` ADD IF NOT EXISTS backupPrinterNotificationDelay int unsigned NULL 
+    COMMENT 'Minimum seconds Interval to Prevent Spam from Same-Type Notifications';
+
+ALTER TABLE vn.sector DROP FOREIGN KEY IF EXISTS sector_FK;
+
+ALTER TABLE `vn`.`sector` CHANGE IF EXISTS `mainPrinterFk` `backupPrinterFk` int unsigned DEFAULT NULL NULL;
+
+ALTER TABLE `util`.`notificationSubscription` DROP FOREIGN KEY IF EXISTS `notificationSubscription_ibfk_1`;
+ALTER TABLE `util`.`notificationQueue` DROP FOREIGN KEY IF EXISTS `nnotificationQueue_ibfk_1`;
+ALTER TABLE `util`.`notificationAcl` DROP FOREIGN KEY IF EXISTS `notificationAcl_ibfk_1`;
+
+ALTER TABLE `util`.`notification` MODIFY COLUMN IF EXISTS `id` int(11) auto_increment NOT NULL;
+
+ALTER TABLE `util`.`notificationSubscription` ADD CONSTRAINT `notificationSubscription_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationQueue` ADD CONSTRAINT `notificationQueue_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `util`.`notificationAcl` ADD CONSTRAINT `notificationAcl_Fk` FOREIGN KEY IF NOT EXISTS (`notificationFk`) REFERENCES `util`.`notification`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/versions/10895-pinkArborvitae/03-insertBackUpNotification.vn.sql

@@ -0,0 +1,12 @@
+INSERT IGNORE INTO util.notification (name, description)
+	VALUES ('backup-printer-selected','A backup printer has been selected');
+
+INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk) 
+    SELECT id, 10435
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 
+
+INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk) 
+    SELECT id, 66
+        FROM util.notification
+        WHERE name = 'backup-printer-selected'; 

db/versions/10900-redOak/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;

db/versions/10917-aquaPhormium/00-firstScript.sql

@@ -0,0 +1,9 @@
+UPDATE account.user
+SET name = LOWER(name),
+    name = REPLACE(name, ' ', ''),
+    name = REPLACE(name, '.', ''),
+    name = REPLACE(name, 'ñ', 'n'),
+    name = REPLACE(name, '*', ''),
+    name = REPLACE(name, 'ç', 'z'),
+    name = REPLACE(name, 'ã', 'a')
+WHERE NOT active;

db/versions/10948-azureSalal/00-addReconciliationConfig.sql

@@ -0,0 +1,8 @@
+	CREATE OR REPLACE TABLE `vn`.`accountReconciliationConfig` (
+	`id` INT AUTO_INCREMENT,
+	`currencyFk` TINYINT(3) unsigned,
+	`warehouseFk` SMALLINT(6) unsigned,
+	PRIMARY KEY (`id`),
+	CONSTRAINT `account_fk_currency` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`),
+	CONSTRAINT `account_fk_warehouse` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/versions/10948-azureSalal/01-addReconciliationConfig.vn.sql

@@ -0,0 +1,2 @@
+INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk) 
+	VALUES (1, 1);

db/versions/10948-azureSalal/02-grantPrivileges.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
+BEGIN
+END;
+
+REVOKE EXECUTE ON PROCEDURE `vn2008`.`agencia_volume` FROM `agency`;
+GRANT EXECUTE ON PROCEDURE `vn`.`agencyVolume` TO `agency`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
+BEGIN
+END;
+
+REVOKE EXECUTE ON PROCEDURE `vn2008`.`account_conciliacion_add` FROM `financial`;
+GRANT EXECUTE ON PROCEDURE `vn`.`addAccountReconciliation` TO `financial`;

db/versions/10948-azureSalal/03-modifyColumn.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`accountReconciliation` MODIFY debitCredit ENUM('debit', 'credit');

db/versions/10949-limeLaurel/00-firstScript.sql

@@ -0,0 +1,15 @@
+	INSERT INTO util.notification ( name, description)
+		SELECT  'invoice-ticket-closure',
+				'Tickets not invoiced during the nightly closure ticket process';
+			
+	SET @notificationFk =LAST_INSERT_ID();
+
+	INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk)
+		SELECT  @notificationFk,id 
+			FROM account.role 
+			WHERE name ='administrative';
+
+	INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk)
+		SELECT @notificationFk, id 
+			FROM account.`user`
+			WHERE `name` = 'admon';

db/versions/10971-turquoiseRuscus/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn`.`greugeConfig`
+    ADD COLUMN IF NOT EXISTS `daysAgoOffset` int(11) NOT NULL;
+
+UPDATE vn.greugeConfig SET daysAgoOffset=15;

db/versions/10976-greenCamellia/00-firstScript.sql

@@ -0,0 +1,20 @@
+CREATE OR REPLACE TEMPORARY TABLE tmp.claimsWithHasToPickUp
+	SELECT id
+		FROM vn.claim
+		WHERE hasToPickUp;
+
+ALTER TABLE vn.claim CHANGE hasToPickUp pickup ENUM('agency', 'delivery') DEFAULT NULL;
+
+UPDATE vn.claim c
+		JOIN tmp.claimsWithHasToPickUp tmp ON tmp.id = c.id
+	SET c.pickup = 'delivery';
+
+-- Solved bug empty value
+UPDATE vn.claim
+	SET pickup = NULL
+	WHERE pickup = '';
+
+DROP TEMPORARY TABLE tmp.claimsWithHasToPickUp;
+
+INSERT INTO salix.ACL (model,property,accessType,principalId)
+	VALUES ('Application','getEnumValues','*','employee');

db/versions/10988-blackIvy/00-pbx_prefix.sql

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS pbx.prefix (
+    country CHAR(2) NOT NULL COMMENT 'Country code',
+    prefix varchar(100) NOT NULL COMMENT 'Country prefix',
+    CONSTRAINT prefix_pk PRIMARY KEY (country)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE pbx.config
+    CHANGE countryPrefix defaultPrefix varchar(20)
+        CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ALTER TABLE pbx.config DROP COLUMN IF EXISTS sundayFestive;
+
+CREATE TABLE IF NOT EXISTS pbx.holiday (
+	id INT UNSIGNED auto_increment NOT NULL,
+	country CHAR(2) NOT NULL,
+	`day` DATE NOT NULL,
+	CONSTRAINT holiday_pk PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+CREATE UNIQUE INDEX holiday_country_IDX USING BTREE ON pbx.holiday (country,`day`);
+
+ALTER TABLE pbx.schedule
+    CHANGE timeStart startTime time NOT NULL,
+    CHANGE timeEnd endTime time NOT NULL,
+    DROP FOREIGN KEY schedule_ibfk_1,
+    DROP COLUMN queue,
+    ADD country CHAR(2) NOT NULL,
+    CHANGE weekDay weekDays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL
+        COMMENT '0 = Monday, 6 = Sunday';
+

db/versions/10988-blackIvy/01-pbx_prefix.vn.sql

@@ -0,0 +1,13 @@
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('es','0034');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('fr','0033');
+INSERT INTO pbx.prefix (country,prefix)
+	VALUES ('pt','00351');
+
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','es');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','fr');
+INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
+	VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','pt');

db/versions/10990-yellowPalmetto/00-firstScript.sql

@@ -0,0 +1,5 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_getRisk`()
+BEGIN
+END;
+
+GRANT EXECUTE ON PROCEDURE vn.client_getRisk TO financialBoss;

e2e/helpers/selectors.js

@@ -762,7 +762,6 @@ export default {
     claimBasicData: {
         claimState: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]',
         packages: 'vn-input-number[ng-model="$ctrl.claim.packages"]',
-        hasToPickUpCheckbox: 'vn-claim-basic-data vn-check[ng-model="$ctrl.claim.hasToPickUp"]',
         saveButton: `button[type=submit]`
     },
     claimDetail: {
@@ -1259,7 +1258,7 @@ export default {
     },
     supplierBasicData: {
         alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
-        isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
+        isReal: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isReal"]',
         isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
         isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
         notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',

e2e/paths/02-client/01_create_client.spec.js

@@ -32,7 +32,7 @@ describe('Client create path', () => {
             await page.autocompleteSearch(selectors.createClientView.salesPerson, 'salesPerson');
             await page.autocompleteSearch(selectors.createClientView.businessType, 'florist');
             await page.write(selectors.createClientView.taxNumber, '74451390E');
-            await page.write(selectors.createClientView.userName, 'CaptainMarvel');
+            await page.write(selectors.createClientView.userName, 'captainmarvel');
             await page.write(selectors.createClientView.email, 'CarolDanvers@verdnatura.es');
             await page.waitToClick(selectors.createClientView.createButton);
             const message = await page.waitForSnackbar();

e2e/paths/02-client/07_edit_web_access.spec.js

@@ -29,7 +29,7 @@ describe('Client web access path', () => {
         await page.click($.enableWebAccess);
         await page.click($.saveButton);
         const enableMessage = await page.waitForSnackbar();
-        await page.overwrite($.userName, 'Legion');
+        await page.overwrite($.userName, 'legion');
         await page.overwrite($.email, 'legion@marvel.com');
         await page.click($.saveButton);
         const modifyMessage = await page.waitForSnackbar();
@@ -47,7 +47,7 @@ describe('Client web access path', () => {
         expect(modifyMessage.type).toBe('success');
 
         expect(hasAccess).toBe('unchecked');
-        expect(userName).toEqual('Legion');
+        expect(userName).toEqual('legion');
         expect(email).toEqual('legion@marvel.com');
 
         // expect(logName).toEqual('Legion');

e2e/paths/02-client/09_add_credit.spec.js

@@ -34,6 +34,6 @@ describe('Client Add credit path', () => {
         const result = await page.waitToGetProperty(selectors.clientCredit.firstCreditText, 'innerText');
 
         expect(result).toContain(999);
-        expect(result).toContain('salesAssistant');
+        expect(result).toContain('salesassistant');
     });
 });

e2e/paths/02-client/19_summary.spec.js

@@ -61,7 +61,7 @@ describe('Client summary path', () => {
     it('should display web access details', async() => {
         const result = await page.waitToGetProperty(selectors.clientSummary.userName, 'innerText');
 
-        expect(result).toContain('PetterParker');
+        expect(result).toContain('petterparker');
     });
 
     it('should display business data', async() => {

e2e/paths/05-ticket/05_tracking_state.spec.js

@@ -59,7 +59,7 @@ describe('Ticket Create new tracking state path', () => {
             const result = await page
                 .waitToGetProperty(selectors.createStateView.worker, 'value');
 
-            expect(result).toEqual('salesPerson');
+            expect(result).toEqual('salesperson');
         });
 
         it(`should succesfully create a valid state`, async() => {

e2e/paths/06-claim/01_basic_data.spec.js

@@ -34,15 +34,6 @@ describe('Claim edit basic data path', () => {
         await page.waitForState('claim.card.detail');
     });
 
-    it('should check the "Pick up" checkbox', async() => {
-        await page.reloadSection('claim.card.basicData');
-        await page.waitToClick(selectors.claimBasicData.hasToPickUpCheckbox);
-        await page.waitToClick(selectors.claimBasicData.saveButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
     it('should confirm the claim state was edited', async() => {
         await page.reloadSection('claim.card.basicData');
         await page.waitForSelector(selectors.claimBasicData.claimState);
@@ -51,12 +42,6 @@ describe('Claim edit basic data path', () => {
         expect(result).toEqual('Resuelto');
     });
 
-    it('should confirm the "is paid with mana" and "Pick up" checkbox are checked', async() => {
-        const hasToPickUpCheckbox = await page.checkboxState(selectors.claimBasicData.hasToPickUpCheckbox);
-
-        expect(hasToPickUpCheckbox).toBe('checked');
-    });
-
     it('should confirm the claim packages was edited', async() => {
         const result = await page
             .waitToGetProperty(selectors.claimBasicData.packages, 'value');

e2e/paths/13-supplier/02_basic_data.spec.js

@@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
     it('should edit the basic data', async() => {
         await page.clearInput(selectors.supplierBasicData.alias);
         await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
-        await page.waitToClick(selectors.supplierBasicData.isSerious);
+        await page.waitToClick(selectors.supplierBasicData.isReal);
         await page.waitToClick(selectors.supplierBasicData.isActive);
         await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
         await page.write(selectors.supplierBasicData.notes, 'Some notes');
@@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
         expect(result).toEqual('Plants Nick SL');
     });
 
-    it('should check the isSerious checkbox is now checked', async() => {
-        const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
+    it('should check the isReal checkbox is now checked', async() => {
+        const result = await page.checkboxState(selectors.supplierBasicData.isReal);
 
         expect(result).toBe('checked');
     });

e2e/paths/14-account/01_create_and_basic_data.spec.js

@@ -21,7 +21,7 @@ describe('Account create and basic data path', () => {
     });
 
     it('should fill the form and then save it by clicking the create button', async() => {
-        await page.write(selectors.accountIndex.newName, 'Remy');
+        await page.write(selectors.accountIndex.newName, 'remy');
         await page.write(selectors.accountIndex.newNickname, 'Gambit');
         await page.write(selectors.accountIndex.newEmail, 'RemyEtienneLeBeau@verdnatura.es');
         await page.autocompleteSearch(selectors.accountIndex.newRole, 'Trainee');
@@ -39,7 +39,7 @@ describe('Account create and basic data path', () => {
     it('should check the name is as expected', async() => {
         const result = await page.waitToGetProperty(selectors.accountBasicData.name, 'value');
 
-        expect(result).toEqual('Remy');
+        expect(result).toEqual('remy');
     });
 
     it('should check the nickname is as expected', async() => {

front/core/services/auth.js

@@ -86,7 +86,8 @@ export default class Auth {
         return this.$http.get('VnUsers/ShareToken', {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
-            this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
+            // Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
+            this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
             this.loadAcls().then(() => {
                 let continueHash = this.$state.params.continue;
                 if (continueHash)

loopback/common/methods/application/getEnumValues.js

@@ -0,0 +1,56 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('getEnumValues', {
+        description: 'Return enum values of column',
+        accessType: 'EXECUTE',
+        accepts: [
+            {
+                arg: 'schema',
+                type: 'string',
+                description: 'The schema of db',
+                required: true,
+            },
+            {
+                arg: 'table',
+                type: 'string',
+                description: 'The table of schema',
+                required: true,
+            },
+            {
+                arg: 'column',
+                type: 'string',
+                description: 'The column of table',
+                required: true,
+            },
+        ],
+        returns: {
+            type: 'any',
+            root: true
+        },
+        http: {
+            path: `/get-enum-values`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getEnumValues = async(schema, table, column) => {
+        const stmt = new ParameterizedSQL(`
+            SELECT COLUMN_TYPE
+                FROM information_schema.COLUMNS
+                    WHERE TABLE_SCHEMA = ?
+                        AND TABLE_NAME = ?
+                        AND COLUMN_NAME = ?
+                        AND DATA_TYPE = 'enum';`,
+        [schema, table, column]);
+
+        const conn = Self.dataSource.connector;
+        const [result] = await conn.executeStmt(stmt);
+
+        if (!result) throw new UserError(`No results found`);
+
+        const regex = /'([^']*)'/g;
+        return result.COLUMN_TYPE.match(regex).map(match => match.slice(1, -1));
+    };
+};

loopback/common/methods/application/spec/getEnumValues.spec.js

@@ -0,0 +1,35 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Application getEnumValues()', () => {
+    let tx;
+
+    beforeEach(async() => {
+        tx = await models.Application.beginTransaction({});
+        const options = {transaction: tx};
+
+        await models.Application.rawSql(`
+            CREATE TABLE tableWithEnum (
+                direction enum('in', 'out', 'middle'),
+                PRIMARY KEY (direction)
+            ) ENGINE=InnoDB;
+        `, null, options);
+    });
+
+    it('should return three if is ok', async() => {
+        try {
+            const options = {transaction: tx};
+            const response = await models.Application.getEnumValues(
+                'vn',
+                'tableWithEnum',
+                'direction',
+                options
+            );
+
+            expect(response.length).toEqual(3);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

loopback/common/models/application.js

@@ -5,4 +5,5 @@ module.exports = function(Self) {
     require('../methods/application/execute')(Self);
     require('../methods/application/executeProc')(Self);
     require('../methods/application/executeFunc')(Self);
+    require('../methods/application/getEnumValues')(Self);
 };

loopback/locale/en.json

@@ -68,7 +68,7 @@
     "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
     "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
     "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked, with the pickup type *{{claimPickup}}*",
     "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
     "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
     "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
@@ -89,6 +89,8 @@
     "landed": "Landed",
     "addressFk": "Address",
     "companyFk": "Company",
+    "agency": "Agency",
+    "delivery": "Delivery",
     "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
     "The social name cannot be empty": "The social name cannot be empty",
     "The nif cannot be empty": "The nif cannot be empty",

loopback/locale/es.json

@@ -135,7 +135,7 @@
 	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*, con el tipo de recogida *{{claimPickup}}*",
 	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
 	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
 	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
@@ -168,6 +168,8 @@
 	"landed": "F. entrega",
 	"addressFk": "Consignatario",
 	"companyFk": "Empresa",
+	"agency": "Agencia",
+	"delivery": "Reparto",
 	"The social name cannot be empty": "La razón social no puede quedar en blanco",
 	"The nif cannot be empty": "El NIF no puede quedar en blanco",
 	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
@@ -349,5 +351,6 @@
 	"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
 	"The line could not be marked": "La linea no puede ser marcada",
 	"This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
-    "They're not your subordinate": "No es tu subordinado/a."
+	"They're not your subordinate": "No es tu subordinado/a.",
+	"No results found": "No se han encontrado resultados"
 }

modules/claim/back/locale/claim/en.yml

@@ -6,7 +6,6 @@ columns:
     isChargedToMana: charged to mana
     created: created
     responsibility: responsibility
-    hasToPickUp: has to pickUp
     ticketFk: ticket
     claimStateFk: claim state
     workerFk: worker

modules/claim/back/locale/claim/es.yml

@@ -6,7 +6,6 @@ columns:
     isChargedToMana: cargado al maná
     created: creado
     responsibility: responsabilidad
-    hasToPickUp: es recogida
     ticketFk: ticket
     claimStateFk: estado reclamación
     workerFk: trabajador

modules/claim/back/methods/claim/filter.js

@@ -79,7 +79,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The claimResponsible id',
                 http: {source: 'query'}
-            }
+            },
+            {
+                arg: 'myTeam',
+                type: 'boolean',
+                description: `Team partners`
+            },
         ],
         returns: {
             type: ['object'],
@@ -92,6 +97,7 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter, options) => {
+        const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
         const conn = Self.dataSource.connector;
         const args = ctx.args;
@@ -121,7 +127,23 @@ module.exports = Self => {
             claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
         }
 
-        const where = buildFilter(args, (param, value) => {
+        // Apply filter by team
+        const teamMembersId = [];
+        if (args.myTeam != null) {
+            const worker = await models.Worker.findById(userId, {
+                include: {
+                    relation: 'collegues'
+                }
+            }, myOptions);
+            const collegues = worker.collegues() || [];
+            for (let collegue of collegues)
+                teamMembersId.push(collegue.collegueFk);
+
+            if (teamMembersId.length == 0)
+                teamMembersId.push(userId);
+        }
+
+        const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
@@ -152,6 +174,11 @@ module.exports = Self => {
                 to.setHours(23, 59, 59, 999);
 
                 return {'cl.created': {between: [value, to]}};
+            case 'myTeam':
+                if (value)
+                    return {'cl.workerFk': {inq: teamMembersId}};
+                else
+                    return {'cl.workerFk': {nin: teamMembersId}};
             }
         });
 

modules/claim/back/methods/claim/specs/filter.spec.js

@@ -1,13 +1,25 @@
 const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 describe('claim filter()', () => {
+    let ctx;
+    beforeEach(() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            }
+        };
+    });
+
     it('should return 1 result filtering by id', async() => {
         const tx = await app.models.Claim.beginTransaction({});
 
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, search: 1}}, null, options);
+            ctx.args = {search: 1};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(1);
@@ -25,7 +37,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, search: 'Tony Stark'}}, null, options);
+            ctx.args = {search: 'Tony Stark'};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(1);
             expect(result[0].id).toEqual(4);
@@ -43,7 +56,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, workerFk: 18}}, null, options);
+            ctx.args = {workerFk: 18};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(4);
             expect(result[0].id).toEqual(1);
@@ -64,7 +78,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, itemFk: 2}}, null, options);
+            ctx.args = {itemFk: 2};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(3);
             expect(result[0].id).toEqual(1);
@@ -84,7 +99,8 @@ describe('claim filter()', () => {
         try {
             const options = {transaction: tx};
 
-            const result = await app.models.Claim.filter({args: {filter: {}, claimResponsibleFk: 7}}, null, options);
+            ctx.args = {claimResponsibleFk: 7};
+            const result = await app.models.Claim.filter(ctx, null, options);
 
             expect(result.length).toEqual(3);
             expect(result[0].id).toEqual(2);
@@ -97,4 +113,22 @@ describe('claim filter()', () => {
             throw e;
         }
     });
+
+    it('should now return claims from the worker team', async() => {
+        const tx = await models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            ctx.args = {itemFk: null, myTeam: true};
+            const result = await app.models.Claim.filter(ctx, null, options);
+
+            expect(result.length).toEqual(2);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/claim/back/methods/claim/specs/log.spec.js

@@ -11,7 +11,7 @@ describe('claim log()', () => {
             model: 'Claim',
             action: 'update',
             changes: [
-                {property: 'hasToPickUp', before: false, after: true}
+                {property: 'pickup', before: null, after: 'agency'}
             ]
         };
 

modules/claim/back/methods/claim/specs/updateClaim.spec.js

@@ -86,7 +86,7 @@ describe('Update Claim', () => {
                 args: {
                     observation: 'valid observation',
                     claimStateFk: pendingState,
-                    hasToPickUp: false
+                    pickup: null
                 }
             };
             ctx.req.__ = i18n.__;
@@ -124,7 +124,7 @@ describe('Update Claim', () => {
                 args: {
                     observation: 'valid observation',
                     claimStateFk: canceledState,
-                    hasToPickUp: false
+                    pickup: null
                 }
             };
             ctx.req.__ = i18n.__;
@@ -163,7 +163,7 @@ describe('Update Claim', () => {
                     claimStateFk: 3,
                     workerFk: 5,
                     observation: 'another valid observation',
-                    hasToPickUp: true
+                    pickup: 'agency'
                 }
             };
             ctx.req.__ = i18n.__;

modules/claim/back/methods/claim/updateClaim.js

@@ -27,8 +27,8 @@ module.exports = Self => {
             type: 'string'
         },
         {
-            arg: 'hasToPickUp',
-            type: 'boolean'
+            arg: 'pickup',
+            type: 'any'
         },
         {
             arg: 'packages',
@@ -72,9 +72,7 @@ module.exports = Self => {
             // Get sales person from claim client
             const salesPerson = claim.client().salesPersonUser();
 
-            let changedHasToPickUp = false;
-            if (args.hasToPickUp)
-                changedHasToPickUp = true;
+            const changedPickup = args.pickup != claim.pickup;
 
             // Validate when claimState has been changed
             if (args.claimStateFk) {
@@ -82,15 +80,15 @@ module.exports = Self => {
                 const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
                 const canEditState = await models.ACL.checkAccessAcl(ctx, 'Claim', 'editState', 'WRITE');
 
-                if (!canEditOldState || !canEditNewState || changedHasToPickUp && !canEditState)
+                if (!canEditOldState || !canEditNewState || changedPickup && !canEditState)
                     throw new UserError(`You don't have enough privileges to change that field`);
             }
 
             delete args.ctx;
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
-            // When hasToPickUp has been changed
-            if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp)
+            // When pickup has been changed
+            if (salesPerson && changedPickup && updatedClaim.pickup)
                 await notifyPickUp(ctx, salesPerson.id, claim);
 
             // When claimState has been changed
@@ -132,7 +130,8 @@ module.exports = Self => {
         const message = $t('Claim will be picked', {
             claimId: claim.id,
             clientName: claim.client().name,
-            claimUrl: `${url}claim/${claim.id}/summary`
+            claimUrl: `${url}claim/${claim.id}/summary`,
+            claimPickup: $t(claim.pickup)
         });
         await models.Chat.sendCheckingPresence(ctx, workerId, message);
     }

modules/claim/back/models/claim.json

@@ -31,8 +31,8 @@
         "responsibility": {
             "type": "number"
         },
-        "hasToPickUp": {
-            "type": "boolean"
+        "pickup": {
+            "type": "string"
         },
         "ticketFk": {
             "type": "number"

modules/claim/front/action/index.spec.js

@@ -85,7 +85,7 @@ describe('claim', () => {
             it('should perform a patch query and show a success message', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
 
-                const data = {hasToPickUp: true};
+                const data = {pickup: 'agency'};
                 $httpBackend.expect('PATCH', `Claims/1/updateClaimAction`, data).respond({});
                 controller.save(data);
                 $httpBackend.flush();

modules/claim/front/basic-data/index.html

@@ -49,13 +49,6 @@
                 label="Packages received"
                 ng-model="$ctrl.claim.packages">
             </vn-input-number>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.claim.hasToPickUp"
-                vn-acl="claimManager"
-                title="{{'When checked will notify to the salesPerson' | translate}}">
-            </vn-check>
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>

modules/claim/front/search-panel/index.html

@@ -70,6 +70,13 @@
                 label="Responsible">
             </vn-autocomplete>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-check
+                vn-one
+                label="My team"
+                ng-model="filter.myTeam"
+                triple-state="true">
+        </vn-horizontal>
         <vn-horizontal class="vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>

modules/claim/front/summary/index.html

@@ -49,13 +49,6 @@
                 label="Attended by"
                 value="{{$ctrl.summary.claim.worker.user.nickname}}">
             </vn-label-value>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.summary.claim.hasToPickUp"
-                title="{{'When checked will notify to the salesPerson' | translate}}"
-                disabled="true">
-            </vn-check>
         </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">

modules/client/back/methods/client/specs/createWithUser.spec.js

@@ -3,8 +3,8 @@ const LoopBackContext = require('loopback-context');
 
 describe('Client Create', () => {
     const newAccount = {
-        userName: 'Deadpool',
-        email: 'Deadpool@marvel.com',
+        userName: 'deadpool',
+        email: 'deadpool@marvel.com',
         fi: '16195279J',
         name: 'Wade',
         socialName: 'DEADPOOL MARVEL',
@@ -31,7 +31,7 @@ describe('Client Create', () => {
         });
     });
 
-    it(`should not find Deadpool as he's not created yet`, async() => {
+    it(`should not find deadpool as he's not created yet`, async() => {
         const tx = await models.Client.beginTransaction({});
 
         try {

modules/client/back/models/specs/client.spec.js

@@ -31,8 +31,8 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, previousWorkerId, currentWorkerId);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@davidcharleshaller', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@hankpym', `Client assignment has changed`);
         });
 
         it('should call to the Chat send() method for the previous worker', async() => {
@@ -40,7 +40,7 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, null, currentWorkerId);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@HankPym', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@hankpym', `Client assignment has changed`);
         });
 
         it('should call to the Chat send() method for the current worker', async() => {
@@ -48,7 +48,7 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, previousWorkerId, null);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@DavidCharlesHaller', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@davidcharleshaller', `Client assignment has changed`);
         });
     });
 

modules/item/back/methods/item-shelving/specs/upsertItem.spec.js

@@ -1,4 +1,4 @@
-const {models} = require('vn-loopback/server/server');
+const { models } = require('vn-loopback/server/server');
 const LoopBackContext = require('loopback-context');
 
 // #6276
@@ -8,11 +8,11 @@ describe('ItemShelving upsertItem()', () => {
     let options;
     let tx;
 
-    beforeEach(async() => {
+    beforeEach(async () => {
         ctx = {
             req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'}
+                accessToken: { userId: 9 },
+                headers: { origin: 'http://localhost' }
             },
             args: {}
         };
@@ -21,36 +21,37 @@ describe('ItemShelving upsertItem()', () => {
             active: ctx.req
         });
 
-        options = {transaction: tx};
+        options = { transaction: tx };
         tx = await models.ItemShelving.beginTransaction({});
         options.transaction = tx;
     });
 
-    afterEach(async() => {
+    afterEach(async () => {
         await tx.rollback();
     });
 
-    xit('should add two new records', async() => {
+    it('should add two new records', async () => {
         const shelvingFk = 'ZPP';
         const items = [1, 1, 1, 2];
 
         await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
-        const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
+        const itemShelvings = await models.ItemShelving.find({ where: { shelvingFk } }, options);
 
         expect(itemShelvings.length).toEqual(2);
     });
 
-    xit('should update the visible items', async() => {
+    it('should update the visible items', async () => {
         const shelvingFk = 'GVC';
         const items = [2, 2];
-        const {visible: itemsBefore} = await models.ItemShelving.findOne({
-            where: {shelvingFk, itemFk: items[0]}
+        const { visible: visibleItemsBefore } = await models.ItemShelving.findOne({
+            where: { shelvingFk, itemFk: items[0] }
         }, options);
         await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
-        const {visible: itemsAfter} = await models.ItemShelving.findOne({
-            where: {shelvingFk, itemFk: items[0]}
+
+        const { visible: visibleItemsAfter } = await models.ItemShelving.findOne({
+            where: { shelvingFk, itemFk: items[0] }
         }, options);
 
-        expect(itemsAfter).toEqual(itemsBefore + 2);
+        expect(visibleItemsAfter).toEqual(visibleItemsBefore + 2);
     });
 });

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

@@ -116,7 +116,6 @@ module.exports = Self => {
                             JOIN province p ON p.id = a.provinceFk
                             JOIN country co ON co.id = p.countryFk
                             JOIN agencyMode am ON am.id = t.agencyModeFk
-							JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
                             JOIN warehouse w ON w.id = t.warehouseFk
                             LEFT JOIN (
                                 SELECT td.ticketFk, d.id
@@ -128,7 +127,6 @@ module.exports = Self => {
                         WHERE co.code <> 'ES'
                             AND am.name <> 'ABONO'
                             AND w.code = 'ALG'
-							AND dm.code = 'DELIVERY'
                             AND t.cmrFk
                 ) sub
         `);

modules/shelving/back/models/sector.json

@@ -48,7 +48,7 @@
             "type": "number",
             "required": false
         },
-        "mainPrinterFk": {
+        "backupPrinterFk": {
             "type": "number",
             "required": false
         },

modules/supplier/back/locale/supplier/en.yml

@@ -11,7 +11,7 @@ columns:
     postcodeFk: postcode
     isActive: active
     isOfficial: official
-    isSerious: serious
+    isReal: real
     isTrucker: trucker
     note: note
     street: street

modules/supplier/back/locale/supplier/es.yml

@@ -11,7 +11,7 @@ columns:
     postcodeFk: código postal
     isActive: activo
     isOfficial: oficial
-    isSerious: serio
+    isReal: real
     isTrucker: camionero
     note: nota
     street: calle

modules/supplier/back/methods/supplier/getSummary.js

@@ -25,7 +25,7 @@ module.exports = Self => {
                 'id',
                 'name',
                 'nickname',
-                'isSerious',
+                'isReal',
                 'isActive',
                 'note',
                 'nif',

modules/supplier/back/models/supplier.json

@@ -48,7 +48,7 @@
         "isOfficial": {
             "type": "boolean"
         },
-        "isSerious": {
+        "isReal": {
             "type": "boolean"
         },
         "isTrucker": {

modules/supplier/front/basic-data/index.html

@@ -26,7 +26,7 @@
         <vn-horizontal>
             <vn-check
                 label="Verified"
-                ng-model="$ctrl.supplier.isSerious">
+                ng-model="$ctrl.supplier.isReal">
             </vn-check>
             <vn-check
                 label="Active"

modules/supplier/front/descriptor/index.html

@@ -32,7 +32,7 @@
             <vn-icon
                 vn-tooltip="Unverified supplier"
                 icon="icon-supplierfalse"
-                ng-if="$ctrl.supplier.isSerious == false">
+                ng-if="$ctrl.supplier.isReal == false">
             </vn-icon>
         </div>
         <div class="quicklinks">

modules/supplier/front/descriptor/index.js

@@ -40,7 +40,7 @@ class Controller extends Descriptor {
                 'payDemFk',
                 'payDay',
                 'isActive',
-                'isSerious',
+                'isReal',
                 'isTrucker',
                 'account'
             ],

modules/supplier/front/descriptor/index.spec.js

@@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
                     'payDemFk',
                     'payDay',
                     'isActive',
-                    'isSerious',
+                    'isReal',
                     'isTrucker',
                     'account'
                 ],

modules/supplier/front/summary/index.html

@@ -44,7 +44,7 @@
                 </vn-label-value>
                 <vn-check
                     label="Verified" 
-                    ng-model="$ctrl.summary.isSerious" 
+                    ng-model="$ctrl.summary.isReal"
                     disabled="true">
                 </vn-check>
                 <vn-check

modules/ticket/back/methods/ticket/closeAll.js

@@ -53,8 +53,8 @@ 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' OR (am.code = 'refund' AND al.code != 'delivered'))
-                    AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) AND util.dayEnd(?)
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                    AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
@@ -64,6 +64,72 @@ module.exports = Self => {
                 VALUES ('nightInvoicing', ?)
         `, [ticketIds.join(',')]);
 
+        await Self.rawSql(`
+        WITH ticketNotInvoiceable AS(
+            SELECT JSON_OBJECT(
+                'tickets',
+                JSON_ARRAYAGG(
+                    JSON_OBJECT(
+                        'ticketId', ticketFk,
+                        'reason', reason
+                    )
+                )
+            )errors
+            FROM (
+                SELECT ticketFk,
+                        CONCAT_WS(', ',
+                            IF(hasErrorToInvoice, 'Facturar', NULL),
+                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
+                            IF(hasErrorDeleted, 'Eliminado', NULL),
+                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
+                            IF(hasErrorAddress, 'Sin dirección', NULL),
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason
+                    FROM (
+                        SELECT t.id ticketFk,
+                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
+                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
+                                SUM(t.isDeleted) hasErrorDeleted,
+                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
+                                SUM(a.id IS NULL) hasErrorAddress,
+                                SUM(ios.code IS NOT NULL 
+                                    AND(ad.customsAgentFk IS NULL 
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld
+                            FROM ticket t
+                                LEFT JOIN address ad ON ad.id = t.addressFk
+                                JOIN sale s ON s.ticketFk = t.id
+                                JOIN item i ON i.id = s.itemFk
+                                JOIN supplier su ON su.id = t.companyFk
+                                JOIN agencyMode am ON am.id = t.agencyModeFk
+                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                                JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN alertLevel al ON al.id = ts.alertLevel
+                                JOIN client c ON c.id = t.clientFk
+                                JOIN province p ON p.id = c.provinceFk
+                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
+                                JOIN country co ON co.id = p.countryFk
+                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+                                    AND itc.countryFk = su.countryFk
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD' 
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'M')
+                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                                AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
+                                AND t.refFk IS NULL
+                                AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+                            GROUP BY ticketFk   
+                            HAVING hasErrorToInvoice 
+                                OR hasErrorTaxDataChecked 
+                                OR hasErrorDeleted 
+                                OR hasErrorItemTaxCountry 
+                                OR hasErrorAddress 
+                                OR hasErrorInfoTaxAreaWorld
+                    )sub
+                )sub2
+            ) SELECT IF(errors = '{"tickets": null}',
+                    'No errors',
+                    util.notification_send('invoice-ticket-closure', errors, NULL)) 
+                FROM ticketNotInvoiceable`, [toDate, toDate]);
+
         await closure(ctx, Self, tickets);
 
         await Self.rawSql(`
@@ -74,8 +140,7 @@ module.exports = Self => {
                     JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
                     JOIN zone z ON z.id = t.zoneFk
                 SET t.routeFk = NULL
-                WHERE DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
-                    AND util.dayEnd(?)
+                WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND al.code NOT IN('DELIVERED','PACKED')
                     AND t.routeFk
                     AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});