verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 60 Releases Wiki Activity
3,629 Commits 269 Branches 0 Tags 128 MiB
Commit Graph

1670 Commits

Author SHA1 Message Date
Carlos Jimenez 7d488217b5 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 13:30:07 +02:00
Carlos Jimenez 7db3a96adc #504 client/item/src/search-panel/index.js Front unit test 2018-08-22 13:29:54 +02:00
Joan Sanchez 544ed62153 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 13:28:10 +02:00
Joan Sanchez 997c4c52f9 added backend summary test #520 2018-08-22 13:28:01 +02:00
Carlos Jimenez c91163f7d1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:49 +02:00
Carlos Jimenez b20ecc307b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:23 +02:00
Carlos Jimenez 7abeebeecb #503 client/item/src/index/index.js Front unit test 2018-08-22 12:55:15 +02:00
gerard 901c0f609b bugs with date definition solved 2018-08-22 12:55:13 +02:00
gerard 05ea1dcbf1 Tarea #494 /directives/bind.js Front unit test 2018-08-22 12:41:00 +02:00
gerard dd3f13942f Tarea #468 /address/edit/index.js Front unit test 2018-08-21 14:13:11 +02:00
Joan Sanchez 300b2c2a07 catalog filter #581 2018-08-21 13:38:16 +02:00
gerard fc95597a96 Tarea #505 /summary/index.js Front unit test 2018-08-21 13:14:18 +02:00
gerard 86805769fe Tarea #505 /summary/index.js Front unit test 2018-08-21 13:13:51 +02:00
Joan Sanchez 10350ac97e css & eslint fix 2018-08-21 10:54:01 +02:00
Carlos Jimenez 2b4959ce36 #512 /main-menu/main-menu.js Front unit test 2018-08-21 09:03:51 +02:00
gerard ca523e634c Bug #589 cambiar el estado desde ticket.sales no guarda el historico 2018-08-21 07:39:01 +02:00
gerard 2d6932fe49 Little refactor 2018-08-20 14:52:37 +02:00
gerard 2bbbdcb55e Added missing file 2018-08-20 14:48:21 +02:00
gerard 83bf54569c Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-20 13:01:36 +02:00
gerard fd313a3134 Tarea #429 order.catalog click en boton + abrir añadir cantidad 2018-08-20 09:01:38 +02:00
Joan Sanchez a60720d1ed Ticket packaging refactor + front test updated 2018-08-17 14:53:25 +02:00
Joan Sanchez 4b7c87e6d0 left menu front test #511 2018-08-17 11:05:09 +02:00
Joan Sanchez 1786602187 Change landed on shipped change #458 2018-08-16 13:12:18 +02:00
Carlos Jimenez b4321816be #515 descriptor client unit test 2018-08-16 07:40:25 +02:00
Carlos Jimenez c14fe295d7 #474 descriptor-popover Front unit test and refactor of other test 2018-08-14 09:12:28 +02:00
Carlos Jimenez 8fa84c5074 #517 ticket index unit tests 2018-08-13 09:32:33 +02:00
Carlos Jimenez 90fdb5db84 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-12 10:55:27 +02:00
Carlos Jimenez 5b81308cd9 #514 ticket step 3 clientside unit tests 2018-08-12 10:55:16 +02:00
gerard 439adaf409 Tarea #471 credit/create/index.js Front unit test 2018-08-10 17:13:25 +02:00
gerard 5d503e9c19 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-10 13:21:00 +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
gerard a58e534a6d item descriptor front test 2018-08-09 16:12:28 +02:00
gerard f0df298138 Tarea #509 /create/card.js Front unit test 2018-08-09 15:42:21 +02:00
gerard e3cfe9472f Tarea #509 /create/card.js Front unit test 2018-08-09 15:40:37 +02:00
Joan Sanchez e587aebc70 client summary front test 2018-08-09 15:10:45 +02:00
Joan Sanchez 337b4114f0 address & ticket card front unit tests 2018-08-09 14:42:02 +02:00
gerard 37c24ba3dd problem solved 2018-08-09 14:18:15 +02:00
Carlos Jimenez b85ae15b54 removed unexpected focus describe 2018-08-09 13:21:15 +02:00
Carlos Jimenez e7d45274d9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-09 13:14:05 +02:00
Carlos Jimenez 8f46a455d6 #507 unitarios front tax plus refactor 2018-08-09 13:13:50 +02:00
Joan Sanchez f15d8c3087 front & back tests 2018-08-09 12:54:29 +02:00
gerard 3478d50b43 test fixed 2018-08-09 12:47:22 +02:00
gerard 83359cbf63 Tarea #508 /src/card/index.js Front unit test 2018-08-09 12:46:50 +02:00
Joan Sanchez 2fc7c0a807 Fixed translations 2018-08-09 08:57:16 +02:00
gerard 505ad27217 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:45:39 +02:00
gerard b2d3451360 Bug #422 refactorizar el summary y el card de item y añadir el visible y el available 2018-08-08 14:45:29 +02:00
Joan Sanchez 262835041f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:43:24 +02:00
gerard 7625f7806b Bug #422 refactorizar el card de item y añadir el visible y el available 2018-08-08 14:40:01 +02:00
gerard 1468c60a3a Tarea #502 /descriptor-popover/index.js Front unit test 2018-08-08 14:38:50 +02:00
Joan Sanchez 671c6bd3ff Ticket list refactor. Ticket problems, ticket total #245 & #461 2018-08-08 14:26:54 +02:00
Carlos Jimenez 5e0342c9b9 #501 unitarios getTags karma 2018-08-08 10:57:36 +02:00
Carlos Jimenez 68a3a47894 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-08 09:07:39 +02:00
Carlos Jimenez 34f0f4c853 #476 web-access/index.js Front unit test 2018-08-08 09:05:31 +02:00
Joan Sanchez a1d3a1594e Moved snackbar to center. Reduced snackbar timeout by 3sec. #573 2018-08-08 08:53:19 +02:00
gerard e71a90d422 Tarea #510 /volume/index.js Front unit test 2018-08-07 17:07:41 +02:00
gerard 6cd143428d Tarea #438 order.line 2018-08-07 16:08:42 +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
gerard 65ffade0a3 Tarea #438 order.line 2018-08-07 16:04:42 +02:00
Joan Sanchez 6b47787de8 dev modules only for developer role 2018-08-07 13:41:57 +02:00
Joan Sanchez a06f7fb01f added claim list #443 2018-08-07 12:48:55 +02:00
Joan Sanchez 72766d0759 Added module claim #442 2018-08-07 11:57:11 +02:00
Joan Sanchez 8228f49eed Fixed ticket basic data message type 2018-08-06 14:25:11 +02:00
gerard b2d12b709b Tarea #583 Refactorizar textfield y front unit test 2018-08-06 14:09:55 +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 16dfaf8943 added pointer to link class 2018-08-02 15:33:50 +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 dd22309e7c Bug #576 Cambiar los bindings del textfield 2018-08-02 15:31:01 +02:00
Joan Sanchez 781fc1b70b summary checkbox line spacing 2018-08-02 14:55:17 +02:00
gerard 2105ccb92b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 11:35:00 +02:00
gerard ee3627be16 Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-02 11:34:50 +02:00
Joan Sanchez 9ac6b2cb56 fixed client quicklink 2018-08-02 11:21:49 +02:00
gerard 71a559783c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 10:54:08 +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 25187b955f Fixed descriptor quicklinks 2018-08-02 10:06:11 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
gerard 9014e8cee1 new style for visible avaible 2018-08-02 07:47:41 +02:00
gerard 82a1aa13ad Added link class 2018-08-01 16:24:53 +02:00
gerard c461f16ce7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-01 16:09:10 +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
Joan Sanchez c5269fedfa updated fontello fonts 2018-07-31 14:41:42 +02:00
gerard 9ce117325c when you create an order now redirects to order.card.catalogue 2018-07-31 14:08:41 +02:00
Carlos Jimenez 5aae572566 renamed spec files plus fixtures update for ticket basicdata #462 e2e 2018-07-31 13:49:54 +02:00
Carlos Jimenez d2314b8a1b renamed karma spec files acordantly and removed unused ones on client client 2018-07-31 12:38:31 +02:00
Carlos Jimenez 6684642f31 removed unused spec file 2018-07-31 12:15:31 +02:00
Carlos Jimenez 0fe58f78b4 added a describe to help further implementation 2018-07-31 12:00:44 +02:00
Carlos Jimenez 6f78bc61db added separation between describes 2018-07-31 11:54:54 +02:00
Carlos Jimenez 1858cea710 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-07-31 11:51:35 +02:00
Carlos Jimenez 1136afa484 order refactor 2018-07-31 11:51:24 +02:00
gerard 21ab8a5573 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-31 11:27:01 +02:00
gerard 2355ecc66a translations added 2018-07-31 11:26:57 +02:00
Joan Sanchez 4103f7fcf6 Added sample create #440 2018-07-31 11:08:22 +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 d866e0c982 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-07-30 14:05:40 +02:00
Carlos Jimenez 7b7a0cc1e9 refactor para que funcione data bind en lineas de pedido 2018-07-30 14:05:27 +02:00
Joan Sanchez 182599f663 Fixed scroll on itemDIary to line with alertLevel 1 #433 2018-07-30 12:12:41 +02:00
Joan Sanchez 66a1f8fcfa updated fonts 2018-07-27 14:50:28 +02:00
gerard ddc6b9d77e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-27 12:20:14 +02:00
gerard 38ba6bae7a Bug #453 Fallo al cambiar el estaddo de un ticket desde sale 2018-07-27 12:20:10 +02:00
Joan Sanchez bf5a48f126 added field longName to item summary and basic data #449 2018-07-27 12:15:25 +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 c3846eaaea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-26 13:43:43 +02:00
gerard 333193f2e8 fixed descriptor size 2018-07-26 13:43:32 +02:00
Joan Sanchez 2042acac75 fixed translations 2018-07-26 12:25:25 +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 a05347d768 Order items list by isActive. #434 2018-07-26 07:46:25 +02:00
Joan Sanchez 2433d7684d Change page title #426 2018-07-25 15:14:03 +02:00
gerard a2de55fae5 Bug #437 Boton cancelar 2018-07-25 14:18:12 +02:00
gerard d6f3f22970 Bug #437 Boton cancelar 2018-07-25 13:37:27 +02:00
gerard 82b0323847 Bug #431 error con tickets sin foto 2018-07-25 11:37:15 +02:00
gerard f3ad02e28c order volume now imports fetched tags and item descriptor components 2018-07-25 11:30:44 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 73ed4d0d19 Tarea #406 order.volumen 2018-07-24 12:55:10 +02:00
gerard 9a66c950b7 bug with barcodes solved 2018-07-24 12:53:26 +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 6490234951 bug with order total solved 2018-07-24 11:28:20 +02:00
gerard ff6d86f6c2 bug with filter solved 2018-07-24 10:47:00 +02:00
Joan Sanchez 896c033594 added order catalogue #408 2018-07-24 09:35:23 +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 72d9212262 Bug #422 refactorizar el summary de item y añadir el visible y avaible 2018-07-23 09:58:07 +02:00
gerard 9a80f22e93 Tarea #405 crear order 2018-07-20 16:32:34 +02:00
Joan Sanchez b2d38ded75 right block css rule 2018-07-19 14:48:23 +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 2170697922 last entries icon added 2018-07-19 12:31:53 +02:00
gerard 000af8169f Tarea #401 Links con texto subrayado 2018-07-19 11:32:33 +02:00
gerard fffa27d621 order descriptor style 2018-07-19 10:47:35 +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 f193cd97b1 bug solved 2018-07-18 15:01:37 +02:00
gerard ed63db0af2 Tarea #405 Traducciones 2018-07-18 14:44:14 +02:00
Joan Sanchez b4ecb82ce3 Order index #418 2018-07-18 14:38:43 +02:00
gerard 3c3abb9063 Tarea #405 crear order 2018-07-18 14:21:58 +02:00
Joan Sanchez ebf38e225e Deleted unused filter methods, fixed summary css 2018-07-18 13:18:40 +02:00
Joan Sanchez 469bc4c0eb Ticket client list button on descriptor #407 2018-07-18 12:21:08 +02:00
gerard 9dd817c384 Arreglado bug en fiscal data (card.reload) 2018-07-18 12:00:06 +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
gerard 07bb32d5f3 Bug #412 Rollback de los nuevos acl de client 2018-07-18 09:29:24 +02:00
Joan Sanchez 291c00e2da Show address city & province on ticket summary #414 2018-07-18 09:23:51 +02:00
Javi Gallego 56344ac301 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-17 13:11:20 +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 144cb3ee63 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-16 13:28:59 +02:00
gerard 9aceb3ea6f refactor 2018-07-16 13:28:50 +02:00
Javi Gallego 77e0494b37 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-16 12:34:03 +02:00
Joan Sanchez 75d7c79af1 item crud model refactor #372 2018-07-16 09:28:32 +02:00
Joan Sanchez bd37f91c46 client crud-model refactor #372 2018-07-16 08:00:04 +02:00
gerard d1cf22bc65 karma test 2018-07-13 15:57:19 +02:00
gerard 2737bc0b0b Bug #403 Textfield ha dejado de mostrar los errores 2018-07-13 15:54:04 +02:00
gerard 13e9b53a73 #390 Crear nuevo tipo de textfield 2018-07-13 15:21:37 +02:00
gerard ef9b72b78c Bug #331 Revisar los ACL en back-end 2018-07-13 12:37:58 +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
Joan Sanchez 6c54b2d9e2 Updated billing-data e2e. Remplaced core VNH by LCR 2018-07-10 14:56:50 +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 9de5f6fa92 Replaced VNH by LCR #374 2018-07-10 14:47:52 +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
Joan Sanchez ae716a1453 Reload descriptor #391 2018-07-10 08:23:32 +02:00
Juan 303290af53 Merge 2018-07-09 18:07:02 +02:00
Juan 542d9dca86 #345 - Filter items by tag 2018-07-09 18:06:25 +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
Joan Sanchez 059aa3462f Payment method email translation to FR. 2018-07-05 07:34:46 +02:00
gerard 66a7cbb998 refactor textfield CR JUAN 2018-07-04 16:36:37 +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
Joan Sanchez dd1e1123bf Worker translation 2018-07-04 11:28:29 +02:00
Joan Sanchez 86a8ae0322 itemDiary, filter, grid and new directive repeat-last #346 2018-07-04 08:50:34 +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
Joan Sanchez 64eef322e9 Fixed vnTable trying to apply filter an it's not defined. 2018-07-03 14:57:08 +02:00
Juan 3208cc7851 vnTextfield style fixes 2018-07-03 14:33:31 +02:00
Juan 98001b364e vnAutoPaging renamed to vnPagination plus bugs fixed 2018-07-03 13:45:25 +02:00
Juan cfce618844 Popover horizontal alignment fixes 2018-07-03 13:36:35 +02:00
Juan 2b03f656c8 Popover overflow bugs fixed 2018-07-03 13:24:42 +02:00
Javi Gallego f417dba3ba #367 addressesPropagateRe desmarcar campo hasToInvoiceByAddress cr JOAN 2018-07-03 11:13:33 +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 df8d3078d9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-02 13:13:42 +02:00
gerard 3bca15708f Bug #312 Autocomplete intenta mostrar el valor antes de tener los datos 2018-07-02 13:13:26 +02:00
Joan Sanchez 9982b9df11 onDataChange() binding crud-model 2018-07-02 11:52:50 +02:00
Juan 6f07ae3c5c Watchers from vnLabelValue removed 2018-06-29 09:46:14 +02:00
Joan Sanchez c123207ac2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-29 08:42:45 +02:00
Joan Sanchez 6450aa8f34 vnTable toggle order only on active field 2018-06-29 08:41:53 +02:00
gerard a01fa0e9ad Bug #136 Refactorización DropDown 2018-06-28 15:56:09 +02:00
gerard 2594f170cf Bug #137 Refactorización Textfield 2018-06-28 15:54:54 +02:00
gerard 526929cd56 fdescribe deleted 2018-06-28 15:47:14 +02:00
gerard da69165fb3 Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:30:48 +02:00
gerard 5cfb11641c Tarea #373, Tarea #352 focus on first input popover 2018-06-28 15:30:11 +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
Joan Sanchez 45b3a5ce02 New grid component vnTable. #139. CR: Juan & Javi 2018-06-28 14:43:59 +02:00
Joan Sanchez dfa1d1edb2 Added new section client contacts #365 - CR: Javi 2018-06-26 09:41:27 +02:00
gerard 38914a060f Bug #348 arreglar traducciones de ticket.line 2018-06-25 18:01:45 +02:00
gerard ddb04a5d87 Bug #348 arreglar traducciones de ticket.line 2018-06-25 16:55:19 +02:00
Joan Sanchez dafd0a2f1a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-21 09:22:08 +02:00
gerard 40a9833e3e Revert texfield changes Bug #137 2018-06-21 09:17:39 +02:00
gerard 7ceda630d4 Revert Texfield 2018-06-21 09:12:35 +02:00
Joan Sanchez 57afcdf55e Intrastat code on item summary #363 2018-06-21 09:11:25 +02:00
Joan Sanchez 00018ffda4 karma test fix locale 2018-06-21 09:07:05 +02:00
Joan Sanchez afe051883e label-value component Enable/disable ellipsize #364 2018-06-21 08:46:30 +02:00
Joan Sanchez 101d8875a9 Fix textfield non-empty class with value zero 2018-06-20 14:53:24 +02:00
gerard b22e41c983 Bug #137 Refactorización Textfield 2018-06-20 14:15:14 +02:00
gerard 37e52b54b0 Tarea #333 Ultimas Entradas 2018-06-20 12:30:59 +02:00
gerard b8ff2dbb0a Tarea #333 Ultimas Entradas 2018-06-20 12:29:30 +02:00
gerard 42eacd4905 Tarea #333 Ultimas Entradas 2018-06-20 11:39:29 +02:00
Joan Sanchez 9037636de5 one-binding changed to two-way binding on finished date. 2018-06-20 09:16:15 +02:00
gerard 97c994b3e0 Bug #137 Refactorización Textfield 2018-06-20 08:41:59 +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
gerard 8448d76ebe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-19 09:06:22 +02:00
gerard f2596af6b8 Dropdown ahora acepta traducciones CR Juan 2018-06-19 09:06:04 +02:00
Joan Sanchez 8cd0a5a9e2 stackable snackbar. Updated E2E #357 2018-06-19 08:12:36 +02:00
gerard 532d20cd7f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 12:04:10 +02:00
gerard 5c92dc4216 Bug solved 2018-06-18 12:03:39 +02:00
Javi Gallego af925de00c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 07:26:12 +02:00
Juan 0aa4b8bba3 Merge branch 'test' into dev 2018-06-12 17:17:59 +02:00
Juan 3174f37e3e Routes fixed to use HTTPS 2018-06-12 17:17:40 +02:00
Javi Gallego 64da648a2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 08:01:43 +02:00
Javi Gallego 1b4c97fa6a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-09 11:56:29 +02:00
Javi Gallego 9e0e97db66 traduccion order 2018-06-09 11:56:05 +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
gerard 5e28d0485c removed duplicated model 2018-06-04 12:00:47 +02:00
gerard 689a04e21e Bug #319 Arreglar colores segun nuevas directivas de paco 2018-06-04 11:57:27 +02:00
gerard 89c9af878f Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 10:02:17 +02:00
gerard c0c3925470 Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 09:48:32 +02:00
Juan a015b790b5 Language fixes 2018-06-01 09:04:49 +02:00
Juan 27dc90ac3d Style fixes 2018-05-31 16:51:33 +02:00
Juan f9c0d0d911 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-31 16:27:21 +02:00
Juan 55ccc74402 Snackbar fixes 2018-05-31 16:27:06 +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 97c840ece7 Style fixes 2018-05-31 14:40:42 +02:00
Joan Sanchez 20897a287e Order index route 2018-05-31 14:34:15 +02:00
Juan 2a6dedfc91 Style fixes 2018-05-31 13:57:48 +02:00
Juan 0d2693d8e1 Style fixes 2018-05-31 13:45:51 +02:00
Juan e78d2e5ede Style fixes 2018-05-31 13:34:48 +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 c0167edc3e Credit insurance refactor #328 2018-05-31 07:59:42 +02:00
Joan Sanchez d6f0be2209 Remove ticket from route. Added warehouse to procedure. #326 2018-05-30 10:55:54 +02:00
gerard fc67fdd6af Tarea #315 dialog refactor needed CR JUAN 2018-05-30 08:45:02 +02:00
gerard c6a8b4cea9 Tarea #315 Card refactor needed CR JUAN 2018-05-30 08:44:01 +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
Joan Sanchez a1a0f2e0b7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-29 13:36:55 +02:00
Joan Sanchez 4dd5019ae0 Show isEqualizated on addresses list #302. CR: Javi 2018-05-29 13:36:41 +02:00
Javi Gallego 5745bfa8da permisos de imagen para marketing y compradores 2018-05-29 11:53:34 +02:00
Joan Sanchez e14ab33b9c FIlter item by name #299 2018-05-29 09:37:24 +02:00
Joan Sanchez 125c6dea37 Address state fix #325 2018-05-28 13:44:41 +02:00
Joan Sanchez ca0524f24b Navigate to address list fix. #325 2018-05-28 13:38:13 +02:00
Joan Sanchez 5199ca62f4 Send notification on payment method change. #257 2018-05-28 12:22:35 +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
gerard 3b4cde9b46 Tarea #320 Hacer que el datepicker añada el dia con la hora local 2018-05-25 08:54:47 +02:00
gerard 255a33f104 fixed error in watcher post 2018-05-24 16:09:32 +02:00
gerard 58553309ff fixed typo 2018-05-24 16:04:09 +02:00
gerard fe27f0e44f fixed bugs in recovery 2018-05-24 16:02:54 +02:00
gerard c512faf45c fixed bugs on greuge 2018-05-24 15:47:04 +02:00
gerard 9b8ee8b787 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-24 15:46:09 +02:00
Joan Sanchez 09c98368b8 Tests fix && renamed .list to .index states 2018-05-24 15:02:38 +02:00
gerard b3ce2a8630 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-24 13:44:59 +02:00
Joan Sanchez d20faedd64 Convert date to JSON #317. CR Juan 2018-05-24 11:21:44 +02:00
Joan Sanchez e7f258061c Snackbar fix message color #204. CR: Juan 2018-05-24 09:19:23 +02:00
gerard b00c6888c2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-23 14:27:54 +02:00
Joan Sanchez 3bb1c92cf5 Client routes refactor #261 2018-05-23 14:26:51 +02:00
gerard 7440909a48 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 15:07:39 +02:00
gerard 1e4cafa73d arreglado bug no mostraba las facturas 2018-05-22 15:03:31 +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
gerard 73104c4465 Bug #313 Modified tests 2018-05-21 12:03:36 +02:00
gerard 6f45a8fa5b Bug #313 Cuando cancelas vn-confirm guarda los datos igualmente 2018-05-21 11:59:23 +02:00
gerard 7f54bcb019 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-21 11:48:50 +02:00
Joan Sanchez 88cf75e088 Active client debt icon when has debt greather than zero. 2018-05-21 07:31:38 +02:00
Daniel Herrero f612cab8c0 autoPaging bug fixed 2018-05-20 19:18:05 +02:00
gerard e118798c69 Refactor multicheck para que acepte la propiedad disabled 2018-05-18 14:59:56 +02:00
Joan Sanchez 026a5b7dea Change address when client is selected on ticket basic data 2018-05-17 08:44:34 +02:00
Javi Gallego 7aa2d04d00 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-16 13:28:59 +02:00
Javi Gallego 5779e47197 buy de item.tax no se mostraba al rol buyer 2018-05-16 13:28:54 +02:00
Joan Sanchez fe60481b1f Disabled unused services 2018-05-16 13:26:36 +02:00
Joan Sanchez f0e8b90316 Added description field on item basic data #303 2018-05-16 13:02:19 +02:00
Joan Sanchez 11b7c133a4 Added package & dropdown replaced search regexp with like 2018-05-16 13:01:14 +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 3557a08d2c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-16 08:19:06 +02:00
Joan Sanchez 8f9f7c1fe6 Ticket basic data and date-picker refactor 2018-05-16 08:13:39 +02:00
Javi Gallego d5c21c046e traduccion Order 2018-05-16 08:10:43 +02:00
Joan Sanchez 5e2e898151 Shipped with datetime 2018-05-15 09:43:45 +02:00
gerard b5cfbf1246 Bug #253 Actualizar los estilos para que concuerden con la paleta 2018-05-14 12:54:17 +02:00
Joan Sanchez 325aae7ebd Changed ticket summary service path 2018-05-14 10:07:22 +02:00
Joan Sanchez f1de516a78 Edit address agencyMode combobox fix 2018-05-11 11:44:47 +02:00
gerard 7a60211023 Unhandled errors fixed CR JUAN 2018-05-11 11:20:37 +02:00
gerard 85aa3b0156 Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"" 
This reverts commit d9862b8922.
 2018-05-11 11:16:16 +02:00
gerard d9862b8922 Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta" 
This reverts commit 9b07cd444c.
 2018-05-11 11:10:15 +02:00
gerard 9b07cd444c Tarea #289 Cuando se modifica el crédito mostrar alerta 2018-05-11 11:09:07 +02:00
gerard b0d5e2958e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-11 09:04:09 +02:00
Joan Sanchez bd069a1f39 Rolling back to old pagination 2018-05-11 08:35:28 +02:00
gerard aa7dbaeccb Initial work Handle unhandled exceptions CR JUAN 2018-05-10 13:48:48 +02:00
gerard 1af698acc3 Bug #290 Componentes de ticket muestra todos los componentes existentes. 2018-05-10 13:36:26 +02:00
gerard 503e1a7163 Tarea #283 Modificar encabezado el client.summary 2018-05-09 13:58:53 +02:00
Javi Gallego d6be8f8f93 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-08 13:40:53 +02:00
gerard 4893de6808 test para el refactor de multicheck Tarea #284 2018-05-08 11:45:22 +02:00
gerard 2a259b27dc Revert "test para el refactor de culticheck Tarea #284" 
This reverts commit 58f903b294.
 2018-05-08 11:43:28 +02:00
Javi Gallego 1ce622d1e5 bug traduccion 2018-05-08 11:07:34 +02:00
gerard 58f903b294 test para el refactor de culticheck Tarea #284 2018-05-08 11:01:30 +02:00
gerard 99adbf6a86 aññadido estilo para Tarea #265 CR JUAN 2018-05-08 10:04:15 +02:00
gerard 66daec4487 eliminadas propiedades innecesarias de icon button 2018-05-08 09:59:49 +02:00
gerard b569247e91 Refactor autocomplete CR JUAN para Tarea #265 2018-05-08 09:58:49 +02:00
gerard 23c6ab7c39 Traducciones para Tarea #284 2018-05-08 09:57:47 +02:00
gerard 8cdf41d9ad Refactor multi-check para Tarea #284 CR: JUAN 2018-05-08 09:55:45 +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 c7f07d0548 Refactorizacion de icon-menu para Tarea #265 y #279 CR: JUAN 2018-05-08 09:28:25 +02:00
gerard bf87c3d2ac Refactorizacion de buton en componente para Tarea #265 CR: JUAN 2018-05-08 09:26:17 +02:00
gerard 024a248797 #265 Añadir boton ok y estado CR: JUAN 2018-05-08 09:25:15 +02:00
Joan Sanchez e1bc434f34 Added front-end & back-end "order" service #267 2018-05-07 09:08:46 +02:00
Joan Sanchez 3c0fe7a4bc Added new pagination & module index search fixed #268 2018-05-07 08:33:45 +02:00
Joan Sanchez 22250984ae CSS class ellipsize with max-width 20em 2018-05-04 14:27:45 +02:00
Joan Sanchez 681731e886 back-end refactor & item search fix. #260 2018-05-04 11:46:03 +02:00
Daniel Herrero c838d98010 autoPaging bug fixed onScroll 2018-05-03 20:46:08 +02:00
Javi Gallego eaf4bbbdbb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-03 19:31:40 +02:00
Joan Sanchez 850f033b63 Recovery list added new pagination component 2018-05-03 13:28:46 +02:00
Javi Gallego b3405a3164 Bug #252 CR Juan 2018-05-02 11:54:13 +02:00
Javi Gallego 80a3f0a914 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-02 08:57:19 +02:00
Daniel Herrero 33f7b2d45a renamed action 2018-04-30 14:00:09 +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
Daniel Herrero 50011bff8e getWatchers function 2018-04-30 12:30:56 +02:00
Javi Gallego 118638a38b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-30 08:33:36 +02:00
Javi Gallego b7c310bd50 nueva fuente fontello 2018-04-27 10:01:29 +02:00
Juan 64cf636f90 Merge 2018-04-27 09:57:15 +02:00
Juan 0c99ca6f17 Jenkins test 2018-04-27 09:55:58 +02:00
Carlos Jimenez 21080b740f minor refactors and slint error fixes 2018-04-26 16:42:18 +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
gerard 709b06e4ea Tarea #278 Refactor descriptor item CR Carlos 2018-04-24 14:40:12 +02:00
gerard 05f6603e92 Bug #264 sumario ticket no respeta margenes 2018-04-23 11:56:59 +02:00
Gerard d8dc1f742c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-23 11:17:38 +02:00