diff --git a/e2e/paths/03-worker-module/01_pbx.spec.js b/e2e/paths/03-worker-module/01_pbx.spec.js index 73c37643a..49d4db133 100644 --- a/e2e/paths/03-worker-module/01_pbx.spec.js +++ b/e2e/paths/03-worker-module/01_pbx.spec.js @@ -28,6 +28,6 @@ describe('Worker pbx path', () => { .waitToClick(selectors.workerPbx.saveButton) .waitForLastSnackbar(); - expect(result).toEqual('Data saved!'); + expect(result).toEqual('Data saved! User must access web'); }); }); diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 64427d88f..68eb76d15 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -1,5 +1,5 @@ { - "PHONE_INVALID_FORMAT": "El formato del teléfono no es correcto", + "Phone format is invalid": "El formato del teléfono no es correcto", "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito", "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia", "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado", @@ -73,12 +73,10 @@ "You cannot remove this department": "No puedes eliminar este departamento", "The extension must be unique": "La extensión debe ser unica", "The secret can't be blank": "La contraseña no puede estar en blanco", - "EXTENSION_INVALID_FORMAT": "La extensión es invalida", "We weren't able to send this SMS": "No hemos podido enviar el SMS", "This client can't be invoiced": "Este cliente no puede ser facturado", "This ticket can't be invoiced": "Este ticket no puede ser facturado", "That item is not available on that day": "El item no esta disponible para esa fecha", - "That item doesn't exists": "No existe el artículo", "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado", "This ticket can not be modified": "Este ticket no puede ser modificado", "The introduced hour already exists": "Esta hora ya ha sido introducida", @@ -90,5 +88,8 @@ "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas", "Please select at least one sale": "Por favor selecciona al menos una linea", "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket", - "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada" + "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada", + "That item doesn't exists": "El artículo no existe", + "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada", + "Extension format is invalid": "El formato de la extensión es inválido" } \ No newline at end of file diff --git a/modules/invoiceOut/back/methods/invoiceOut/download.js b/modules/invoiceOut/back/methods/invoiceOut/download.js index 1ffd10b0e..3c9924fc3 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/download.js +++ b/modules/invoiceOut/back/methods/invoiceOut/download.js @@ -36,7 +36,7 @@ module.exports = Self => { Self.download = async function(id) { let file; let env = process.env.NODE_ENV; - let [invoice] = await Self.rawSql(`SELECT hedera.invoiceGetPath(?) path`, [id]); + let [invoice] = await Self.rawSql(`SELECT invoiceOut_getPath(?) path`, [id]); if (env && env != 'development') { file = { diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml index fb8108e4e..3fa727801 100644 --- a/modules/worker/front/locale/es.yml +++ b/modules/worker/front/locale/es.yml @@ -16,4 +16,5 @@ User name: Usuario Departments: Departamentos Calendar: Calendario Search workers by id, firstName, lastName or user name: Buscar trabajadores por el identificador, nombre, apellidos o nombre de usuario -Time control: Control de horario \ No newline at end of file +Time control: Control de horario +Data saved! User must access web: ¡Datos guardados! El usuario deberá acceder con su contraseña a la web para que los cambios surtan efecto. diff --git a/modules/worker/front/pbx/index.html b/modules/worker/front/pbx/index.html index e8889704d..c0b34a73b 100644 --- a/modules/worker/front/pbx/index.html +++ b/modules/worker/front/pbx/index.html @@ -10,7 +10,6 @@ label="Extension" model="$ctrl.worker.sip.extension"> - diff --git a/modules/worker/front/pbx/index.js b/modules/worker/front/pbx/index.js index 46afe5d68..28b4b24d0 100644 --- a/modules/worker/front/pbx/index.js +++ b/modules/worker/front/pbx/index.js @@ -1,9 +1,11 @@ import ngModule from '../module'; class Controller { - constructor($scope, $http) { + constructor($scope, $http, vnApp, $translate) { this.$scope = $scope; this.$http = $http; + this.vnApp = vnApp; + this._ = $translate; } onSubmit() { @@ -15,12 +17,12 @@ class Controller { this.$scope.watcher.check(); this.$http.patch('/api/Sips', params).then(() => { this.$scope.watcher.updateOriginalData(); - this.$scope.watcher.notifySaved(); + this.vnApp.showSuccess(this._.instant('Data saved! User must access web')); }); } } -Controller.$inject = ['$scope', '$http']; +Controller.$inject = ['$scope', '$http', 'vnApp', '$translate']; ngModule.component('vnWorkerPbx', { template: require('./index.html'),