From c870e8b3676a21c1b8d02ff2fa55cde94b72b2cf Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 9 Nov 2023 09:28:53 +0100 Subject: [PATCH 01/12] refs #6415 fix: package version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ab5883b3..454e53e53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "23.42.01", + "version": "23.46.01", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", @@ -53,4 +53,4 @@ "vite": "^4.3.5", "vitest": "^0.31.1" } -} +} \ No newline at end of file From 25e7c3231a1baeeb1f4f98691774f53f243a7bd7 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 22 Nov 2023 12:40:12 +0100 Subject: [PATCH 02/12] refs #5815 ci: set custom NODE_ENV in environment --- quasar.config.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/quasar.config.js b/quasar.config.js index cbcbae4dc..4de730515 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -66,7 +66,9 @@ module.exports = configure(function (/* ctx */) { // publicPath: '/', // analyze: true, // env: {}, - // rawDefine: {} + rawDefine: { + 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) + }, // ignorePublicFolder: true, // minify: false, // polyfillModulePreload: true, @@ -79,6 +81,12 @@ module.exports = configure(function (/* ctx */) { viteConf.build.modulePreload = { polyfill: false, }; + + // this.env={ + // 'process.env.NODE_ENV': 'test1', + // NODE_ENV: 'test2' + + // } }, // viteVuePluginOptions: {}, From 6ac89e7aa2e34189aed2d80cee5a14ae65a93d64 Mon Sep 17 00:00:00 2001 From: JAVIER SEGARRA MARTINEZ Date: Mon, 27 Nov 2023 11:57:09 +0000 Subject: [PATCH 03/12] Update quasar.config.js --- quasar.config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quasar.config.js b/quasar.config.js index 4de730515..e8f746fd6 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -81,12 +81,6 @@ module.exports = configure(function (/* ctx */) { viteConf.build.modulePreload = { polyfill: false, }; - - // this.env={ - // 'process.env.NODE_ENV': 'test1', - // NODE_ENV: 'test2' - - // } }, // viteVuePluginOptions: {}, From 615c5c1477d0808a7d203a3f0f1732b39454a5c1 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 29 Nov 2023 08:44:16 +0100 Subject: [PATCH 04/12] warmFix: ticket with null zone --- src/pages/Claim/Card/ClaimDescriptor.vue | 2 +- src/pages/Ticket/Card/TicketSummary.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index af7e84d38..fdebd1175 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -129,7 +129,7 @@ const setData = (entity) => { :label="t('claim.card.province')" :value="entity.ticket.address.province.name" /> - +