Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink

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

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');

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!')));
     }
 }
 

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',

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",