From 36dd0abf9d21d79cdddff85c3588b290033ecaa5 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 09:18:43 +0100 Subject: [PATCH 01/22] fix: use pnpm in debian/rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c752a06c..94832131 100755 --- a/debian/rules +++ b/debian/rules @@ -15,4 +15,4 @@ build: mkdir -p build-deps cp package.json build-deps - (cd build-deps && npm install --omit=dev --no-audit --prefer-offline) + (cd build-deps && pnpm install --prod --config.audit=true --prefer-offline) From 9bb0652809ae122009e9a9e55ded4d80c32260c6 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 09:18:57 +0100 Subject: [PATCH 02/22] fet: enable pnpm --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4c00c2d..a9abf5c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,9 @@ RUN a2dissite 000-default # NodeJs RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y --no-install-recommends nodejs + && apt-get install -y --no-install-recommends nodejs\ + && npm install -g corepack@0.31.0 \ + && corepack enable pnpm # Hedera From 040a3b86c200355bf6c2bd5b132e61bf8075f2ee Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 10 Feb 2025 08:19:52 +0000 Subject: [PATCH 03/22] feat: patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ef79e86..ff51547b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.50.18", + "version": "24.50.19", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 7c7f1b976cb9846cd24dea36cfb7504e5c098959 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 08:00:08 +0100 Subject: [PATCH 04/22] ci: refs #4922 Docker image fixes --- Dockerfile | 3 +-- Jenkinsfile | 2 +- back/package.json | 2 +- debian/changelog | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9abf5c0..9c41bbb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870 -FROM debian:bookworm-slim +FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1 ARG DEBIAN_FRONTEND=noninteractive diff --git a/Jenkinsfile b/Jenkinsfile index ed52bdc5..8bc98b01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn8' + image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn9' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } diff --git a/back/package.json b/back/package.json index 2459d049..efd95684 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "24.50.16", + "version": "25.8.0", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 8ca433ba..01a1a9a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.50.16) stable; urgency=low +hedera-web (25.8.0) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index ff51547b..e94632e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.50.19", + "version": "25.8.0", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 0a07b0bf33db48dd29a021e6fcf274b1d5719c12 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 08:12:32 +0100 Subject: [PATCH 05/22] ci: refs #4922 Debian rules pnpm hoist --- back/package.json | 2 +- debian/changelog | 2 +- debian/rules | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/back/package.json b/back/package.json index efd95684..2fda20c4 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "25.8.0", + "version": "25.8.1", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 01a1a9a1..222edda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.8.0) stable; urgency=low +hedera-web (25.8.1) stable; urgency=low * Initial Release. diff --git a/debian/rules b/debian/rules index 94832131..6e729ebd 100755 --- a/debian/rules +++ b/debian/rules @@ -15,4 +15,4 @@ build: mkdir -p build-deps cp package.json build-deps - (cd build-deps && pnpm install --prod --config.audit=true --prefer-offline) + (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline) diff --git a/package.json b/package.json index e94632e5..9bc1af14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.8.0", + "version": "25.8.1", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From 0d2b0cf02ed1dc056181182a3aa5d11b251189e7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:36:54 +0100 Subject: [PATCH 06/22] ci: refs #4922 Remove redundant installs from Dockerfile --- Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c41bbb9..2151a43e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,6 @@ FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1 ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - ca-certificates \ - gnupg2 - # Apache RUN apt-get install -y --no-install-recommends \ @@ -20,13 +14,6 @@ RUN apt-get install -y --no-install-recommends \ RUN a2dissite 000-default -# NodeJs - -RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y --no-install-recommends nodejs\ - && npm install -g corepack@0.31.0 \ - && corepack enable pnpm - # Hedera RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \ From c4c04d8b0fef07e5c2ea85572d28764c77c6f9e7 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:41:45 +0100 Subject: [PATCH 07/22] ci: refs #4922 add apt update to Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2151a43e..e5dbcd3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ ARG DEBIAN_FRONTEND=noninteractive # Apache -RUN apt-get install -y --no-install-recommends \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ apache2 \ libapache2-mod-php \ && . /etc/apache2/envvars \ From 6f85e8d611dd9250c4cf29a4c9cb5f79fef63787 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:50:10 +0100 Subject: [PATCH 08/22] ci: refs #4922 debian/rules fix --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 6e729ebd..01f1bc2e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,11 @@ %: dh $@ -clean: - npm run clean +override_dh_clean: + pnpm run clean dh_clean $@ -build: +override_dh_auto_build: pnpm install --prefer-offline pnpm exec quasar build From 42a7503f371760a93550a9040c6848b2ec6791a1 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 11 Feb 2025 11:57:29 +0100 Subject: [PATCH 09/22] ci: refs #4922 debian/rules fix --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 01f1bc2e..dc695974 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ override_dh_clean: pnpm run clean + rm -rf build-deps dh_clean $@ override_dh_auto_build: @@ -14,5 +15,5 @@ override_dh_auto_build: pnpm exec quasar build mkdir -p build-deps - cp package.json build-deps + cp package.json pnpm-lock.yaml build-deps (cd build-deps && pnpm install --prod --shamefully-hoist --config.audit=true --prefer-offline) From 29c42d7f34fda9131dfe6325085238761d29e96e Mon Sep 17 00:00:00 2001 From: taro Date: Tue, 18 Feb 2025 00:32:34 -0300 Subject: [PATCH 10/22] refactor: migrate `fetchUser` API call from PHP to Salix --- src/stores/user.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index 90aaa688..a81b3c2c 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -248,11 +248,13 @@ export const useUserStore = defineStore('user', () => { const fetchUser = async (userType = 'user') => { try { - const userData = await jApi.getObject( - 'SELECT id, nickname, name, lang FROM account.myUser' - ); - if (userType === 'user') mainUser.value = userData; - else supplantedUser.value = userData; + const _token = getToken(); + const userData = await api.get('VnUsers/getCurrentUserData', { + headers: { Authorization: _token } + }); + + if (userType === 'user') mainUser.value = userData.data; + else supplantedUser.value = userData.data; } catch (error) { console.error('Error fetching user: ', error); } From bf449548c9116521407a37ab5a98c76bf3fe2ae9 Mon Sep 17 00:00:00 2001 From: taro Date: Wed, 19 Feb 2025 02:05:42 -0300 Subject: [PATCH 11/22] =?UTF-8?q?address=20comments=20=E2=80=94=20remove?= =?UTF-8?q?=20unnecessary=20explicit=20passing=20of=20auth=20token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/user.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index a81b3c2c..7f9d8a54 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -248,10 +248,7 @@ export const useUserStore = defineStore('user', () => { const fetchUser = async (userType = 'user') => { try { - const _token = getToken(); - const userData = await api.get('VnUsers/getCurrentUserData', { - headers: { Authorization: _token } - }); + const userData = await api.get('VnUsers/getCurrentUserData'); if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; From 93c481aadf43084b994fae3a8f3e160e12ee76e5 Mon Sep 17 00:00:00 2001 From: taro Date: Wed, 19 Feb 2025 02:17:09 -0300 Subject: [PATCH 12/22] handle possible error case --- src/stores/user.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/stores/user.js b/src/stores/user.js index 7f9d8a54..992e6e06 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -250,6 +250,11 @@ export const useUserStore = defineStore('user', () => { try { const userData = await api.get('VnUsers/getCurrentUserData'); + if (!userData?.data) { + console.error('GET VnUsers/getCurrentUserData returned invalid data', userData); + return; + } + if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; } catch (error) { From 4ad4cb17e85cd19419d344f67abeb6118f1a1322 Mon Sep 17 00:00:00 2001 From: taro Date: Thu, 20 Feb 2025 04:57:23 -0300 Subject: [PATCH 13/22] refactor: remove unnecessary verification --- src/stores/user.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index 992e6e06..7f9d8a54 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -250,11 +250,6 @@ export const useUserStore = defineStore('user', () => { try { const userData = await api.get('VnUsers/getCurrentUserData'); - if (!userData?.data) { - console.error('GET VnUsers/getCurrentUserData returned invalid data', userData); - return; - } - if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; } catch (error) { From 28687c51a2b070bc25ddf0e42be93174debdba03 Mon Sep 17 00:00:00 2001 From: jgallego Date: Fri, 21 Feb 2025 13:51:34 +0100 Subject: [PATCH 14/22] fix: update French translation for 'start order' to improve clarity --- src/pages/Cms/Home.vue | 13 +++++++++++++ src/pages/Cms/HomeView.vue | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pages/Cms/Home.vue b/src/pages/Cms/Home.vue index 77d7ab25..6ad42b89 100644 --- a/src/pages/Cms/Home.vue +++ b/src/pages/Cms/Home.vue @@ -63,3 +63,16 @@ export default { } }; + + +en-US: + startOrder: Start order +es-ES: + startOrder: Empezar pedido +ca-ES: + startOrder: Començar comanda +fr-FR: + startOrder: Lancer une commande +pt-PT: + startOrder: Comece uma encomenda + diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue index a9931ca9..17494bae 100644 --- a/src/pages/Cms/HomeView.vue +++ b/src/pages/Cms/HomeView.vue @@ -99,7 +99,7 @@ es-ES: ca-ES: startOrder: Començar comanda fr-FR: - startOrder: Lancer commande + startOrder: Lancer une commande pt-PT: startOrder: Comece uma encomenda From 3bc7d1fe457f86f174ce5f7cc5eefb928ed7402f Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 21 Feb 2025 14:32:52 +0100 Subject: [PATCH 15/22] perf: remove // --- src/i18n/ca-ES/index.js | 1 - src/i18n/en-US/index.js | 2 -- src/i18n/es-ES/index.js | 2 -- src/i18n/fr-FR/index.js | 2 -- src/i18n/pt-PT/index.js | 1 - 5 files changed, 8 deletions(-) diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index 3a09fc17..456795a5 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -104,7 +104,6 @@ export default { Account: 'Compte', Addresses: 'Adreces' }, - // orderLoadedIntoBasket: 'Comanda carregada a la cistella!', loadAnOrder: 'Si us plau carrega una comanda pendent a la cistella o en comença una de nova', diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index 668ebcf9..3e21b66d 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -116,8 +116,6 @@ export default { Account: 'Account', Addresses: 'Addresses' }, - - // orderLoadedIntoBasket: 'Order loaded into basket!', loadAnOrder: 'Please load a pending order to the cart or start a new one', at: 'at', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index 6cd7f59d..5034ff70 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -113,8 +113,6 @@ export default { Account: 'Cuenta', Addresses: 'Direcciones' }, - - // orderLoadedIntoBasket: '¡Pedido cargado en la cesta!', loadAnOrder: 'Por favor carga un pedido pendiente en la cesta o empieza uno nuevo', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 1550c61f..ca81c36a 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -104,8 +104,6 @@ export default { Account: 'Compte', Addresses: 'Adresses' }, - - // orderLoadedIntoBasket: 'Commande chargée dans le panier!', loadAnOrder: 'Veuillez télécharger une commande en attente dans le panier ou en démarrer une nouvelle', diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index ce5a4f5a..39bbe5de 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -104,7 +104,6 @@ export default { Account: 'Conta', Addresses: 'Moradas' }, - // orderLoadedIntoBasket: 'Pedido carregado na cesta!', loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo', at: 'às', From 3ff4d2bf6cdffc7310eee211278ada99761af1d4 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Fri, 21 Feb 2025 14:24:46 -0300 Subject: [PATCH 16/22] Fix start order tooltip --- src/pages/Cms/HomeView.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue index 17494bae..442dfbc9 100644 --- a/src/pages/Cms/HomeView.vue +++ b/src/pages/Cms/HomeView.vue @@ -57,7 +57,9 @@ onMounted(async () => await fetchData()); color="accent" to="/ecomerce/catalog" > - {{ $t('startOrder') }} + {{ $t('startOrder') }} + From 62fc4ed82dffd0b8222486b4e2e54eed691bfa40 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Sat, 22 Feb 2025 12:30:30 +0000 Subject: [PATCH 17/22] feat: update patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bc1af14..9f0c7db4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.8.1", + "version": "25.8.2", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", From ce792f7bf69f02d2acbcd4cfcc0419006655d1d2 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Mon, 24 Feb 2025 17:52:15 -0300 Subject: [PATCH 18/22] Refactor front --- src/stores/app.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/stores/app.js b/src/stores/app.js index d950af10..d03f09eb 100644 --- a/src/stores/app.js +++ b/src/stores/app.js @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { jApi } from '@/boot/axios'; +import { jApi, api } from '@/boot/axios'; import useNotify from '@/composables/useNotify.js'; import { i18n } from '@/boot/i18n'; import { useQuasar } from 'quasar'; @@ -56,9 +56,18 @@ export const useAppStore = defineStore('hedera', { this.menuEssentialLinks = sectionTree; }, + async loadConfig() { - const imageUrl = await jApi.getValue('SELECT url FROM imageConfig'); - this.$patch({ imageUrl }); + try { + const { data } = await api.get('/ImageConfigs/getImageConfig'); + + if (!data) return; + + const [config] = data; + this.imageUrl = config?.url; + } catch (err) { + console.error(err); + } }, async init() { From c2745a673cb73b697c1f28d1b65a4b2760f75259 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 26 Feb 2025 14:01:22 -0300 Subject: [PATCH 19/22] Change request url --- src/stores/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/app.js b/src/stores/app.js index d03f09eb..ddc787c5 100644 --- a/src/stores/app.js +++ b/src/stores/app.js @@ -59,7 +59,7 @@ export const useAppStore = defineStore('hedera', { async loadConfig() { try { - const { data } = await api.get('/ImageConfigs/getImageConfig'); + const { data } = await api.get('ImageConfigs'); if (!data) return; From f4dbf9509554a8aafc7452790ef4c1fc7e77ba42 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 26 Feb 2025 14:04:54 -0300 Subject: [PATCH 20/22] Change imageUrl asignment --- src/stores/app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stores/app.js b/src/stores/app.js index ddc787c5..45077306 100644 --- a/src/stores/app.js +++ b/src/stores/app.js @@ -63,8 +63,7 @@ export const useAppStore = defineStore('hedera', { if (!data) return; - const [config] = data; - this.imageUrl = config?.url; + this.imageUrl = data[0]?.url; } catch (err) { console.error(err); } From e70901ed7d821283cc8622454e2a7fa3a2222697 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 27 Feb 2025 09:28:15 +0100 Subject: [PATCH 21/22] feat: update patch version --- back/package.json | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/back/package.json b/back/package.json index 2fda20c4..104d2167 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "25.8.1", + "version": "25.8.2", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 222edda2..98d9059a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.8.1) stable; urgency=low +hedera-web (25.8.2) stable; urgency=low * Initial Release. From 1760b97e5f60ff208067f156fec117a8c738642e Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 27 Feb 2025 12:03:35 +0100 Subject: [PATCH 22/22] i18n: fr startOrder --- back/package.json | 2 +- debian/changelog | 2 +- package.json | 2 +- src/i18n/fr-FR/index.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/back/package.json b/back/package.json index 104d2167..67f9a87f 100644 --- a/back/package.json +++ b/back/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web-back", - "version": "25.8.2", + "version": "25.8.3", "description": "Verdnatura web page backend", "license": "GPL-3.0", "author": "Verdnatura Levante SL" diff --git a/debian/changelog b/debian/changelog index 98d9059a..d912b774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (25.8.2) stable; urgency=low +hedera-web (25.8.3) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index 9f0c7db4..64004f37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.8.2", + "version": "25.8.3", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura", diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index ca81c36a..d30dee52 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -49,7 +49,7 @@ export default { ] }, of: 'de', - startOrder: 'Lancer commande', + startOrder: 'Lancer une commande', // Sections titles titles: { Home: 'Accueil',