verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity
3,543 Commits 264 Branches 0 Tags 124 MiB
Commit Graph

1622 Commits

Author SHA1 Message Date
Gerard 82bdea09ae added dataUpdate event 2018-10-23 13:50:31 +02:00
Gerard 47242d9b53 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-23 12:39:44 +02:00
Gerard 6b03ead37d #744 fix edit sale bug, boton MAS descuento 2018-10-23 12:39:25 +02:00
Juan 48c41aa35f JsDoc improved for model/pagination 2018-10-23 12:14:47 +02:00
Gerard 86f6253ed7 #707 Loggable 2018-10-23 11:34:07 +02:00
Joan Sanchez f2d5e6afee Field ACL part one #689 (vn-model) beforeRemote() wrapper 2018-10-23 11:25:51 +02:00
Juan 4d97f4b43e EventEmitter fixes 2018-10-22 17:54:04 +02:00
Gerard 6ef769f209 test refactor 2018-10-22 14:36:32 +02:00
Gerard 409c78ec94 fixed bug on load 2018-10-22 14:36:07 +02:00
Gerard 1a116df136 #636 item.index 2018-10-22 14:32:05 +02:00
Juan 0034991251 Events on elements now are emitted after component linking 2018-10-22 13:29:52 +02:00
Juan a190100cae EventEmitter doc 2018-10-22 11:04:17 +02:00
Juan 93ed02e901 Merge 2018-10-22 08:24:16 +02:00
Juan e5b404cc2c Models bugs fixed, tests fixed 2018-10-22 08:23:10 +02:00
Carlos Jimenez 65f39bfa8c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-21 14:10:08 +02:00
Javi Gallego fcb3e88acb route sin risk Create 2018-10-21 12:36:51 +02:00
Carlos Jimenez 4347b0059f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-20 12:08:08 +02:00
Juan 181272086e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-19 19:54:50 +02:00
Juan 4607bce91e E2E fixes, model bug fixes, Nightmare getProperty extensions 2018-10-19 19:54:46 +02:00
Gerard 1b504febb8 fixed ACLS 2018-10-19 14:50:15 +02:00
Juan 74e234a099 vnTooltip test code improved 2018-10-19 09:33:12 +02:00
Javi Gallego c6c40de2fc # 702 Client.risk 2018-10-19 08:40:32 +02:00
Juan 2e0d5f2bde Unit test code improvements 2018-10-18 21:04:46 +02:00
Juan c4b3296959 Unit tests fixed 2018-10-18 20:48:21 +02:00
Carlos Jimenez 7093660800 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-18 11:42:56 +02:00
Carlos Jimenez 2bdfa6ff60 #633 El descriptor-popover + test 2018-10-18 11:41:25 +02:00
Juan ecee07530a Merge 2018-10-18 09:26:05 +02:00
Juan ee73068e9e #659 - Unify model beta 2018-10-18 09:24:20 +02:00
Joan Sanchez d681d61c83 Add new bank entity #736 2018-10-17 12:49:18 +02:00
Carlos Jimenez 0601bb662c #738 Petición de guardado al hacer click sobre un botón + test adaptados 2018-10-17 09:28:38 +02:00
Javi Gallego 4000926c74 Dos filtros nuevos, para monedas y porcentajes 2018-10-16 13:57:14 +02:00
Javi Gallego 33b9efc5b7 Tarea #696 2018-10-16 13:32:58 +02:00
Joan Sanchez 3826456a5a added bankEntity billing data #704 2018-10-16 13:06:58 +02:00
Joan Sanchez 54921b4982 fixed summary item descriptor #734 2018-10-16 08:38:31 +02:00
Gerard a681f6f854 Bug #635 item.data 2018-10-15 13:20:55 +02:00
Javi Gallego f25a1ecd98 #492 tooltip test 2018-10-15 12:46:56 +02:00
Joan Sanchez 589be52c6a Order filter & added model getSetValues() #722 2018-10-15 11:43:57 +02:00
Gerard 7ed52d455d Bug #730 order.catalog no añade lineas 2018-10-15 10:48:06 +02:00
Joan Sanchez e41817d29b enabled order for employee 2018-10-11 09:51:36 +02:00
Joan Sanchez 693a68ea26 vn-icon-button hide required acl buttons #708 2018-10-11 09:41:30 +02:00
Gerard 29251651a2 highlighted text now in black 2018-10-11 08:46:09 +02:00
Gerard 04f0f6d9f5 #723 order.summary 2018-10-10 14:03:56 +02:00
Gerard e91b1ef805 #723 redirect to summary 2018-10-10 12:58:27 +02:00
Gerard 060ab04084 #723 order.summary 2018-10-10 12:55:04 +02:00
Gerard 5dabb5625c merge 2018-10-10 11:50:30 +02:00
Joan Sanchez 31d655b130 Create ticket with transaction 2018-10-10 09:59:42 +02:00
Gerard 274e44368e #723 Added getTaxes to get the total taxes of an order 2018-10-08 15:21:06 +02:00
Javi Gallego 7b623cec09 Tarea #684 2018-10-08 14:38:16 +02:00
Joan Sanchez f878751ff1 Fixed mail notification bug #587 2018-10-08 13:09:30 +02:00
Gerard 7e2e2c9953 fixed test 2018-10-08 12:02:05 +02:00
Joan Sanchez 300c7a3cfe userConfig fix 2018-10-08 08:14:25 +02:00
Joan Sanchez f7e042320d regularize claim #656 2018-10-08 07:31:55 +02:00
Gerard b649ee71d9 Tarea #646 test 2018-10-05 16:13:30 +02:00
Gerard aeb774571e Tarea #646 Mejoras Historico 2018-10-05 15:53:31 +02:00
Gerard 20e76fb28d Tarea #646 item descriptor now passes the ticket id 2018-10-05 14:03:59 +02:00
Gerard 796b901378 Translations added 2018-10-05 13:06:29 +02:00
Gerard 0481cac14e Tarea #614 nueva sección cuenta 2018-10-05 13:01:46 +02:00
Gerard 8edbc40da3 unused code removed 2018-10-05 12:57:34 +02:00
Gerard bb46980f3f focus deleted 2018-10-03 11:28:50 +02:00
Gerard a607ac9efb Tarea #600 History section in client 2018-10-03 11:27:05 +02:00
Joan Sanchez 374d845d4b Descriptor/card/quicklinks fix #656 2018-10-03 08:00:19 +02:00
Gerard 1ea93211dc typo with acl fixed 2018-10-02 14:16:37 +02:00
Joan Sanchez 99d2ebb332 acl fix 2018-10-02 12:03:39 +02:00
Joan Sanchez b8d09bddb4 Import ticket sales #693 to claim actions 2018-10-02 09:52:38 +02:00
Joan Sanchez 1e604d92b4 Sale tracking get state from saleTracking instead of ticket. #695 2018-10-01 08:17:36 +02:00
Joan Sanchez 12824b1564 Added client web payment #673 2018-09-28 15:00:12 +02:00
Carlos Jimenez 504096d702 amends for #655 claim action 2018-09-27 09:50:31 +02:00
Joan Sanchez 07d5226169 Disabled route module 2018-09-27 08:55:59 +02:00
gerard a5e74335a9 Tarea #658 dialogo de añadir cantidad 2018-09-27 08:42:36 +02:00
Joan Sanchez 0277130077 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-26 14:15:09 +02:00
Joan Sanchez 80cf804714 tooltip front test #492 2018-09-26 14:15:00 +02:00
Carlos Jimenez 0c9678ada8 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-26 11:19:40 +02:00
Joan Sanchez 65edae7f83 fix route 2018-09-25 15:02:33 +02:00
Carlos Jimenez e1131c2c93 #655 [FALTA PLANIFICACION] claim.action añadir acciones Front Part 2018-09-25 14:37:35 +02:00
Joan Sanchez 0777eddf54 added zone summary #675 2018-09-25 09:28:55 +02:00
Joan Sanchez 4388a6dbff added Agency module 2018-09-25 08:53:57 +02:00
Joan Sanchez cba9c2ca47 Removed default order #591 2018-09-24 15:04:13 +02:00
Joan Sanchez bde7f64cea drop drown like 'value%' 2018-09-24 15:03:17 +02:00
Joan Sanchez 5a5640143d zone delivery days #668 2018-09-24 14:51:27 +02:00
gerard abaab3e34a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-24 12:13:11 +02:00
gerard 04a452bd82 action test updated 2018-09-24 12:12:36 +02:00
Joan Sanchez 0b5a0754fd searchbar with icons #371 2018-09-24 11:10:03 +02:00
Joan Sanchez 564370180c zone basic data 2018-09-24 10:43:54 +02:00
Joan Sanchez fec2134b8f added zone descriptor #669 2018-09-21 12:35:54 +02:00
Joan Sanchez d5ca385ccd added zone index & zone create 2018-09-19 15:05:07 +02:00
Javi Gallego 87447661b2 merge 2018-09-19 07:42:53 +02:00
Javi Gallego 68e075c496 #654 Permisos en claim.basicData 2018-09-19 07:41:07 +02:00
gerard 834d779154 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-18 14:37:15 +02:00
gerard fa9c3f4759 Tarea #602 Investigar hook 2018-09-18 14:36:41 +02:00
Joan Sanchez 469e6f8076 fixed itemDiary warehouseFk select #671 2018-09-18 13:34:11 +02:00
Joan Sanchez 9aff95904d Added model rewriteDbError() method & fixed tag bug #597 & #662 2018-09-18 10:11:51 +02:00
gerard 5c6ab8efc3 skipped tests fixed 2018-09-18 09:52:50 +02:00
gerard babadbb4f3 Bug #660 el catalogo deberia de estar deshabilitado 2018-09-18 09:37:54 +02:00
gerard 6b155c6485 reverted "Bur restoring old value" 2018-09-17 14:55:13 +02:00
gerard 97f45e7475 focus added to all vn-searcbar in modules index 2018-09-17 14:54:38 +02:00
gerard c3e9d0af95 bug restoring old value solved 2018-09-17 14:31:43 +02:00
gerard 4fb31f9522 Tarea #658 dialogo de añadir cantidad 2018-09-17 14:30:39 +02:00
Joan Sanchez f8c014b330 Merge branches 'dev' and 'dev' of https://git.verdnatura.es/salix into dev 2018-09-14 14:25:32 +02:00
gerard 569cd60d7b Tarea #601 dialogo de añadir cantidad 2018-09-14 14:20:58 +02:00
Joan Sanchez e0628786b4 added catalog front & back unit test #598 2018-09-14 14:18:39 +02:00
gerard 899f9b3fe5 Tarea #653 Crear shortcuts 2018-09-14 13:51:28 +02:00
Carlos Jimenez e90af6b851 #593 Refactor card/descriptor/descriptor-popover 2018-09-14 13:43:51 +02:00
Joan Sanchez d66383dced fixed front-end unit test textfield 2018-09-14 11:01:56 +02:00
Joan Sanchez 8feba9f5eb catalogFilter back test 2018-09-14 09:37:54 +02:00
Joan Sanchez fa31010069 catalog filters #598 2018-09-14 09:10:30 +02:00
gerard 8d1aa30287 Bug #437 Boton cancelar 2018-09-14 08:14:52 +02:00
gerard 0f14bf9d27 added translations 2018-09-13 17:00:01 +02:00
Juan fad2b78cc3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-13 15:22:42 +02:00
Juan 270f16d0db Pagination: maxLoads 2018-09-13 15:19:50 +02:00
gerard a6b63d4113 Bug #652 El componente textarea muestra mal el label 2018-09-13 14:01:26 +02:00
gerard 1e3b3b0ffa Tarea #644 Crear componente Input Number 2018-09-13 12:46:32 +02:00
gerard 094a6eda68 Bug #644 Crear componente Input Number 2018-09-13 11:27:38 +02:00
gerard 8234780252 updated fonts 2018-09-13 11:06:48 +02:00
gerard 7e309e5f62 Bug #650 En la seccion claim detail no aparecen las sales reclamables 2018-09-13 10:05:39 +02:00
Carlos Jimenez 88a4ed7fb3 #604 acl for claims 2018-09-12 15:21:20 +02:00
gerard 49b96c5cc3 test fixed 2018-09-12 11:08:48 +02:00
gerard bc4b6826fe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-12 11:06:47 +02:00
gerard e03241fcc6 Tarea #480 /icon-menu/icon-menu.js Front unit test 2018-09-12 11:06:28 +02:00
Carlos Jimenez c2f8f236fb #647 Si se hace control click en ticket.index abrir una nueva pestaña 2018-09-12 10:08:19 +02:00
Carlos Jimenez ed3c775c04 #608 order-create now redirects correctly yo the catalog 2018-09-12 08:24:19 +02:00
Javi Gallego 2e94ab28de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-11 13:56:45 +02:00
gerard f105ffa2d6 watchers reduced 2018-09-11 13:48:05 +02:00
Javi Gallego b6cc8c2fe0 merge 2018-09-11 13:44:49 +02:00
Javi Gallego c9ec4aee7e #612 añadir reclamacion 2018-09-11 12:49:31 +02:00
Carlos Jimenez a3d63825d9 indentation fix 2018-09-10 13:00:01 +02:00
Joan Sanchez 366b00a8de added chip component #624 2018-09-07 12:20:57 +02:00
Joan Sanchez a4c730cf65 enabled routes module #616 2018-09-07 09:40:45 +02:00
gerard a86120c055 Tarea #615 test multicheck 2018-09-06 16:38:49 +02:00
Joan Sanchez ca97d76adf itemDiary warehouseFk url param #622 2018-09-06 15:08:02 +02:00
Joan Sanchez dff0c561bc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-06 12:47:27 +02:00
Joan Sanchez cee940f4fa order client descriptor #609 2018-09-06 12:47:25 +02:00
gerard c33e741c14 fixed typo 2018-09-06 12:33:37 +02:00
Joan Sanchez 660310693f ticket sale translation fix 2018-09-06 12:22:12 +02:00
Javi Gallego 588308cf1e merge 2018-09-06 11:15:53 +02:00
Joan Sanchez f330c77cc6 added span to descriptor-popover links #637 2018-09-06 08:04:43 +02:00
gerard 6f3140059f claim icons added 2018-09-05 16:15:12 +02:00
gerard b2d0832daa Added missing success mesage 2018-09-05 16:14:13 +02:00
gerard 5d7c6ef250 fixed typo 2018-09-05 16:13:30 +02:00
gerard d3ce915b5d refactor to add disable 2018-09-05 13:56:07 +02:00
gerard f23ea2d821 fixed typo 2018-09-05 13:48:18 +02:00
gerard 1bfd6a8ec0 updated acl 2018-09-05 13:47:53 +02:00
gerard c04616d6dc updated acl 2018-09-05 13:47:35 +02:00
gerard c424e845d1 Tarea #606 claim.summary 2018-09-05 13:47:15 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard b5448aaa5a Tarea #446 claim.development 2018-09-05 11:48:38 +02:00
gerard 0333ba96b0 Tarea #445 claim.detail 2018-09-05 11:45:33 +02:00
gerard 732c100096 Tarea #447 claim.action 2018-09-05 11:34:23 +02:00
Joan Sanchez 6e9bc4645c translation fix 2018-09-05 07:54:45 +02:00
gerard d991731f98 bug with clear function solved 2018-09-04 16:51:29 +02:00
Joan Sanchez d3406fecde claim search-panel & connector-mysql fix date 2018-09-04 15:08:36 +02:00