verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
3,140 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

1456 Commits

Author SHA1 Message Date
Carlos Jimenez f412d3c486 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 13:07:05 +02:00
Carlos Jimenez 25ac0db1cb #497 module-loader.js Front unit test 2018-08-31 13:06:39 +02:00
Joan Sanchez 8879005854 fixed ticket list pagination 2018-08-31 12:39:57 +02:00
Carlos Jimenez bc2554e6f9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 11:25:30 +02:00
Joan Sanchez f3fc211dfa removed unused routes, filter and crud routes #409 2018-08-31 07:53:38 +02:00
Carlos Jimenez 58042027cf small refactors 2018-08-30 16:15:30 +02:00
Carlos Jimenez c0c4961717 #487 step-control.js front unit test 2018-08-30 16:15:10 +02:00
Javi Gallego c4e0fc74a3 Bug #452 quitamos servicio production 2018-08-30 11:02:50 +02:00
gerard 61b9b0c7bc Tarea #445 claim.detail 2018-08-30 09:19:09 +02:00
Joan Sanchez e698d84a4f crud-model refactor. crud-model fixes #409 2018-08-30 08:50:03 +02:00
Carlos Jimenez a1b87e473e removed unused code 2018-08-30 08:17:05 +02:00
Carlos Jimenez 8d79298d92 #478 dialog Front unit test 2018-08-30 08:16:50 +02:00
Joan Sanchez bd38d07af4 front-end unit test fixed 2018-08-30 07:15:04 +02:00
Joan Sanchez 3c954f13f3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-30 07:09:09 +02:00
Joan Sanchez 3594d5df4c back-end test fix 2018-08-30 07:09:06 +02:00
gerard 3c675b99a0 bug with clear solved CR JOAN 2018-08-29 13:55:47 +02:00
Carlos Jimenez 08ef7dee96 #444 style amends 2018-08-29 11:43:25 +02:00
Carlos Jimenez aff9f57833 #444 claim basic data 2018-08-29 09:45:37 +02:00
Carlos Jimenez 1b51ab7e6d refactor CR Joan 2018-08-29 08:15:49 +02:00
Carlos Jimenez 5d6a8f773c refactor CR Gerard 2018-08-29 08:15:23 +02:00
Carlos Jimenez 072581a0fe refactor CR Joan 2018-08-29 08:14:18 +02:00
Carlos Jimenez cad4f1617a lint errors corrected 2018-08-29 08:13:54 +02:00
Joan Sanchez 2e8f8109e7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 15:12:04 +02:00
Joan Sanchez 1d14ca1a3f updated contacts 2018-08-27 15:11:57 +02:00
gerard 740cc9f626 Bug #590 estructura basica de claim 2018-08-27 11:48:37 +02:00
gerard 5c60ba1336 Bug #590 estructura basica de claim 2018-08-27 11:41:25 +02:00
gerard 0566dd5328 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 11:40:14 +02:00
Joan Sanchez 26d2054be1 removed focus 2018-08-27 11:27:32 +02:00
Joan Sanchez 1c17adcd25 refactor client contact 2018-08-27 11:22:59 +02:00
gerard e92ae60792 Bug #590 estructura basica de claim 2018-08-24 13:16:11 +02:00
Joan Sanchez 8f45888a6b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 14:11:00 +02:00
Joan Sanchez de4d9c5bab input-range 2018-08-23 14:10:54 +02:00
Carlos Jimenez c2f89e7089 #482 popover.js Front unit test 2018-08-23 13:53:29 +02:00
Joan Sanchez c7ff42b409 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 10:08:15 +02:00
Joan Sanchez be6b2aa247 updated ticket filter #461 2018-08-23 10:08:06 +02:00
gerard c803a754d5 watcher deleted because it was causing bugs in this section 2018-08-23 08:58:28 +02:00
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