From 8af2cabaea916122286dc2e0e4ab6c79608ea28e Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Tue, 6 Feb 2024 13:31:58 +0100
Subject: [PATCH 01/28] refs #6281 feat:buyFk in itemShelving

---
 .../vn/procedures/itemShelvingTransfer.sql    |  1 +
 .../vn/procedures/itemShelving_add.sql        | 70 +++++++++++--------
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/db/routines/vn/procedures/itemShelvingTransfer.sql b/db/routines/vn/procedures/itemShelvingTransfer.sql
index 326f8108ba..b75cef627e 100644
--- a/db/routines/vn/procedures/itemShelvingTransfer.sql
+++ b/db/routines/vn/procedures/itemShelvingTransfer.sql
@@ -24,6 +24,7 @@ BEGIN
 				ON ish2.itemFk = ish.itemFk
 				AND ish2.packing = ish.packing
 				AND date(ish2.created) = date(ish.created)
+				AND ish2.buyFk = ish.buyFk
 		WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci;
 
 	IF vNewItemShelvingFk THEN
diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql
index 02762fa0bb..cc6e9bb494 100644
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@@ -1,8 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-	
-
 /**
  * Añade registro o lo actualiza si ya existe.
  *
@@ -15,12 +13,24 @@ BEGIN
  * @param vWarehouseFk indica el sector
  * 
  **/
-
 	DECLARE vItemFk INT;
+	DECLARE vBuyFk INT;
 
-	SELECT barcodeToItem(vBarcode) INTO vItemFk;
+	SELECT id INTO vBuyFk 
+		FROM buy WHERE id = vBarcode;
+	
+	SELECT  barcodeToItem(vBarcode) INTO vItemFk;
+	
+	IF vBuyFk IS NULL THEN
+		CALL cache.last_buy_refresh(FALSE);
+	
+		SELECT buy_id INTO vBuyFk
+			FROM cache.last_buy 
+			WHERE item_id = vItemFk 
+				AND warehouse_id = vWarehouseFk;
+	END IF;
 
-	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
+	IF NOT (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) THEN
 
 		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
 		INSERT INTO shelving(code, parkingFk) 
@@ -31,33 +41,37 @@ BEGIN
 	END IF;
 
 	IF (SELECT COUNT(*) FROM itemShelving 
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
-				AND itemFk  = vItemFk 
-				AND packing  = vPacking) = 1 THEN
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk 
+				AND itemFk = vItemFk 
+				AND packing = vPacking
+				AND buyFk = vBuyFk) THEN
 
 		UPDATE itemShelving
-			SET visible = visible+vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; 
+			SET visible = visible + vQuantity
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk 
+				AND itemFk = vItemFk 
+				AND packing = vPacking
+				AND buyFk = vBuyFk;
 
 	ELSE
-		CALL cache.last_buy_refresh(FALSE);
-		INSERT INTO itemShelving(   itemFk,
-                                    shelvingFk,
-                                    visible,
-                                    grouping,
-                                    packing,
-                                    packagingFk)
 
-		SELECT  vItemFk,
-                vShelvingFk,
-                vQuantity,
-                IFNULL(vGrouping, b.grouping),
-                IFNULL(vPacking, b.packing),
-                IFNULL(vPackagingFk, b.packagingFk)
-            FROM item i
-				LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
-				LEFT JOIN buy b ON b.id = lb.buy_id
-			WHERE i.id = vItemFk;
+		INSERT INTO itemShelving(
+					itemFk,
+					shelvingFk,
+					visible,
+					grouping,
+					packing,
+					packagingFk,
+					buyFk)
+			SELECT vItemFk,
+					vShelvingFk,
+					vQuantity,
+					IFNULL(vGrouping, b.grouping),
+					IFNULL(vPacking, b.packing),
+					IFNULL(vPackagingFk, b.packagingFk),
+					id
+				FROM buy b
+				WHERE id = vBuyFk;
 	END IF;
 END$$
 DELIMITER ;

From f34c960f5dd126273c268d378464ce04bd64dd82 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 25 Apr 2024 10:10:14 +0200
Subject: [PATCH 02/28] refs: #6939 changeREADME

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b420bc44f6..e50e39de60 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,16 @@ Required applications.
 * Node.js
 * Docker
 * Git
+* MYT
 
 You will need to install globally the following items.
 ```
 $ sudo npm install -g jest gulp-cli
 ```
+After installing MYT you will need the following item.
+```
+$ apt install libkrb5-dev libssl-dev
+```
 
 ## Installing dependencies and launching
 

From 5bbf5887b9ab244e999006865a691a74fbd858b9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 13:15:05 +0200
Subject: [PATCH 03/28] fix(salix): refs #7272 #7272 Bug when acl not loaded

---
 front/core/services/auth.js | 69 +++++++++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index 753bc3fba4..55a4cea7e8 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -7,10 +7,12 @@ import UserError from 'core/lib/user-error';
  * @property {Boolean} loggedIn Whether the user is currently logged
  */
 export default class Auth {
-    constructor($http, $q, $state, $transitions, $window, vnToken, vnModules, aclService) {
+    constructor($http, $q, vnApp, $translate, $state, $transitions, $window, vnToken, vnModules, aclService) {
         Object.assign(this, {
             $http,
             $q,
+            vnApp,
+            $translate,
             $state,
             $transitions,
             $window,
@@ -39,9 +41,31 @@ export default class Auth {
             };
 
             if (this.vnToken.token) {
-                return this.loadAcls()
-                    .then(() => true)
-                    .catch(redirectToLogin);
+                const maxRetries = 5;
+                let retryCount = 0;
+                const retryDelay = 2000; // Milisegundos (1 segundo)
+
+                const loadAclsWithRetry = () => {
+                    return this.loadAcls(maxRetries)
+                        .then(() => true)
+                        .catch(error => {
+                            retryCount++;
+                            if (retryCount < maxRetries) {
+                                return new Promise(resolve => {
+                                    setTimeout(() => {
+                                        this.vnApp.showMessage(this.$translate.instant('Loading...'));
+                                        resolve(loadAclsWithRetry(maxRetries - retryCount));
+                                    }, retryDelay);
+                                });
+                            } else {
+                                // Retry limit reached, redirect to login
+                                return redirectToLogin();
+                            }
+                        });
+                };
+
+                // Start loading ACLs with retry
+                return loadAclsWithRetry();
             } else
                 return redirectToLogin();
         });
@@ -113,18 +137,33 @@ export default class Auth {
         return promise;
     }
 
-    loadAcls() {
-        return this.aclService.load()
-            .then(() => {
-                this.loggedIn = true;
-                this.vnModules.reset();
-            })
-            .catch(err => {
-                this.vnToken.unset();
-                throw err;
-            });
+    loadAcls(maxRetries = 1) {
+        const attemptLoad = retryCount => {
+            return this.aclService.load()
+                .then(() => {
+                    this.loggedIn = true;
+                    this.vnModules.reset();
+                })
+                .catch(err => {
+                    if (retryCount >= maxRetries) {
+                        this.vnToken.unset();
+                        throw err;
+                    } else {
+                        // Retry after delay
+                        return new Promise((resolve, reject) => {
+                            reject(new Error('Error al cargar los ACLs'));
+                        });
+                    }
+                });
+        };
+
+        // Start loading with retry
+        return attemptLoad(1);
     }
 }
-Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules', 'aclService'];
+Auth.$inject = [
+    '$http', '$q', 'vnApp', '$translate', '$state',
+    '$transitions', '$window', 'vnToken', 'vnModules',
+    'aclService'];
 
 ngModule.service('vnAuth', Auth);

From ab87929b2d1a236809361d0de60c999a2ac0de47 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 12:50:17 +0200
Subject: [PATCH 04/28] fix(salix): refs #7272 #7272 i18n Error

---
 front/core/locale/es.yml    | 1 +
 front/core/services/auth.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/core/locale/es.yml b/front/core/locale/es.yml
index 17e955ff52..7fcb8c16b2 100644
--- a/front/core/locale/es.yml
+++ b/front/core/locale/es.yml
@@ -69,3 +69,4 @@ Send cau: Enviar cau
 By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
 ExplainReason: Explique el motivo por el que no deberia aparecer este fallo
 You already have the mailAlias: Ya tienes este alias de correo
+Error loading ACLs: Error al cargar los ACLs
diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index 55a4cea7e8..fc8ba2d639 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -151,7 +151,7 @@ export default class Auth {
                     } else {
                         // Retry after delay
                         return new Promise((resolve, reject) => {
-                            reject(new Error('Error al cargar los ACLs'));
+                            reject(new Error(this.$translate.instant('Error loading ACLs')));
                         });
                     }
                 });

From 596c0f78d08e214677f7d2b6cc225c62654c37b6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 11:24:36 +0200
Subject: [PATCH 05/28] fix(salix): refs #7272 #7272 Add aclService in
 routes.js

---
 front/salix/routes.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/salix/routes.js b/front/salix/routes.js
index 8621f83c76..be210b7497 100644
--- a/front/salix/routes.js
+++ b/front/salix/routes.js
@@ -12,7 +12,8 @@ function config($stateProvider, $urlRouterProvider) {
             template: '<vn-layout></vn-layout>',
             resolve: {
                 config: ['vnConfig', vnConfig => vnConfig.initialize()],
-                token: ['vnToken', vnToken => vnToken.fetchConfig()]
+                token: ['vnToken', vnToken => vnToken.fetchConfig()],
+                acl: ['aclService', aclService => aclService.load()]
             }
         })
         .state('outLayout', {

From 6277c3da0968d2a42249e5d1f3292cd5fc1acc8a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 11:26:12 +0200
Subject: [PATCH 06/28] fix(salix): refs #7272 #7272 Remove aclService from
 auth.js

---
 front/core/services/auth.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index fc8ba2d639..c3aa6a3c7e 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -7,18 +7,15 @@ import UserError from 'core/lib/user-error';
  * @property {Boolean} loggedIn Whether the user is currently logged
  */
 export default class Auth {
-    constructor($http, $q, vnApp, $translate, $state, $transitions, $window, vnToken, vnModules, aclService) {
+    constructor($http, $q, $state, $transitions, $window, vnToken, vnModules) {
         Object.assign(this, {
             $http,
             $q,
-            vnApp,
-            $translate,
             $state,
             $transitions,
             $window,
             vnToken,
             vnModules,
-            aclService,
             loggedIn: false
         });
     }
@@ -111,13 +108,11 @@ export default class Auth {
             headers: {Authorization: json.data.token}
         }).then(({data}) => {
             this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
-            this.loadAcls().then(() => {
-                let continueHash = this.$state.params.continue;
-                if (continueHash)
-                    this.$window.location = continueHash;
-                else
-                    this.$state.go('home');
-            });
+            let continueHash = this.$state.params.continue;
+            if (continueHash)
+                this.$window.location = continueHash;
+            else
+                this.$state.go('home');
         }).catch(() => {});
     }
 
@@ -131,7 +126,7 @@ export default class Auth {
         this.vnToken.unset();
         this.loggedIn = false;
         this.vnModules.reset();
-        this.aclService.reset();
+        this.vnModules.aclService.reset();
         this.$state.go('login');
 
         return promise;

From 43cedef2597b580d03b1b4e7df08e98486c91d9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 11:26:31 +0200
Subject: [PATCH 07/28] fix(salix): refs #7272 #7272 Call validateToken

---
 front/core/services/auth.js | 67 +++++++++----------------------------
 1 file changed, 16 insertions(+), 51 deletions(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index c3aa6a3c7e..28feb10901 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -38,31 +38,12 @@ export default class Auth {
             };
 
             if (this.vnToken.token) {
-                const maxRetries = 5;
-                let retryCount = 0;
-                const retryDelay = 2000; // Milisegundos (1 segundo)
-
-                const loadAclsWithRetry = () => {
-                    return this.loadAcls(maxRetries)
-                        .then(() => true)
-                        .catch(error => {
-                            retryCount++;
-                            if (retryCount < maxRetries) {
-                                return new Promise(resolve => {
-                                    setTimeout(() => {
-                                        this.vnApp.showMessage(this.$translate.instant('Loading...'));
-                                        resolve(loadAclsWithRetry(maxRetries - retryCount));
-                                    }, retryDelay);
-                                });
-                            } else {
-                                // Retry limit reached, redirect to login
-                                return redirectToLogin();
-                            }
-                        });
-                };
-
-                // Start loading ACLs with retry
-                return loadAclsWithRetry();
+                return this.validateToken()
+                    .then(() => true)
+                    .catch(err => {
+                        console.error(err);
+                        redirectToLogin();
+                    });
             } else
                 return redirectToLogin();
         });
@@ -132,33 +113,17 @@ export default class Auth {
         return promise;
     }
 
-    loadAcls(maxRetries = 1) {
-        const attemptLoad = retryCount => {
-            return this.aclService.load()
-                .then(() => {
-                    this.loggedIn = true;
-                    this.vnModules.reset();
-                })
-                .catch(err => {
-                    if (retryCount >= maxRetries) {
-                        this.vnToken.unset();
-                        throw err;
-                    } else {
-                        // Retry after delay
-                        return new Promise((resolve, reject) => {
-                            reject(new Error(this.$translate.instant('Error loading ACLs')));
-                        });
-                    }
-                });
-        };
-
-        // Start loading with retry
-        return attemptLoad(1);
+    validateToken() {
+        return this.$http.get('VnUsers/validateToken')
+            .then(() => {
+                this.loggedIn = true;
+                this.vnModules.reset();
+            })
+            .catch(err => {
+                throw err;
+            });
     }
 }
-Auth.$inject = [
-    '$http', '$q', 'vnApp', '$translate', '$state',
-    '$transitions', '$window', 'vnToken', 'vnModules',
-    'aclService'];
+Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules'];
 
 ngModule.service('vnAuth', Auth);

From b4284889e14db631753b607dea1a4423be27d49f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 11:35:07 +0200
Subject: [PATCH 08/28] fix(salix): refs #7272 #7272 Front retry calls

---
 front/core/services/auth.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index 28feb10901..3337dfdb68 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -7,10 +7,12 @@ import UserError from 'core/lib/user-error';
  * @property {Boolean} loggedIn Whether the user is currently logged
  */
 export default class Auth {
-    constructor($http, $q, $state, $transitions, $window, vnToken, vnModules) {
+    constructor($http, $q, vnApp, $translate, $state, $transitions, $window, vnToken, vnModules) {
         Object.assign(this, {
             $http,
             $q,
+            vnApp,
+            $translate,
             $state,
             $transitions,
             $window,
@@ -38,12 +40,28 @@ export default class Auth {
             };
 
             if (this.vnToken.token) {
-                return this.validateToken()
-                    .then(() => true)
-                    .catch(err => {
-                        console.error(err);
-                        redirectToLogin();
-                    });
+                const loadWithRetry = () => {
+                    return this.validateToken()
+                        .then(() => true)
+                        .catch(err => {
+                            switch (err.status) {
+                            case 400:
+                            case 401:
+                                redirectToLogin();
+                                break;
+                            default:
+                                return new Promise(resolve => {
+                                    setTimeout(() => {
+                                        this.vnApp.showMessage(this.$translate.instant('Loading...'));
+
+                                        resolve(loadWithRetry());
+                                    }, 2000);
+                                });
+                            }
+                            console.error(err);
+                        });
+                };
+                return loadWithRetry();
             } else
                 return redirectToLogin();
         });
@@ -124,6 +142,8 @@ export default class Auth {
             });
     }
 }
-Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules'];
+Auth.$inject = [
+    '$http', '$q', 'vnApp', '$translate', '$state',
+    '$transitions', '$window', 'vnToken', 'vnModules'];
 
 ngModule.service('vnAuth', Auth);

From be3ee43b06183623fbe79c7dca69750c4d345a2c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 11:35:30 +0200
Subject: [PATCH 09/28] fix(salix): refs #7272 #7272 Back validateToken
 endpoint

---
 back/methods/vn-user/renew-token.js    | 10 +--------
 back/methods/vn-user/validate-token.js | 30 ++++++++++++++++++++++++++
 back/models/vn-user.js                 |  1 +
 back/models/vn-user.json               |  7 ++++++
 4 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 back/methods/vn-user/validate-token.js

diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js
index 8e5ffc095c..52b8606a4b 100644
--- a/back/methods/vn-user/renew-token.js
+++ b/back/methods/vn-user/renew-token.js
@@ -18,15 +18,7 @@ module.exports = Self => {
     Self.renewToken = async function(ctx) {
         const {accessToken: token} = ctx.req;
 
-        // Check if current token is valid
-
-        const {renewPeriod, courtesyTime} = await models.AccessTokenConfig.findOne({
-            fields: ['renewPeriod', 'courtesyTime']
-        });
-        const now = Date.now();
-        const differenceMilliseconds = now - token.created;
-        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
-        const isNotExceeded = differenceSeconds < renewPeriod - courtesyTime;
+        const isNotExceeded = await Self.validateToken(ctx);
         if (isNotExceeded)
             return token;
 
diff --git a/back/methods/vn-user/validate-token.js b/back/methods/vn-user/validate-token.js
new file mode 100644
index 0000000000..3b75c7c349
--- /dev/null
+++ b/back/methods/vn-user/validate-token.js
@@ -0,0 +1,30 @@
+const {models} = require('vn-loopback/server/server');
+module.exports = Self => {
+    Self.remoteMethodCtx('validateToken', {
+        description: 'Validates the current logged user token',
+        accepts: [],
+        accessType: 'READ',
+        returns: {
+            type: 'Boolean',
+            root: true
+        },
+        http: {
+            path: `/validateToken`,
+            verb: 'GET'
+        }
+    });
+
+    Self.validateToken = async function(ctx) {
+        const {accessToken: token} = ctx.req;
+
+        // Check if current token is valid
+        const {renewPeriod, courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['renewPeriod', 'courtesyTime']
+        });
+        const now = Date.now();
+        const differenceMilliseconds = now - token.created;
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+        const isNotExceeded = differenceSeconds < renewPeriod - courtesyTime;
+        return isNotExceeded;
+    };
+};
diff --git a/back/models/vn-user.js b/back/models/vn-user.js
index b59f13ffad..d38fe5a92c 100644
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@@ -15,6 +15,7 @@ module.exports = function(Self) {
     require('../methods/vn-user/renew-token')(Self);
     require('../methods/vn-user/share-token')(Self);
     require('../methods/vn-user/update-user')(Self);
+    require('../methods/vn-user/validate-token')(Self);
 
     Self.definition.settings.acls = Self.definition.settings.acls.filter(acl => acl.property !== 'create');
 
diff --git a/back/models/vn-user.json b/back/models/vn-user.json
index 5f6ac3f47a..8e33040855 100644
--- a/back/models/vn-user.json
+++ b/back/models/vn-user.json
@@ -113,6 +113,13 @@
             "principalId": "$everyone",
             "permission": "ALLOW"
         },
+        {
+            "property": "validateToken",
+			"accessType": "EXECUTE",
+			"principalType": "ROLE",
+			"principalId": "$authenticated",
+			"permission": "ALLOW"
+		},
         {
             "property": "privileges",
             "accessType": "*",

From ae914866412b8844a4273c6c3e1db35ee5ed3bf1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 10:36:18 +0200
Subject: [PATCH 10/28] test(salix): refs #7272 #7272 fix renew-token.spec

---
 back/methods/vn-user/renew-token.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js
index 52b8606a4b..5581d19ace 100644
--- a/back/methods/vn-user/renew-token.js
+++ b/back/methods/vn-user/renew-token.js
@@ -18,6 +18,9 @@ module.exports = Self => {
     Self.renewToken = async function(ctx) {
         const {accessToken: token} = ctx.req;
 
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['courtesyTime']
+        });
         const isNotExceeded = await Self.validateToken(ctx);
         if (isNotExceeded)
             return token;

From da3c4cb8fcbb3df37ad123f519af93bb92c299af Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 3 May 2024 08:24:10 +0200
Subject: [PATCH 11/28] fix(salix): refs #7272 #7272 Errors when Token not
 exists

---
 front/core/services/auth.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/front/core/services/auth.js b/front/core/services/auth.js
index 3337dfdb68..0cae4bae89 100644
--- a/front/core/services/auth.js
+++ b/front/core/services/auth.js
@@ -47,8 +47,7 @@ export default class Auth {
                             switch (err.status) {
                             case 400:
                             case 401:
-                                redirectToLogin();
-                                break;
+                                return redirectToLogin();
                             default:
                                 return new Promise(resolve => {
                                     setTimeout(() => {
@@ -58,7 +57,6 @@ export default class Auth {
                                     }, 2000);
                                 });
                             }
-                            console.error(err);
                         });
                 };
                 return loadWithRetry();

From 599f22a25de9e25e26a405a223770be432468134 Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Tue, 14 May 2024 09:03:49 +0200
Subject: [PATCH 12/28] catalogue tiene en cuenta apc

---
 db/routines/floranet/procedures/catalogue_get.sql   |  9 +++++++--
 db/routines/floranet/procedures/contact_request.sql | 13 +++++++++++--
 .../floranet/procedures/deliveryDate_get.sql        |  2 +-
 db/routines/floranet/procedures/order_put.sql       | 12 ++++++------
 db/routines/floranet/procedures/sliders_get.sql     | 13 ++++++-------
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql
index 32624f383c..d67f7555e0 100644
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@@ -42,8 +42,8 @@ proc:BEGIN
 					image,
 					description
 				)
-		SELECT 	i.name,
-				i.`size`,
+		SELECT 	CONCAT(i.name, ' by ',a.nickname),
+				i.`size` + apc.deliveryCost,
 				i.id,
 				vLanded,
 				vPostalCode,
@@ -52,6 +52,11 @@ proc:BEGIN
 				i.description
 			FROM vn.item i
 				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN addressPostCode apc 
+					ON apc.dayOfWeek = dayOfWeek(vLanded) 
+					AND NOW() < vLanded - INTERVAL apc.hoursInAdvance HOUR
+					AND apc.postCode = vPostalCode
+				JOIN vn.address a ON a.id = apc.addressFk
 			WHERE it.code IN ('FNR','FNP');
 
 	SELECT *
diff --git a/db/routines/floranet/procedures/contact_request.sql b/db/routines/floranet/procedures/contact_request.sql
index 2ca25b87dd..c479945cca 100644
--- a/db/routines/floranet/procedures/contact_request.sql
+++ b/db/routines/floranet/procedures/contact_request.sql
@@ -13,8 +13,17 @@ BEGIN
 /**
  * Set actions for contact request
  * 
- * @param vPostalCode Delivery address postal code
+ * @param vName Name
+ * @param vPhone Phone number
+ * @param vEmail e-mail
+ * @param vMessage text of the message
  */
-	
+
+	CALL vn.mail_insert(
+		'pako@verdnatura.es',
+		vEmail,
+		'Contact request',
+		CONCAT('Phone: ',vPhone, ' Message: ', vMessage)
+	);
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/floranet/procedures/deliveryDate_get.sql b/db/routines/floranet/procedures/deliveryDate_get.sql
index 75e9d6257b..a235e8c31b 100644
--- a/db/routines/floranet/procedures/deliveryDate_get.sql
+++ b/db/routines/floranet/procedures/deliveryDate_get.sql
@@ -21,7 +21,7 @@ BEGIN
 					apc.dayOfWeek - vCurrentDayOfWeek,
 					7 - apc.dayOfWeek
 					) DAY nextDay,
-	NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime
+	NOW() + INTERVAL apc.hoursInAdvance HOUR minDeliveryTime
 	FROM addressPostCode apc
 		WHERE apc.postCode = vPostalCode
 	HAVING nextDay > minDeliveryTime) sub;
diff --git a/db/routines/floranet/procedures/order_put.sql b/db/routines/floranet/procedures/order_put.sql
index 979588f8ff..ec0295ca7b 100644
--- a/db/routines/floranet/procedures/order_put.sql
+++ b/db/routines/floranet/procedures/order_put.sql
@@ -10,12 +10,12 @@ BEGIN
 	INSERT INTO `order`
 		SET catalogueFk = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.products[0].id')),
 			customerName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerName')),
-    		email = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.email')),
-    		customerPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerPhone')),
-    		message= JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.message')),
-    		deliveryName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryName')),
-    		address = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.address')),
-    		deliveryPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryPhone'));						
+			email = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.email')),
+			customerPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.customerPhone')),
+			message= JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.message')),
+			deliveryName = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryName')),
+			address = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.address')),
+			deliveryPhone = JSON_UNQUOTE(JSON_EXTRACT(vJsonData, '$.customer.customerData.deliveryPhone'));						
 
 	SELECT LAST_INSERT_ID() orderFk;
 END$$
diff --git a/db/routines/floranet/procedures/sliders_get.sql b/db/routines/floranet/procedures/sliders_get.sql
index 0e4aa297aa..bafda47324 100644
--- a/db/routines/floranet/procedures/sliders_get.sql
+++ b/db/routines/floranet/procedures/sliders_get.sql
@@ -9,12 +9,11 @@ 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')
-   	LIMIT 3;
-    
+		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')
+	LIMIT 3;
 END$$
 DELIMITER ;
\ No newline at end of file

From bb4f78961f411a0469218606e224524e5197c30d Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Tue, 14 May 2024 14:01:13 +0200
Subject: [PATCH 13/28] element table

---
 .../floranet/procedures/contact_request.sql   |  2 +-
 .../floranet/procedures/order_confirm.sql     | 72 +++++++++++++++++--
 .../11050-wheatAnthurium/00-firstScript.sql   |  4 ++
 .../11050-wheatAnthurium/01-elementFilter.sql |  6 ++
 4 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 db/versions/11050-wheatAnthurium/00-firstScript.sql
 create mode 100644 db/versions/11050-wheatAnthurium/01-elementFilter.sql

diff --git a/db/routines/floranet/procedures/contact_request.sql b/db/routines/floranet/procedures/contact_request.sql
index c479945cca..2132a86fc0 100644
--- a/db/routines/floranet/procedures/contact_request.sql
+++ b/db/routines/floranet/procedures/contact_request.sql
@@ -20,7 +20,7 @@ BEGIN
  */
 
 	CALL vn.mail_insert(
-		'pako@verdnatura.es',
+		'floranet@verdnatura.es',
 		vEmail,
 		'Contact request',
 		CONCAT('Phone: ',vPhone, ' Message: ', vMessage)
diff --git a/db/routines/floranet/procedures/order_confirm.sql b/db/routines/floranet/procedures/order_confirm.sql
index b6aec033d5..c5d61bf485 100644
--- a/db/routines/floranet/procedures/order_confirm.sql
+++ b/db/routines/floranet/procedures/order_confirm.sql
@@ -1,23 +1,87 @@
-DROP PROCEDURE IF EXISTS floranet.order_confirm;
-
 DELIMITER $$
 $$
 
-CREATE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
 READS SQL DATA
 
 BEGIN
-/** Update order.isPaid field.
+/** Update order.isPaid field, and makes the ticket
  *  
  *  @param vCatalogueFk floranet.catalogue.id
  * 
  *  @returns floranet.order.isPaid
  */
+	DECLARE vNewTicketFk INT;
+	DECLARE vZoneFk INT;
+
 	UPDATE `order`
 		SET isPaid = TRUE,
 			payed = NOW()
 		WHERE catalogueFk = vCatalogueFk;
 
+	SELECT zoneFk 
+		INTO vZoneFk
+		FROM (
+			SELECT zoneFk, COUNT(*) totalCount
+				FROM vn.ticket t
+					JOIN catalogue c ON c.id = vCatalogueFk
+				WHERE t.shipped > util.VN_CURDATE() - INTERVAL 1 YEAR
+					AND t.addressFk = c.addressFk
+				GROUP BY zoneFk
+				ORDER BY totalCount DESC 
+				LIMIT 10000000000000000000
+		) sub
+		LIMIT 1;
+	
+	INSERT INTO ticket (
+			clientFk,
+			shipped,
+			addressFk,
+			agencyModeFk,
+			nickname,
+			warehouseFk,
+			routeFk,
+			companyFk,
+			landed,
+			zoneFk
+		)
+		SELECT 	a.clientFk,
+				c.dated - INTERVAL 1 DAY,
+				c.addressFk,
+				a.agencyModeFk,
+				a.nickname,
+				ag.warehouseFk,
+				NULL,
+				co.id,
+				c.dated,
+				vZoneFk
+			FROM vn.address a
+				JOIN vn.agencyMode am ON am.id = a.agencyModeFk
+				JOIN vn.agency ag ON  ag.id = am.agencyFk
+				JOIN catalogue c ON c.addressFk = a.id
+				JOIN vn.company co ON co.code = 'VNL'
+			WHERE c.id = vCatalogueFk;
+
+	SET vNewTicketFk = LAST_INSERT_ID();
+
+	INSERT INTO vn.sale(
+		ticketFk,
+		itemFk,
+		concept,
+		price,
+		quantity)
+		SELECT 
+			vNewTicketFk,
+			c.itemFk,
+			CONCAT('Entrega: ',c.name),
+			- c.price,
+			1
+			FROM catalogue c
+				JOIN addressPostCode apc 
+					ON apc.addressFk = c.addressFk
+					AND apc.dayOfWeek = dayOfWeek(vDated)
+			WHERE c.id = vCatalogueFk;
+
 	SELECT isPaid
 		FROM `order`
 		WHERE catalogueFk = vCatalogueFk;
diff --git a/db/versions/11050-wheatAnthurium/00-firstScript.sql b/db/versions/11050-wheatAnthurium/00-firstScript.sql
new file mode 100644
index 0000000000..cb8034ff5c
--- /dev/null
+++ b/db/versions/11050-wheatAnthurium/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+
+ALTER TABLE floranet.catalogue ADD addressFk int(11) NOT NULL;
+ALTER TABLE floranet.catalogue ADD CONSTRAINT catalogue_address_FK FOREIGN KEY (addressFk) REFERENCES vn.address(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/11050-wheatAnthurium/01-elementFilter.sql b/db/versions/11050-wheatAnthurium/01-elementFilter.sql
new file mode 100644
index 0000000000..3f2bb78ac7
--- /dev/null
+++ b/db/versions/11050-wheatAnthurium/01-elementFilter.sql
@@ -0,0 +1,6 @@
+ALTER TABLE floranet.builder DROP FOREIGN KEY builder_FK_1;
+ALTER TABLE floranet.`element` DROP PRIMARY KEY;
+ALTER TABLE floranet.`element` ADD id INT NOT NULL;
+ALTER TABLE floranet.`element` ADD CONSTRAINT element_pk PRIMARY KEY (id);
+ALTER TABLE floranet.builder ADD CONSTRAINT builder_element_FK FOREIGN KEY (elementFk) REFERENCES floranet.`element`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+

From 47c573a324c1c314ce0385d22f6cc7c472f3c8af Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 17 May 2024 10:51:37 +0200
Subject: [PATCH 14/28] fix: refs #6095 filter by refFk null

---
 modules/invoiceOut/front/index/manual/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/invoiceOut/front/index/manual/index.html b/modules/invoiceOut/front/index/manual/index.html
index 5872911e46..3b991618d1 100644
--- a/modules/invoiceOut/front/index/manual/index.html
+++ b/modules/invoiceOut/front/index/manual/index.html
@@ -27,7 +27,7 @@
         <vn-autocomplete
             url="Tickets"
             label="Ticket"
-            search-function="{or: [{id: $search}, {nickname: {like: '%'+$search+'%'}}]}"
+            search-function="{refFk: null, or: [{id: $search}, {nickname: {like: '%'+$search+'%'}}]}"
             show-field="id"
             value-field="id"
             fields="['nickname']"

From dd76168bc3779f110049871cfbfd06d89a8b1b8a Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 May 2024 09:15:24 +0200
Subject: [PATCH 15/28] 6281 feat:buyFk in itemShekving

---
 db/routines/vn/procedures/itemShelving_add.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql
index 005a9f8cb8..f991c3c638 100644
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
 
 

From 20bf2b73b6a46f5050b4bace3dcefe9fdc2ce080 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 May 2024 09:27:20 +0200
Subject: [PATCH 16/28] 6281 feat:buyFk in itemShelving

---
 .../vn/procedures/itemShelving_add.sql        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql
index f991c3c638..d05c5aac1b 100644
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-
+ç
 
 /**
  * Añade registro o lo actualiza si ya existe.
@@ -18,8 +18,20 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vBuyFk INT;
 
+	SELECT id INTO vBuyFk 
+		FROM buy WHERE id = vBarcode;
+
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 
+	IF vBuyFk IS NULL THEN
+		CALL cache.last_buy_refresh(FALSE);
+	
+		SELECT buy_id INTO vBuyFk
+			FROM cache.last_buy 
+			WHERE item_id = vItemFk 
+				AND warehouse_id = vWarehouseFk;
+	END IF;
+
 	IF vPacking IS NULL
 	THEN
 		SET vPacking = itemPacking(vBarcode, vWarehouseFk);
@@ -29,10 +41,11 @@ BEGIN
 	IF (SELECT COUNT(*) FROM itemShelving
 			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk
 				AND itemFk  = vItemFk
-				AND packing  = vPacking) = 1 THEN
+				AND packing  = vPacking
+				AND buyFk = vBuyFk) THEN
 
 		UPDATE itemShelving
-			SET visible = visible+vQuantity
+			SET visible = visible + vQuantity
 			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
 
 	ELSE

From 2b2406ae5248305dd70a9a96857dde5ffb960b45 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 May 2024 09:32:12 +0200
Subject: [PATCH 17/28] 6281 feat:buyFk in itemShelving

---
 db/routines/vn/procedures/itemShelving_add.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql
index d05c5aac1b..9395f5d80e 100644
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@@ -1,7 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-ç
 
 /**
  * Añade registro o lo actualiza si ya existe.

From 598a7eefbcab27f6518f56215f7796d4f1c872e9 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Mon, 20 May 2024 09:39:23 +0200
Subject: [PATCH 18/28] 6281 feat:buyFk in itemShelving

---
 db/routines/vn/procedures/itemShelvingTransfer.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/itemShelvingTransfer.sql b/db/routines/vn/procedures/itemShelvingTransfer.sql
index b75cef627e..ae82bfe9dd 100644
--- a/db/routines/vn/procedures/itemShelvingTransfer.sql
+++ b/db/routines/vn/procedures/itemShelvingTransfer.sql
@@ -17,7 +17,8 @@ BEGIN
 				SELECT
 					itemFk,
 					packing,
-					created
+					created,
+					buyFk
 					FROM itemShelving
 					WHERE id = vItemShelvingFk
 			) ish2

From 7065cf0b38ec8558b0f0651992c5eccbc398273d Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 21 May 2024 09:58:03 +0200
Subject: [PATCH 19/28] feat: refs #6281 change fixtures

---
 db/dump/fixtures.before.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 3e6edf07db..8a86e2786b 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -1205,11 +1205,11 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
         (32,    36, -92.324),
         (32,    39, 0.994);
 
-INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`, `userFk`)
+INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`, `packing`,`buyFk`, `userFk`)
     VALUES
-        (2, 'GVC', 1, 1, 1, 1106),
-        (4, 'HEJ', 1, 1, 1, 1106),
-        (1, 'UXN', 2, 12, 12, 1106);
+        (2, 'GVC', 1, 1, 1, 2,1106),
+        (4, 'HEJ', 1, 1, 1, NULL,1106),
+        (1, 'UXN', 2, 12, 12, NULL,1106);
 
 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
     VALUES

From 9bd5244f647663a2e9f515ff6f6cf841adf65645 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 10:19:21 +0200
Subject: [PATCH 20/28] refs #7292 hook ueemember

---
 e2e/paths/02-client/05_add_address.spec.js            |  2 +-
 loopback/locale/en.json                               |  3 ++-
 modules/client/back/methods/client/createAddress.js   | 11 ++++++-----
 .../back/methods/client/specs/createAddress.spec.js   |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/e2e/paths/02-client/05_add_address.spec.js b/e2e/paths/02-client/05_add_address.spec.js
index 0581635d0b..2f5999359c 100644
--- a/e2e/paths/02-client/05_add_address.spec.js
+++ b/e2e/paths/02-client/05_add_address.spec.js
@@ -51,7 +51,7 @@ describe('Client Add address path', () => {
         await page.waitToClick(selectors.clientAddresses.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Incoterms is required for a non UEE member');
+        expect(message.text).toContain('Incoterms and Customs agent are required for a non UEE member');
     });
 
     it(`should receive an error after clicking save button as customsAgent is empty`, async() => {
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 601a26f5b8..1fffe7f35a 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -226,5 +226,6 @@
 	"This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
 	"They're not your subordinate": "They're not your subordinate",
 	"InvoiceIn is already booked": "InvoiceIn is already booked",
-	"This workCenter is already assigned to this agency": "This workCenter is already assigned to this agency"
+	"This workCenter is already assigned to this agency": "This workCenter is already assigned to this agency",
+	"Incoterms and Customs agent are required for a non UEE member": "Incoterms and Customs agent are required for a non UEE member"
 }
\ No newline at end of file
diff --git a/modules/client/back/methods/client/createAddress.js b/modules/client/back/methods/client/createAddress.js
index 8e6db2a22d..cb55025ceb 100644
--- a/modules/client/back/methods/client/createAddress.js
+++ b/modules/client/back/methods/client/createAddress.js
@@ -92,11 +92,12 @@ module.exports = function(Self) {
             }, myOptions);
 
             const isUeeMember = province.country().isUeeMember;
-            if (!isUeeMember && !args.incotermsFk)
-                throw new UserError(`Incoterms is required for a non UEE member`);
-
-            if (!isUeeMember && !args.customsAgentFk)
-                throw new UserError(`Customs agent is required for a non UEE member`);
+            if (!isUeeMember && (!args.incotermsFk || !args.customsAgentFk)) {
+                if (!args.incotermsFk)
+                    throw new UserError(`Incoterms and Customs agent are required for a non UEE member`);
+                else
+                    throw new UserError(`Customs agent is required for a non UEE member`);
+            }
 
             delete args.ctx; // Remove unwanted properties
             const newAddress = await models.Address.create(args, myOptions);
diff --git a/modules/client/back/methods/client/specs/createAddress.spec.js b/modules/client/back/methods/client/specs/createAddress.spec.js
index 0841ad98ce..bd41d9c506 100644
--- a/modules/client/back/methods/client/specs/createAddress.spec.js
+++ b/modules/client/back/methods/client/specs/createAddress.spec.js
@@ -50,7 +50,7 @@ describe('Address createAddress', () => {
         }
 
         expect(error).toBeDefined();
-        expect(error.message).toEqual('Incoterms is required for a non UEE member');
+        expect(error.message).toEqual('Incoterms and Customs agent are required for a non UEE member');
     });
 
     it('should throw a non uee member error if no customsAgent is defined', async() => {

From cf630a72135635f722b24dc25955b130d4957b5d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 10:20:54 +0200
Subject: [PATCH 21/28] refs #7292 traduction es

---
 loopback/locale/es.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 77e707590e..090cfe0594 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -358,5 +358,6 @@
 	"Select ticket or client": "Elija un ticket o un client",
 	"It was not able to create the invoice": "No se pudo crear la factura",
 	"This PDA is already assigned to another user": "This PDA is already assigned to another user",
-	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)"
-}
\ No newline at end of file
+	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
+    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE"
+}

From 35ce259e5aa29e60536f8cdb44459b293c9b8d82 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 23 May 2024 14:26:11 +0200
Subject: [PATCH 22/28] feat: refs #7438 Added volume to item_valuateInventory

---
 .../vn/procedures/item_ValuateInventory.sql   | 81 +++++++++----------
 1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/db/routines/vn/procedures/item_ValuateInventory.sql b/db/routines/vn/procedures/item_ValuateInventory.sql
index bfd96fa82c..137f766542 100644
--- a/db/routines/vn/procedures/item_ValuateInventory.sql
+++ b/db/routines/vn/procedures/item_ValuateInventory.sql
@@ -1,5 +1,7 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_ValuateInventory`(vDated DATE, vIsDetailed BOOLEAN)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_valuateInventory`(
+	vDated DATE
+)
 BEGIN
 	DECLARE vInventoried DATE;
 	DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE;
@@ -38,13 +40,14 @@ BEGIN
 	END IF;
 
 	CREATE OR REPLACE TEMPORARY TABLE tInventory(
-		warehouseFk SMALLINT,
-		itemFk BIGINT,
-		quantity INT,
-		cost DOUBLE DEFAULT 0,
-		total DOUBLE DEFAULT 0,
-		warehouseInventory VARCHAR(20),
-		PRIMARY KEY (warehouseInventory, itemFk) USING HASH
+			warehouseFk SMALLINT,
+			itemFk BIGINT,
+			quantity INT,
+			volume DECIMAL(10,2),
+			cost DOUBLE DEFAULT 0,
+			total DOUBLE DEFAULT 0,
+			warehouseInventory VARCHAR(20),
+			PRIMARY KEY (warehouseInventory, itemFk) USING HASH
 		)
 		ENGINE = MEMORY;
 	
@@ -183,7 +186,7 @@ BEGIN
 				AND e.isConfirmed
 			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity);
 		
-	CALL vn.buyUltimate(NULL, vDateDayEnd);
+	CALL buyUltimate(NULL, vDateDayEnd);
 
 	UPDATE tInventory i
 			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
@@ -192,43 +195,31 @@ BEGIN
 			cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)
 		WHERE i.quantity;
 
-	DELETE FROM tInventory
-		WHERE quantity IS NULL OR NOT quantity;
+	DELETE FROM tInventory WHERE quantity IS NULL OR NOT quantity;
 
-	IF vIsDetailed THEN
-		SELECT ti.warehouseFk,
-				i.id itemFk,
-				i.longName,
-				i.size,
-				ti.quantity, 
-				tp.name Tipo,
-				ic.name Reino, 
-				ti.cost, 
-				CAST(ti.total AS DECIMAL(10, 2)) total,
-				ti.warehouseInventory almacen
-			FROM tInventory ti
-				JOIN warehouse w ON w.id = warehouseFk
-				JOIN item i ON i.id = ti.itemFk
-				JOIN itemType tp ON tp.id = i.typeFk
-				JOIN itemCategory ic ON ic.id = tp.categoryFk 
-			WHERE w.valuatedInventory
-				AND ti.total > 0
-			ORDER BY ti.total DESC;
-	ELSE
-		SELECT i.warehouseInventory Almacen,
-				ic.name Reino,
-				CAST(i.total AS DECIMAL(10, 2)) Euros,
-				w.code Comprador,
-				it.id
-			FROM tInventory i
-				JOIN warehouse wh ON wh.id = warehouseFk
-				JOIN item it ON it.id = i.itemFk
-				JOIN itemType itp ON itp.id = it.typeFk
-				LEFT JOIN worker w ON w.id = itp.workerFk
-				JOIN itemCategory ic ON ic.id = itp.categoryFk
-			WHERE wh.valuatedInventory
-				AND i.total > 0;
-	END IF;
+	UPDATE tInventory i
+		JOIN itemCost ic ON ic.itemFk = i.itemFk
+			AND ic.warehouseFk = i.warehouseFk
+		SET i.volume = i.quantity * ic.cm3delivery / 1000000;
+
+	SELECT ti.warehouseFk,
+			i.id,
+			i.longName,
+			i.size,
+			ti.quantity,
+			ti.volume,
+			tp.name itemTypeName,
+			ic.name itemCategoryName,
+			ti.cost,
+			ti.total,
+			ti.warehouseInventory
+		FROM tInventory ti
+			JOIN warehouse w ON w.id = warehouseFk
+			JOIN item i ON i.id = ti.itemFk
+			JOIN itemType tp ON tp.id = i.typeFk
+			JOIN itemCategory ic ON ic.id = tp.categoryFk 
+		WHERE w.valuatedInventory
+			AND ti.total > 0;
 
 	DROP TEMPORARY TABLE
 		tmp.buyUltimate,

From ee010a3bb3ae6b28eda418dcd503b2085703e0ae Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 23 May 2024 14:44:47 +0200
Subject: [PATCH 23/28] refs #7296 fix pr errors, trad

---
 loopback/locale/es.json                             | 3 ++-
 modules/client/back/methods/client/createAddress.js | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 090cfe0594..8586301fb0 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -359,5 +359,6 @@
 	"It was not able to create the invoice": "No se pudo crear la factura",
 	"This PDA is already assigned to another user": "This PDA is already assigned to another user",
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
-    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE"
+    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
+    "Cannot add holidays on this day": "No se pueden agregar vacaciones en este día"
 }
diff --git a/modules/client/back/methods/client/createAddress.js b/modules/client/back/methods/client/createAddress.js
index cb55025ceb..2709632cb9 100644
--- a/modules/client/back/methods/client/createAddress.js
+++ b/modules/client/back/methods/client/createAddress.js
@@ -92,12 +92,8 @@ module.exports = function(Self) {
             }, myOptions);
 
             const isUeeMember = province.country().isUeeMember;
-            if (!isUeeMember && (!args.incotermsFk || !args.customsAgentFk)) {
-                if (!args.incotermsFk)
-                    throw new UserError(`Incoterms and Customs agent are required for a non UEE member`);
-                else
-                    throw new UserError(`Customs agent is required for a non UEE member`);
-            }
+            if (!isUeeMember && (!args.incotermsFk || !args.customsAgentFk))
+                throw new UserError(`Incoterms and Customs agent are required for a non UEE member`);
 
             delete args.ctx; // Remove unwanted properties
             const newAddress = await models.Address.create(args, myOptions);

From 2fe279ed47f3a54dcfad9e9b44865a4f7abd82e0 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 24 May 2024 07:20:27 +0200
Subject: [PATCH 24/28] feat: refs #7438 Requested changes and little changes

---
 ...nventory.sql => item_valuateInventory.sql} | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)
 rename db/routines/vn/procedures/{item_ValuateInventory.sql => item_valuateInventory.sql} (89%)

diff --git a/db/routines/vn/procedures/item_ValuateInventory.sql b/db/routines/vn/procedures/item_valuateInventory.sql
similarity index 89%
rename from db/routines/vn/procedures/item_ValuateInventory.sql
rename to db/routines/vn/procedures/item_valuateInventory.sql
index 137f766542..18aefdf7b9 100644
--- a/db/routines/vn/procedures/item_ValuateInventory.sql
+++ b/db/routines/vn/procedures/item_valuateInventory.sql
@@ -17,8 +17,7 @@ BEGIN
 	SELECT tr.landed INTO vInventoried
 		FROM travel tr
 			JOIN `entry` e ON e.travelFk = tr.id
-			JOIN entryConfig ec
-		WHERE landed <= vDateDayEnd
+		WHERE tr.landed <= vDateDayEnd
 			AND e.supplierFk = vInventorySupplierFk
 		ORDER BY tr.landed DESC
 		LIMIT 1;
@@ -29,8 +28,7 @@ BEGIN
 		SELECT landed INTO vInventoryClone
 			FROM travel tr
 				JOIN `entry` e ON e.travelFk = tr.id
-				JOIN entryConfig ec
-			WHERE landed >= vDated
+			WHERE tr.landed >= vDated
 				AND e.supplierFk = vInventorySupplierFk
 			ORDER BY landed ASC
 			LIMIT 1;
@@ -63,9 +61,8 @@ BEGIN
 					JOIN `entry` e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 					JOIN itemType t ON t.id = i.typeFk
-					JOIN warehouse w ON w.id = warehouseInFk
-					JOIN entryConfig ec 
-				WHERE landed = vDateDayEnd
+					JOIN warehouse w ON w.id = tr.warehouseInFk
+				WHERE tr.landed = vDateDayEnd
 					AND e.supplierFk = vInventorySupplierFk
 					AND w.valuatedInventory
 					AND t.isInventory
@@ -81,9 +78,8 @@ BEGIN
 					JOIN `entry` e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 					JOIN itemType t ON t.id = i.typeFk
-					JOIN warehouse w ON w.id = warehouseInFk
-					JOIN entryConfig ec 
-				WHERE landed = vInventoried
+					JOIN warehouse w ON w.id = tr.warehouseInFk
+				WHERE tr.landed = vInventoried
 					AND e.supplierFk = vInventorySupplierFk
 					AND w.valuatedInventory
 					AND t.isInventory
@@ -102,7 +98,6 @@ BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				JOIN itemType t ON t.id = i.typeFk
 				JOIN warehouse w ON w.id = tr.warehouseInFk
-				JOIN entryConfig ec
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
 				AND NOT e.isRaid
@@ -188,19 +183,16 @@ BEGIN
 		
 	CALL buyUltimate(NULL, vDateDayEnd);
 
-	UPDATE tInventory i
-			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
-			JOIN buy b ON b.id = bu.buyFk
-		SET total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
-			cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)
-		WHERE i.quantity;
-
 	DELETE FROM tInventory WHERE quantity IS NULL OR NOT quantity;
 
 	UPDATE tInventory i
-		JOIN itemCost ic ON ic.itemFk = i.itemFk
-			AND ic.warehouseFk = i.warehouseFk
-		SET i.volume = i.quantity * ic.cm3delivery / 1000000;
+			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
+			JOIN buy b ON b.id = bu.buyFk
+			LEFT JOIN itemCost ic ON ic.itemFk = i.itemFk
+				AND ic.warehouseFk = i.warehouseFk
+		SET i.total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
+			i.cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0),
+			i.volume = i.quantity * ic.cm3delivery / 1000000;
 
 	SELECT ti.warehouseFk,
 			i.id,

From 4c3428da552415d30f615232f2015045f22b6636 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 May 2024 08:21:28 +0200
Subject: [PATCH 25/28] refs #7292 add traduction

---
 loopback/locale/es.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index d95ba6d704..fff7ebf70e 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -359,5 +359,6 @@
 	"It was not able to create the invoice": "No se pudo crear la factura",
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
 	"This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
-	"You can only have one PDA": "Solo puedes tener un PDA"
+	"You can only have one PDA": "Solo puedes tener un PDA",
+    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE"
 }

From a435d88e55d1218ea7e1cdbfb6d316d21f468f71 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 May 2024 08:37:46 +0200
Subject: [PATCH 26/28] refs #7292 fix tback

---
 modules/client/back/methods/client/specs/createAddress.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/client/back/methods/client/specs/createAddress.spec.js b/modules/client/back/methods/client/specs/createAddress.spec.js
index bd41d9c506..ae179cf6cc 100644
--- a/modules/client/back/methods/client/specs/createAddress.spec.js
+++ b/modules/client/back/methods/client/specs/createAddress.spec.js
@@ -81,7 +81,7 @@ describe('Address createAddress', () => {
         }
 
         expect(error).toBeDefined();
-        expect(error.message).toEqual('Customs agent is required for a non UEE member');
+        expect(error.message).toEqual('Incoterms and Customs agent are required for a non UEE member');
     });
 
     it('should create a new address and set as a client default address', async() => {

From 49a2e6fc84c677c62d58fc708367020624c0d8e3 Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Fri, 24 May 2024 11:44:58 +0200
Subject: [PATCH 27/28] tickets y email

---
 .../floranet/procedures/catalogue_get.sql     |  8 +--
 .../floranet/procedures/order_confirm.sql     | 49 +++++++++++++++++--
 .../11068-blueGerbera/00-firstScript.sql      |  9 ++++
 3 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 db/versions/11068-blueGerbera/00-firstScript.sql

diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql
index d67f7555e0..523026a410 100644
--- a/db/routines/floranet/procedures/catalogue_get.sql
+++ b/db/routines/floranet/procedures/catalogue_get.sql
@@ -40,16 +40,18 @@ proc:BEGIN
 					postalCode,
 					`type`,
 					image,
-					description
+					description,
+					addressFk
 				)
 		SELECT 	CONCAT(i.name, ' by ',a.nickname),
-				i.`size` + apc.deliveryCost,
+				i.minPrice + apc.deliveryCost,
 				i.id,
 				vLanded,
 				vPostalCode,
 				it.name, 
 				CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), 
-				i.description
+				i.description,
+				apc.addressFk
 			FROM vn.item i
 				JOIN vn.itemType it ON it.id = i.typeFk
 				JOIN addressPostCode apc 
diff --git a/db/routines/floranet/procedures/order_confirm.sql b/db/routines/floranet/procedures/order_confirm.sql
index c5d61bf485..903d348a22 100644
--- a/db/routines/floranet/procedures/order_confirm.sql
+++ b/db/routines/floranet/procedures/order_confirm.sql
@@ -4,7 +4,7 @@ $$
 CREATE OR REPLACE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT)
 READS SQL DATA
 
-BEGIN
+proc:BEGIN
 /** Update order.isPaid field, and makes the ticket
  *  
  *  @param vCatalogueFk floranet.catalogue.id
@@ -12,8 +12,16 @@ BEGIN
  *  @returns floranet.order.isPaid
  */
 	DECLARE vNewTicketFk INT;
+	DECLARE vCustomerEmail VARCHAR(255);
+	DECLARE vFloranetEmail VARCHAR(255);
+	DECLARE vSubjectEmail VARCHAR(100);
+	DECLARE vBodyEmail TEXT;
 	DECLARE vZoneFk INT;
 
+	IF (SELECT isPaid FROM `order` WHERE catalogueFk = vCatalogueFk) THEN
+		CALL util.throw('Esta orden ya está confirmada');
+	END IF;
+
 	UPDATE `order`
 		SET isPaid = TRUE,
 			payed = NOW()
@@ -33,7 +41,7 @@ BEGIN
 		) sub
 		LIMIT 1;
 	
-	INSERT INTO ticket (
+	INSERT INTO vn.ticket (
 			clientFk,
 			shipped,
 			addressFk,
@@ -57,7 +65,7 @@ BEGIN
 				vZoneFk
 			FROM vn.address a
 				JOIN vn.agencyMode am ON am.id = a.agencyModeFk
-				JOIN vn.agency ag ON  ag.id = am.agencyFk
+				JOIN vn.agency ag ON ag.id = am.agencyFk
 				JOIN catalogue c ON c.addressFk = a.id
 				JOIN vn.company co ON co.code = 'VNL'
 			WHERE c.id = vCatalogueFk;
@@ -79,10 +87,41 @@ BEGIN
 			FROM catalogue c
 				JOIN addressPostCode apc 
 					ON apc.addressFk = c.addressFk
-					AND apc.dayOfWeek = dayOfWeek(vDated)
+					AND apc.dayOfWeek = dayOfWeek(c.dated)
 			WHERE c.id = vCatalogueFk;
+	
+	SELECT cl.email,
+		cf.email,
+		CONCAT('Nuevo pedido FLORANET para entrega el ',c.dated),
+		CONCAT_WS('\n',
+				CONCAT('Producto: ', c.name),
+				CONCAT('Fecha de entrega: ',c.dated),
+				CONCAT('Destinatario: ', o.deliveryName),
+				CONCAT('Dirección: ', o.address),
+				CONCAT('CP: ', c.postalCode),
+				CONCAT('Foto: ', c.image),
+				CONCAT('Mensaje: ', IFNULL(o.message,"Ninguno.")),
+				CONCAT('Teléfono: ',IFNULL(o.deliveryPhone,"--")),
+				CONCAT('Observaciones: ', IFNULL(o.observations,"No hay."))
+		)
+		INTO vCustomerEmail,
+			vFloranetEmail,
+			vSubjectEmail,
+			vBodyEmail
+		FROM vn.client cl
+			JOIN vn.address a ON a.clientFk = cl.id
+			JOIN catalogue c ON c.addressFk = a.id
+			JOIN `order` o ON o.catalogueFk = c.id
+			JOIN config cf
+		WHERE c.id = vCatalogueFk;
+	
+	CALL vn.mail_insert(
+		vCustomerEmail,
+		vFloranetEmail,
+		vSubjectEmail,
+		vBodyEmail);
 
-	SELECT isPaid
+	SELECT isPaid, vNewTicketFk
 		FROM `order`
 		WHERE catalogueFk = vCatalogueFk;
 END$$
diff --git a/db/versions/11068-blueGerbera/00-firstScript.sql b/db/versions/11068-blueGerbera/00-firstScript.sql
new file mode 100644
index 0000000000..6342981a72
--- /dev/null
+++ b/db/versions/11068-blueGerbera/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+CREATE OR REPLACE TABLE floranet.config (
+	email varchar(255) DEFAULT 'floranet@verdnatura.es' NOT NULL
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+

From ab3b58ec3c4342e94cf251661e98fa068696eeab Mon Sep 17 00:00:00 2001
From: Pako <pako@verdnatura.es>
Date: Fri, 24 May 2024 13:41:02 +0200
Subject: [PATCH 28/28] modificacion recipe y element

---
 .../00-firstScript.sql                        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 db/versions/11069-brownChrysanthemum/00-firstScript.sql

diff --git a/db/versions/11069-brownChrysanthemum/00-firstScript.sql b/db/versions/11069-brownChrysanthemum/00-firstScript.sql
new file mode 100644
index 0000000000..3220d12574
--- /dev/null
+++ b/db/versions/11069-brownChrysanthemum/00-firstScript.sql
@@ -0,0 +1,35 @@
+-- Place your SQL code here
+DROP TABLE IF EXISTS floranet.builder;
+
+CREATE OR REPLACE TABLE floranet.`element` (
+   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL,
+  `itemFk` int(11) DEFAULT NULL,
+  `longNameFilter` varchar(30) DEFAULT NULL,
+  `typeFk` smallint(5) unsigned DEFAULT NULL,
+  `minSize` int(10) unsigned DEFAULT NULL,
+  `maxSize` int(10) unsigned DEFAULT NULL,
+  `inkFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  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 AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Filtro para localizar posibles items que coincidan con la descripción';
+
+CREATE OR REPLACE TABLE floranet.`recipe` (
+  `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 `recipe_FK` (`itemFk`),
+  KEY `recipe_FK_1` (`elementFk`),
+  CONSTRAINT `recipe_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `recipe_element_FK` FOREIGN KEY (`elementFk`) REFERENCES `element` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links handmade products with their elements';