Commit Graph

315 Commits

Author SHA1 Message Date
Carlos Jimenez 5b81308cd9 #514 ticket step 3 clientside unit tests 2018-08-12 10:55:16 +02:00
Joan Sanchez a3d15965ab packaging & component back tests 2018-08-10 11:40:48 +02:00
Joan Sanchez 3c79f3cc7b ticket summary unit test 2018-08-10 07:43:39 +02:00
Joan Sanchez 337b4114f0 address & ticket card front unit tests 2018-08-09 14:42:02 +02:00
Joan Sanchez 2fc7c0a807 Fixed translations 2018-08-09 08:57:16 +02:00
Joan Sanchez 671c6bd3ff Ticket list refactor. Ticket problems, ticket total #245 & #461 2018-08-08 14:26:54 +02:00
gerard f170f7b621 sale now rolls back to olda data when it cant update the price 2018-08-07 16:06:44 +02:00
Joan Sanchez 8228f49eed Fixed ticket basic data message type 2018-08-06 14:25:11 +02:00
gerard 7367792d91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-06 11:58:08 +02:00
Bernat c177bc7ab9 fix test and fixtures for itemTags updated 2018-08-03 08:29:38 +02:00
gerard a758cad2de focus deleted 2018-08-03 08:25:13 +02:00
Joan Sanchez 901398cfa7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-03 07:52:44 +02:00
Joan Sanchez 8ce1e5ebf7 Added ticket pictures section #430 2018-08-03 07:52:37 +02:00
gerard 2fa91ef59d getVAT now doesn't make a call when it can't 2018-08-02 15:39:32 +02:00
gerard 17b70192af Bug #576 Cambiar los bindings del textfield 2018-08-02 15:34:48 +02:00
gerard 84462be55a revert Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-02 15:33:24 +02:00
gerard ee3627be16 Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-02 11:34:50 +02:00
gerard 49ea108771 Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado 2018-08-02 10:54:03 +02:00
Joan Sanchez d83665a0c5 show itemDiary icon on ticket descriptor popover. #441 - CR Javi 2018-08-01 12:15:09 +02:00
Carlos Jimenez b5356eb07d spec files renamed accordingly, plus linter or indentation corrections 2018-08-01 09:47:34 +02:00
Carlos Jimenez 5aae572566 renamed spec files plus fixtures update for ticket basicdata #462 e2e 2018-07-31 13:49:54 +02:00
gerard 564d4f63b8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-30 14:46:09 +02:00
gerard 2d9edcef52 fixed wrong calls to functions 2018-07-30 14:46:04 +02:00
Carlos Jimenez 7b7a0cc1e9 refactor para que funcione data bind en lineas de pedido 2018-07-30 14:05:27 +02:00
gerard 38ba6bae7a Bug #453 Fallo al cambiar el estaddo de un ticket desde sale 2018-07-27 12:20:10 +02:00
gerard f87ccee0b2 fixed bugs of client descriptor popover 2018-07-27 09:44:25 +02:00
gerard d2359af6ba added client descriptor popover to ticket descriptor 2018-07-26 14:02:23 +02:00
gerard fa9494fe03 added styles 2018-07-26 13:49:01 +02:00
gerard 296508d216 Tarea #428 Componentizar descriptor de client 2018-07-26 12:06:53 +02:00
gerard d569c19a8a readded scope refresh 2018-07-26 09:16:33 +02:00
gerard 0f1227a47b removed dummy buttons 2018-07-26 09:12:25 +02:00
Joan Sanchez 2433d7684d Change page title #426 2018-07-25 15:14:03 +02:00
gerard 82b0323847 Bug #431 error con tickets sin foto 2018-07-25 11:37:15 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 446a503ee5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-24 12:22:54 +02:00
gerard a04b592633 padding added 2018-07-24 12:22:49 +02:00
Joan Sanchez bea6378f6a Change shipment date on landed data selection. #410 2018-07-24 12:14:35 +02:00
gerard 5d64376212 rollback 2018-07-23 14:45:01 +02:00
gerard 17e1bd351c Tarea #401 Links con texto subrayado 2018-07-23 10:59:49 +02:00
gerard 71d63aea4f watchers reducidos 2018-07-19 14:09:50 +02:00
gerard 927c3d05a8 Bug #423 Añadir el total de greuge arriba de la pagina 2018-07-19 14:06:35 +02:00
gerard 000af8169f Tarea #401 Links con texto subrayado 2018-07-19 11:32:33 +02:00
gerard b58219b856 Bug #419 Refactorizar vn-fetched-tags para que sea independiente de sale 2018-07-19 10:44:57 +02:00
gerard fb81c473c1 bug solved 2018-07-18 15:10:05 +02:00
gerard 53c790de76 Bug #412 Traducciones 2018-07-18 09:32:05 +02:00
gerard e7f55054a0 Bug #412 en vez de anular la acción, se guardan los datos 2018-07-18 09:31:45 +02:00
Joan Sanchez 291c00e2da Show address city & province on ticket summary #414 2018-07-18 09:23:51 +02:00
gerard 21678340f7 sale now shows available 2018-07-17 13:04:47 +02:00
gerard 8f5c7e3427 fixed typo 2018-07-17 13:04:24 +02:00
gerard f734fc8c02 fotos de los items mas grandes 2018-07-17 12:05:45 +02:00
Joan Sanchez ef71f5c7cf item & ticket crud-refactor #372 2018-07-17 08:44:31 +02:00
gerard 26e95bfa56 refactor 2018-07-16 13:31:03 +02:00
gerard 9aceb3ea6f refactor 2018-07-16 13:28:50 +02:00
gerard d1cf22bc65 karma test 2018-07-13 15:57:19 +02:00
gerard 13e9b53a73 #390 Crear nuevo tipo de textfield 2018-07-13 15:21:37 +02:00
gerard b8fe5500a1 Bug #400 Al eliminar un pedido no te dice que ha sido eliminado 2018-07-12 12:55:31 +02:00
gerard 67030370a1 Bug #398 El SPLUR crea los nuevos tickets sin Alias(nickname) 2018-07-11 13:52:04 +02:00
gerard c2c4aa23cf Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-11 09:56:11 +02:00
gerard 50f4ee85cc Tarea #383 En ticket.lines mostrar fotos 50x50 2018-07-11 09:56:07 +02:00
Joan Sanchez b01c237769 Show city and province on address autocomplete #395 2018-07-11 09:11:45 +02:00
gerard 0f795102cb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-10 14:55:20 +02:00
gerard 1df2daa569 Bug #379 Loopback trata las horas en UTC y deberia tratarlas en CEST 2018-07-10 14:55:13 +02:00
Joan Sanchez 5d2263fb19 ticket tracking READ ACL. Hide edit button. 2018-07-10 14:30:52 +02:00
Joan Sanchez 2d020268fe Change dueDay to 5 only with paymethod with iban #341 2018-07-10 14:13:47 +02:00
Joan Sanchez d681398b50 fix volume translation 2018-07-10 08:29:50 +02:00
gerard 88633f3741 fixed bug were VAT was not disponible and refactor of popover 2018-07-09 15:06:36 +02:00
gerard bd2ad7fa54 bug "no results" solved 2018-07-09 14:38:08 +02:00
gerard 7b99d2b951 Tarea #356 Crear Order 2018-07-09 13:59:30 +02:00
gerard f4417f924a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-09 13:54:49 +02:00
gerard 18929e379c Tarea #356 Crear Order 2018-07-09 13:54:43 +02:00
Joan Sanchez 10953841ec show grade on client summary + fix insurance datetime #375 2018-07-09 13:01:46 +02:00
gerard e90ba9d785 Bug #379 Loopback guarda las horas en UTC 2018-07-09 12:47:22 +02:00
gerard 813c490c5b fixed a bug with the hours representation 2018-07-09 12:35:06 +02:00
gerard edbad4eaa4 karma test 2018-07-09 12:21:43 +02:00
gerard 67d689443a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-09 09:48:11 +02:00
gerard 790dcad11e Tarea #354 seccion ticket.line menu de mover lineas 2018-07-09 09:48:00 +02:00
Joan Sanchez 5608b1bd26 itemDiary alertLevel replaced by state name #384 2018-07-09 09:37:38 +02:00
gerard 3f1d2494f2 Bug #389 ADD TURN HACIA NUEVO TICKET ACCESS DENIED 2018-07-09 09:16:01 +02:00
gerard efc588180f Bug #388 no se actualiza el simulador 2018-07-09 09:09:08 +02:00
Juan 96d755cd21 Code linting, code clean 2018-07-06 16:32:23 +02:00
gerard 354c2a8369 test fixed 2018-07-06 16:29:31 +02:00
gerard 0c7676d3e5 fixed test 2018-07-06 16:27:34 +02:00
gerard 2ac0c34085 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-04 14:44:02 +02:00
gerard 78bab7c5a8 352 ticket.lines Modificar descuento haciendo click en campo descuento 2018-07-04 14:42:02 +02:00
gerard 36a3d04216 Tarea #330 Añadir a ticket.line el indicador de problemas 2018-07-04 14:41:01 +02:00
Juan 1e54b9e228 Merge 2018-07-04 12:25:24 +02:00
Juan b49bd3d903 Filters optimized for numeric values 2018-07-03 17:41:41 +02:00
gerard 7918484156 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:24:08 +02:00
gerard 5a6baa646f Bug #378 test 2018-07-03 15:23:10 +02:00
Joan Sanchez 28a2c45c46 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:01:19 +02:00
Joan Sanchez 7dc1d5c811 Added saleTracking section #351. CR: Juan + Javi 2018-07-03 15:00:33 +02:00
gerard 8a655a7003 Bug #378 Refactorizar marcar como reservado para que no utilice el crud 2018-07-03 15:00:16 +02:00
Joan Sanchez d461e8e2fa responsive fetched-tags 2018-07-03 14:58:38 +02:00
Juan 98001b364e vnAutoPaging renamed to vnPagination plus bugs fixed 2018-07-03 13:45:25 +02:00
gerard fb31004c08 Bug #377 Eliminar lineas no ofrece un dialog de confirmacion 2018-07-02 14:14:16 +02:00
gerard a9b095a3bd Bug #376 2018-07-02 13:18:22 +02:00
gerard 48e44bd610 Bug #376 dropdown "more" en ticket.sale no actualiza sus datos 2018-07-02 13:17:01 +02:00
gerard cb34b11b99 Solverd bug related to Bug #312 2018-07-02 13:14:14 +02:00
gerard da69165fb3 Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:30:48 +02:00
gerard accd66f63a Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:21:04 +02:00
gerard 54ee27dcef Tarea #355, Tarea #354, Tarea #352 SALE 2018-06-28 15:17:50 +02:00
gerard ddb04a5d87 Bug #348 arreglar traducciones de ticket.line 2018-06-25 16:55:19 +02:00
Joan Sanchez 0ab7d09a41 Hour translation 2018-06-19 14:37:56 +02:00
Joan Sanchez 8f6a88f9b6 Display sale taxes #342 2018-06-19 12:10:38 +02:00
Joan Sanchez db5457420d Mark/Unmark sale as reserved #349 2018-06-19 09:09:49 +02:00
Joan Sanchez 8cd0a5a9e2 stackable snackbar. Updated E2E #357 2018-06-19 08:12:36 +02:00
Javi Gallego 64da648a2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 08:01:43 +02:00
Juan 240f080de3 Icons updated, test fixed, paging rows adjusted 2018-06-08 13:26:06 +02:00
Juan 2951a737a7 Merge 2018-06-07 23:56:16 +02:00
Juan 9fa12d4baf Automatic pagination with vnPagination, improved vnSearchbar 2018-06-07 23:47:19 +02:00
Javi Gallego e891d7f3e6 traducciones 2018-06-07 13:31:52 +02:00
gerard 8c34dba79e Tarea #296 seccion ticket.line menu de mover lineas 2018-06-06 16:54:40 +02:00
Joan Sanchez d316b17899 Merge branch 'dev' into test 2018-05-31 14:58:51 +02:00
Joan Sanchez 4173180fde fixed eslint rules 2018-05-31 14:48:10 +02:00
Juan 3c9d8f32bb Merge 2018-05-31 11:56:52 +02:00
Juan a78bb24e09 Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError 2018-05-31 11:52:39 +02:00
Joan Sanchez 804218cdae Iconos en descriptor de ticket #329 2018-05-31 08:57:25 +02:00
Joan Sanchez d6f0be2209 Remove ticket from route. Added warehouse to procedure. #326 2018-05-30 10:55:54 +02:00
Juan 3833339cc6 Merge 2018-05-29 17:46:10 +02:00
Joan Sanchez 8878593bbe Show item descriptor on itemFk click 2018-05-29 14:33:29 +02:00
Joan Sanchez 34ff655617 responsive fetched-tags component #323 CR: Juan 2018-05-29 13:51:39 +02:00
Javi Gallego f4423e3fb5 fix ticket-volume 2018-05-28 09:30:00 +02:00
Javi Gallego 8b03ba420f #309 seccion ticket.volume con m3 y sumatorio CR juan 2018-05-28 09:16:06 +02:00
Joan Sanchez 74410d4045 getVolume route should return only data #324 CR: Juan 2018-05-28 08:52:18 +02:00
Juan 30aea3d086 Tests fixed, watcher refactor, global error handling, angular 1.7 2018-05-25 17:25:35 +02:00
Joan Sanchez 7a5d8bdd03 Added warehouse & isDeleted on ticket basic data #322 2018-05-25 11:40:04 +02:00
Joan Sanchez 2aee807915 Item,ticket services refactor and TicketComponent test fix #261 2018-05-25 10:03:45 +02:00
Joan Sanchez d20faedd64 Convert date to JSON #317. CR Juan 2018-05-24 11:21:44 +02:00
Juan 518a82bf26 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 11:44:33 +02:00
Juan 2f1e5b4fb4 #82 Non-generated files removed from generated directory, vnTooltip refactor 2018-05-22 11:44:24 +02:00
gerard d21b57e536 Refactor step-one unit test 2018-05-22 08:14:16 +02:00
Joan Sanchez 026a5b7dea Change address when client is selected on ticket basic data 2018-05-17 08:44:34 +02:00
gerard 0fdb4a4785 Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL 2018-05-16 12:56:46 +02:00
Joan Sanchez 8f9f7c1fe6 Ticket basic data and date-picker refactor 2018-05-16 08:13:39 +02:00
Joan Sanchez 5e2e898151 Shipped with datetime 2018-05-15 09:43:45 +02:00
Joan Sanchez 325aae7ebd Changed ticket summary service path 2018-05-14 10:07:22 +02:00
Joan Sanchez bd069a1f39 Rolling back to old pagination 2018-05-11 08:35:28 +02:00
gerard 1af698acc3 Bug #290 Componentes de ticket muestra todos los componentes existentes. 2018-05-10 13:36:26 +02:00
gerard 23c6ab7c39 Traducciones para Tarea #284 2018-05-08 09:57:47 +02:00
gerard 6544d0161c Tarea #284 Seccion ticket.lineas icono papelera para eliminar lineas 2018-05-08 09:54:14 +02:00
gerard a9ade07aa0 Cambiado ticketTracking por tracking CR JUAN 2018-05-08 09:40:37 +02:00
gerard 1460887ca2 Añadido metodo en ticket card para que se actualicen datos del ticket 2018-05-08 09:30:55 +02:00
gerard 024a248797 #265 Añadir boton ok y estado CR: JUAN 2018-05-08 09:25:15 +02:00
Joan Sanchez 3c0fe7a4bc Added new pagination & module index search fixed #268 2018-05-07 08:33:45 +02:00
Joan Sanchez 681731e886 back-end refactor & item search fix. #260 2018-05-04 11:46:03 +02:00
Daniel Herrero 628dd5a99b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-30 13:57:14 +02:00
Daniel Herrero a7e5f1a623 new component for infinite scroll vnAutoPaging 2018-04-30 13:57:10 +02:00
Bernat c31d1ed888 update fixtures and dumpedfixtures with table vn.state 2018-04-30 12:48:29 +02:00
Carlos Jimenez 57123f4887 #266 popover for item descriptor on ticket section plus some minor refactors on inte tags relations 2018-04-26 16:41:08 +02:00
gerard 03ffbd4e77 cambio del tamaño del titulo para que concuerde con los mockups 2018-04-24 14:47:00 +02:00