From 5b49e7cf459205d691dc28191f4c2ac0f46875be Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 06:51:32 +0000
Subject: [PATCH 1/3] fix(salix): rollback updateClaim

---
 modules/claim/back/methods/claim/updateClaim.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index 10d304496..326192385 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -108,7 +108,7 @@ module.exports = Self => {
 
     async function notifyStateChange(ctx, workerId, claim, newState) {
         const models = Self.app.models;
-        const url = await models.Url.getUrl('lilium');
+        const url = await models.Url.getUrl();
         const $t = ctx.req.__;
 
         const message = $t(`Claim state has changed to`, {
@@ -122,7 +122,7 @@ module.exports = Self => {
 
     async function notifyPickUp(ctx, workerId, claim) {
         const models = Self.app.models;
-        const url = await models.Url.getUrl('lilium');
+        const url = await models.Url.getUrl();
         const $t = ctx.req.__; // $translate
 
         const message = $t('Claim will be picked', {
-- 
2.40.1


From 27e30c0051cccc01f73e437ee5c10e689145d150 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 09:22:31 +0200
Subject: [PATCH 2/3] fix(salix): redirect with params

---
 front/core/services/app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/front/core/services/app.js b/front/core/services/app.js
index 8cee66ef0..cec7bea7f 100644
--- a/front/core/services/app.js
+++ b/front/core/services/app.js
@@ -56,6 +56,8 @@ export default class App {
     }
 
     getUrl(route, appName = 'lilium') {
+        const index = window.location.hash.indexOf(route.toLowerCase());
+        const newRoute = index < 0 ? route : window.location.hash.substring(index);
         const env = process.env.NODE_ENV;
         const filter = {
             where: {and: [
@@ -67,7 +69,7 @@ export default class App {
         return this.logger.$http.get('Urls/findOne', {filter})
             .then(res => {
                 if (res && res.data)
-                    return res.data.url + route;
+                    return res.data.url + newRoute;
             })
             .catch(() => {
                 this.showError('Direction not found');
-- 
2.40.1


From 49394b9b165444b8f0509b801a0cf282b556c201 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 28 Aug 2024 09:42:59 +0200
Subject: [PATCH 3/3] fix: change claim

---
 modules/claim/front/main/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/claim/front/main/index.js b/modules/claim/front/main/index.js
index cbbbe0c7e..c921d5a12 100644
--- a/modules/claim/front/main/index.js
+++ b/modules/claim/front/main/index.js
@@ -7,7 +7,7 @@ export default class Claim extends ModuleMain {
     }
     async $onInit() {
         this.$state.go('home');
-        window.location.href = await this.vnApp.getUrl(`Claim/`);
+        window.location.href = await this.vnApp.getUrl(`claim/`);
     }
 }
 
-- 
2.40.1