| Item | Description | Quantity | -m³ per unit | m³ per quantity | -total m³ | {{::sale.itemFk}} | {{::sale.quantity}} | -{{::sale.volume.m3_uni | number:3}} | -{{::sale.volume.volumeTimesQuantity | number:3}} | -{{::sale.volume.m3_total | number:3}} | +{{::sale.volume.m3 | number:3}} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| No results | diff --git a/client/ticket/src/volume/index.js b/client/ticket/src/volume/index.js index 1783f32abe..43ef6ba0c2 100644 --- a/client/ticket/src/volume/index.js +++ b/client/ticket/src/volume/index.js @@ -1,5 +1,6 @@ import ngModule from '../module'; import FilterTicketList from '../filter-ticket-list'; +import './style.scss'; class Controller extends FilterTicketList { constructor($scope, $http, $translate, $timeout, $state) { @@ -8,7 +9,6 @@ class Controller extends FilterTicketList { this.$http = $http; this.$translate = $translate; this.onOrder('itemFk', 'ASC'); - this.ticketVolumes = []; } diff --git a/client/ticket/src/volume/style.scss b/client/ticket/src/volume/style.scss new file mode 100644 index 0000000000..2900023a10 --- /dev/null +++ b/client/ticket/src/volume/style.scss @@ -0,0 +1,6 @@ + +.totalBox { + border: 1px solid #CCC; + text-align: left; + align-self: flex-end; +} diff --git a/services/loopback/common/methods/ticket/getTotalVolume.js b/services/loopback/common/methods/ticket/getTotalVolume.js new file mode 100644 index 0000000000..117c3c62f6 --- /dev/null +++ b/services/loopback/common/methods/ticket/getTotalVolume.js @@ -0,0 +1,24 @@ +module.exports = Self => { + Self.remoteMethod('getTotalVolume', { + description: 'Returns the total volume of a ticket', + accessType: 'READ', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'ticket id', + http: {source: 'path'} + }], + returns: { + root: true + }, + http: { + path: `/:id/getTotalVolume`, + verb: 'GET' + } + }); + + Self.getTotalVolume = async ticketFk => { + return (await Self.rawSql(`SELECT vn.ticketTotalVolume(?) totalVolume, vn.ticketTotalVolumeBoxes(?) totalBoxes`, [ticketFk, ticketFk]))[0]; + }; +}; diff --git a/services/loopback/common/models/ticket.js b/services/loopback/common/models/ticket.js index fb8188efee..a2897354c5 100644 --- a/services/loopback/common/models/ticket.js +++ b/services/loopback/common/models/ticket.js @@ -3,6 +3,7 @@ module.exports = Self => { require('../methods/ticket/changeWorker')(Self); require('../methods/ticket/filter')(Self); require('../methods/ticket/getVolume')(Self); + require('../methods/ticket/getTotalVolume')(Self); require('../methods/ticket/summary')(Self); require('../methods/ticket/getTotal')(Self); require('../methods/ticket/getTaxes')(Self); diff --git a/services/salix/client/version-notes.html b/services/salix/client/version-notes.html index 3e0cbb7742..27cfd4023f 100644 --- a/services/salix/client/version-notes.html +++ b/services/salix/client/version-notes.html @@ -21,138 +21,207 @@|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # | -Estado | Asunto |
| 290 | +Componentes de ticket muestra todos los componentes existentes. | +|
| 268 | +Añadir componente de paginación a rutas con filtros | +|
| 271 | +Atajo de teclado para botones + | +|
| 226 | +Traduccion de error ticket tracking + e2e | +|
| 269 | +Test unitario de createWithInsurance.js | +|
| 217 | +Seccion Configuracion paso 3 | +|
| 289 | +Cuando se modifica el crédito mostrar alerta | +|
| 252 | +No modifica visualmente el campo Facturar por consignatario al modificar el Recargo en cualquiera de sus consignatarios | +|
| 284 | +Seccion ticket.lineas icono papelera para eliminar lineas | +|
| 253 | +Actualizar los estilos para que concuerden con la paleta de colores de Vernatura | +|
| 283 | +Modificar encabezado el client.summary | +|
| 277 | +Hacer que el descriptor de ticket se actualice cuando se modifica el estado | +|
| 278 | +Refactor descriptor item | +|
| 160 | +Limpiar tablas/vistas obsoletas del esquema salix | +|
| 285 | +Optimizar tarea de tocker y añadir funciones compiladas | +|
| 231 | +Importar de vn2008 a vn toda la funcionalidad necesaria para mostrar precio | +|
| 287 | +Si en client.fiscaldata el nif empieza por B | +|
| 265 | +Añadir boton ok y estado | +|
| 260 | +Refactorización de rutas en back-end | +|
| 267 | +Preparar esqueleto para nueva entidad order | +|
| 292 | +En el descriptor de item.list no aparece toda la informacion que deberia | +|
| 270 | +Seccion Configuracion paso 2 | +|
| 264 | +sumario ticket no respeta margenes | +|
| 281 | +ticket.lineas Mostrar boton editar | +|
| 266 | +Al hacer click en el ticket.lineas campo id articulo mostrar el descriptor de item | +|
| 166 | -In Progress | refactorizar buscador avanzado de articulos |
| 171 | -In Progress | Añadir revision |
| 211 | -In Progress | Forzar a ciertos tags |
| 213 | -In Progress | Sumario Tickets |
| 216 | -In Progress | Seccion Configuracion paso 2 |
| 124 | -Resolved | address observations validations |
| 199 | -Resolved | Añadir manejador de cliente que no existe |
| 138 | -Resolved | Refactorización Popover |
| 172 | -Resolved | E2E revision |
| 175 | -Resolved | E2E embalajes |
| 177 | -Resolved | Listar modelo saleChecked |
| 182 | -Resolved | Listar volumen del ticket |
| 196 | -Resolved | E2E listar lineas ticket |
| 198 | -Resolved | refactorizar tag con nuevo + - |
| 201 | -Resolved | Listar Mana del cliente |
| 202 | -Resolved | Añadir a Sumario Cliente una seccion financia |
| 209 | -Resolved | Contratos de credito |
| 210 | -Resolved | item tags |
| 212 | -Resolved | Mostrar solo las agencias con el campo isActive(tpv) en TRUE |
| 215 | -Resolved | Seccion Configuracion paso 1 |
| 220 | -Resolved | Al crear un consignatario mirar RE |
| 222 | -Resolved | nuevo dni españa |
| 223 | -Resolved | Manejador de errores global |
| 227 | -Resolved | traducciones pendientes |
| 219 | -Feedback | -Pair programming | -