From 4c1d9cd7679242392237b511efd5171ee892c346 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 24 Aug 2023 11:32:20 +0200 Subject: [PATCH 1/4] hotFix(priceDifference): import UserError --- modules/ticket/back/methods/ticket/priceDifference.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 495e9e1aa..7dc85bd3d 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -1,3 +1,5 @@ +const UserError = require('vn-loopback/util/user-error'); + module.exports = Self => { Self.remoteMethodCtx('priceDifference', { description: 'Returns sales with price difference if the ticket is editable', From 7e0865e4b7feb0d1fe7f20b5e726c07c14cdeddd Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 25 Aug 2023 08:01:11 +0200 Subject: [PATCH 2/4] refs #5941 feat(sendToSupport): don't show the button if it doesn't have token --- front/core/components/snackbar/snackbar.js | 2 +- front/core/components/support-dialog/index.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/front/core/components/snackbar/snackbar.js b/front/core/components/snackbar/snackbar.js index 7f4583188..b380c47c3 100644 --- a/front/core/components/snackbar/snackbar.js +++ b/front/core/components/snackbar/snackbar.js @@ -27,7 +27,7 @@ export default class Controller extends Component { setTimeout(() => element.classList.add('shown'), 30); shape.element = element; - if (data.additionalData) { + if (data.additionalData && this.vnToken.token) { this.additionalData = data.additionalData; let supportButton = document.createElement('i'); supportButton.setAttribute('class', 'material-icons clickable'); diff --git a/front/core/components/support-dialog/index.js b/front/core/components/support-dialog/index.js index eaaab047f..d15c14b4a 100644 --- a/front/core/components/support-dialog/index.js +++ b/front/core/components/support-dialog/index.js @@ -7,12 +7,15 @@ export default class Controller extends Dialog { } responseHandler(response) { + if (response !== 'accept') + return super.responseHandler(response); + this.$http.post('Ostickets/send-to-support', { reason: this.reason, additionalData: this.additionalData }) - .then(() => super.responseHandler(response)) - .then(() => this.vnApp.showSuccess(this.$t('Email sended!'))); + .then(() => super.responseHandler(response)) + .then(() => this.vnApp.showSuccess(this.$t('Email sended!'))); } } From b1978b07bd513b82058892bd84084168b0719539 Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 31 Aug 2023 11:06:47 +0200 Subject: [PATCH 3/4] changes path desactualizado --- db/changes/{233201 => 233601}/00-saleGroupDetail.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename db/changes/{233201 => 233601}/00-saleGroupDetail.sql (100%) diff --git a/db/changes/233201/00-saleGroupDetail.sql b/db/changes/233601/00-saleGroupDetail.sql similarity index 100% rename from db/changes/233201/00-saleGroupDetail.sql rename to db/changes/233601/00-saleGroupDetail.sql From 4eeae466831541f07ef1b8b0f2443383802753de Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 31 Aug 2023 11:28:37 +0200 Subject: [PATCH 4/4] post subida --- CHANGELOG.md | 8 ++++++++ db/changes/233801/.gitkeep | 0 package.json | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/changes/233801/.gitkeep diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b3c43005..0cb94fc66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2338.01] - 2023-09-21 + +### Added + +### Changed + +### Fixed + ## [2336.01] - 2023-09-07 ### Added diff --git a/db/changes/233801/.gitkeep b/db/changes/233801/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json index dd833a8ad..44a651af4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-back", - "version": "23.36.01", + "version": "23.38.01", "author": "Verdnatura Levante SL", "description": "Salix backend", "license": "GPL-3.0",