Commit Graph

549 Commits

Author SHA1 Message Date
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +01:00
Carlos Jimenez Ruiz 1ac820478e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-21 07:40:38 +01:00
Carlos Jimenez Ruiz c3679b5642 #1077 e2e específico para login 2019-02-21 07:40:22 +01:00
Gerard 0cca3bb9ce #1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good Details
2019-02-20 17:52:36 +01:00
Carlos Jimenez Ruiz f21b88840c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-20 12:50:02 +01:00
Carlos Jimenez Ruiz ccf5c95b56 #860 E2E client/client/src/web-payment/index.js 2019-02-20 12:49:39 +01:00
Gerard d22a69f546 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-20 08:24:24 +01:00
Gerard c8623ef3da e2e now changes the agency 2019-02-20 08:24:10 +01:00
Carlos Jimenez Ruiz 250bb359e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz 7d2bc25c95 #1142 order.line total 2019-02-19 17:55:19 +01:00
Gerard de5a15778e e2e fixed
gitea/salix/dev This commit looks good Details
2019-02-19 16:37:17 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard a8a17b72bd Merge remote-tracking branch 'origin/dev' into jgallego 2019-02-19 16:10:16 +01:00
Carlos Jimenez Ruiz acc324c081 excluded tests for task #1152
gitea/salix/dev This commit looks good Details
2019-02-19 12:28:39 +01:00
Javi Gallego a0cf617cca #498 e2e arreglado
gitea/salix/jgallego This commit looks good Details
2019-02-19 08:42:36 +01:00
Gerard e85c346f45 #1102 scope en el modelo company
gitea/salix/dev This commit looks good Details
2019-02-18 14:46:25 +01:00
Gerard fd0e46516c #1060 añadir al componente check la popiedad intermediate 2019-02-14 20:17:22 +01:00
Gerard bfaf9b1ed4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 09:27:13 +01:00
Gerard 5063bd8137 #1128 item.index 2019-02-13 09:27:11 +01:00
Carlos Jimenez Ruiz 3bd137a435 minor refactor 2019-02-13 08:53:57 +01:00
Carlos Jimenez Ruiz 65c9172b43 #1126 e2e order.line + fixtures problem solved 2019-02-11 14:51:42 +01:00
Carlos Jimenez Ruiz db7bc708e6 #1051 adaptar item regularize 2019-02-07 15:02:22 +01:00
Carlos Jimenez Ruiz b5a1e52bf3 #1051 2019-02-07 14:33:52 +01:00
Carlos Jimenez Ruiz eb4e29fb48 #1051 2019-02-07 09:07:00 +01:00
Carlos Jimenez Ruiz d5839563d9 Bug #808 order.basic-data 2019-02-06 16:40:12 +01:00
Carlos Jimenez Ruiz 8aed4013e1 #1051 2019-02-06 16:08:23 +01:00
Carlos Jimenez Ruiz cdee2d21e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 14:19:31 +01:00
Gerard ffea839250 fixed broken selector 2019-02-06 12:15:08 +01:00
Carlos Jimenez Ruiz cf57d866ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 09:13:02 +01:00
Carlos Jimenez Ruiz b0420a8aac #1051 selector updated 2019-02-06 09:12:58 +01:00
Gerard f59d022da8 #1078 risk.create 2019-02-05 16:46:02 +01:00
Gerard 48bb876bea Revert "#1012 claim.action"
This reverts commit 44893b57e7.
2019-02-05 16:42:28 +01:00
Gerard 44893b57e7 #1012 claim.action 2019-02-05 16:41:36 +01:00
Carlos Jimenez Ruiz ee62ecc843 #1051 task update plus e2e fixes 2019-02-04 15:40:57 +01:00
Carlos Jimenez Ruiz ef27606047 #1087 Implementar clickIfVisible 2019-02-04 14:47:55 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz 9d8c2efa3b #1000 e2e de ticket.log 2019-02-01 12:16:39 +01:00
Carlos Jimenez Ruiz fd4205f9ab #1069 2019-01-31 17:01:33 +01:00
Carlos Jimenez Ruiz d109e480a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-31 14:14:52 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Joan Sanchez 1bcaf27563 changed currency filter, fixed tag value errors 2019-01-31 11:44:03 +01:00
Juan Ferrer 8132518186 e2e extension fixes 2019-01-31 00:34:49 +01:00
Juan Ferrer f643261a85 Styles fixed, change language moved to user config popover 2019-01-31 00:33:43 +01:00
Juan Ferrer 1dc8cafc73 Style & translation fixes 2019-01-30 23:47:06 +01:00
Carlos Jimenez Ruiz 97f28e2ef6 #1075 extension e2e forceReloadSection como fix de flow de los e2e 2019-01-30 11:09:53 +01:00
Carlos Jimenez Ruiz 8b8b3432e0 #1056 modificar e2e client.risk 2019-01-30 09:40:38 +01:00
Carlos Jimenez Ruiz 15ded03ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-30 08:51:18 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Carlos Jimenez Ruiz 85203ce207 small correction 2019-01-29 16:44:24 +01:00
Carlos Jimenez Ruiz 9def2ed863 #1055 e2e user configuration 2019-01-28 13:44:03 +01:00
Carlos Jimenez Ruiz cb8b33a476 #1055 e2e user configuration user company check 2019-01-28 13:42:11 +01:00
Carlos Jimenez Ruiz 01fd9fd5fe #1055 e2e user configuration 2019-01-28 13:41:57 +01:00
Juan Ferrer 18c7851fb7 Merge 2019-01-28 00:32:28 +01:00
Juan Ferrer 317102b612 Section titile in topbar, responsive 2019-01-28 00:26:01 +01:00
Carlos Jimenez Ruiz cb99ac2811 #1052 e2e extension para refrescar formularios/vistas 2019-01-27 21:09:54 +01:00
Carlos Jimenez Ruiz 7333cb4114 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-27 20:49:21 +01:00
Carlos Jimenez Ruiz b144f24f24 #1052 e2e extension para refrescar formularios/vistas 2019-01-27 20:49:15 +01:00
Carlos Jimenez Ruiz 84c680d8ed e2e repairs 2019-01-26 15:53:06 +01:00
Juan Ferrer 4aa3a839b7 Debug & watch enabled y default in gulp back, webpack HMR, e2e fixes 2019-01-26 13:12:18 +01:00
Carlos Jimenez Ruiz 1337e0e92f #1051 Traducciones que fallan 2019-01-24 15:35:45 +01:00
Carlos Jimenez Ruiz f33587a0b7 #1051 Traducciones que fallan 2019-01-24 14:03:01 +01:00
Juan Ferrer adfd69b393 #981 e2e passed 2019-01-24 10:57:43 +01:00
Carlos Jimenez Ruiz 2673a36578 small e2e refactors 2019-01-23 16:00:56 +01:00
Carlos Jimenez Ruiz 5240a5ada6 #1021 e2e login extension v3 2019-01-23 15:34:16 +01:00
Carlos Jimenez Ruiz 648bd46862 small e2e refactors 2019-01-23 15:33:25 +01:00
Carlos Jimenez Ruiz dc46ede513 #1020 modificar e2e ticket.tracking 2019-01-22 15:55:58 +01:00
Carlos Jimenez Ruiz 2037c3e1dd fixed broken e2e 2019-01-22 13:53:42 +01:00
Carlos Jimenez Ruiz 5f850e76e2 #884 e2e claim.detail + bug fixes en autocompleteSearch extension 2019-01-22 13:18:20 +01:00
Carlos Jimenez Ruiz 5cbeac7d6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 11:54:24 +01:00
Carlos Jimenez Ruiz e45b6886c0 selectors update 2019-01-22 11:54:17 +01:00
Gerard 457e68cd3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 10:04:53 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Juan Ferrer d856a3ae97 Merge 2019-01-21 15:22:20 +01:00
Juan Ferrer 09811d322a Descriptor style fixes 2019-01-21 15:21:24 +01:00
Bernat 6f27a2e3fd update fixtures #9466 2019-01-21 13:48:32 +01:00
Juan Ferrer 6e43b11e16 Left menu fixed 2019-01-20 18:48:03 +01:00
Juan Ferrer 2df9579f2c Summary style fixes 2019-01-20 16:47:04 +01:00
Bernat 5abe575fbe update fixture and export structure #9462 #9437 2019-01-17 11:15:23 +01:00
Carlos Jimenez b53dcc80be #942 e2e client.descriptor 2019-01-16 15:02:50 +01:00
Carlos Jimenez 3a38156fe6 #953 Client paymethod muestra error de mailer 2019-01-16 14:01:13 +01:00
Gerard 140e7b4f92 #968 ticket/servicios 2019-01-16 10:49:49 +01:00
Carlos Jimenez f586a30a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-16 08:53:05 +01:00
Carlos Jimenez 8ea3278a10 #875 e2e ticket create 2019-01-16 08:52:56 +01:00
Gerard 601295a170 #936 item.create 2019-01-16 08:46:40 +01:00
Bernat 39b053f694 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 12:39:40 +01:00
Carlos Jimenez 2ec9a57663 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 12:39:07 +01:00
Carlos Jimenez 90ec5ac7dd selectors update 2019-01-15 12:38:58 +01:00
Bernat b4b630118a merge 2019-01-15 12:38:07 +01:00
Bernat bb8a9e2035 fix test and update fixtures #9153 2019-01-15 12:28:13 +01:00
Gerard 5312248dad excluded test due hidden module ticket services 2019-01-15 11:51:17 +01:00
Carlos Jimenez da2d805824 naming correction 2019-01-15 08:50:50 +01:00
Carlos Jimenez 7e6d8dff39 removed fdescribe 2019-01-15 08:40:16 +01:00
Carlos Jimenez 6e74ce777d acl updated 2019-01-15 08:39:42 +01:00
Carlos Jimenez b1372c3e31 #883 e2e claim.development 2019-01-15 08:33:19 +01:00
Bernat 1623655e3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 07:15:25 +01:00
Carlos Jimenez 732771495f #892 e2e ticket.services 2019-01-14 12:55:56 +01:00
Bernat bb6a889936 #9029 fix test and update fixtures 2019-01-14 12:49:17 +01:00
Carlos Jimenez 6865f606a4 #892 e2e ticket.services 2019-01-14 11:19:39 +01:00
Carlos Jimenez 929a0ee561 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-14 09:04:39 +01:00
Carlos Jimenez 9bb888f52f section bugs #776 unfinished 2019-01-11 18:00:29 +01:00
Bernat 3faf03cf9f fix test and update fixtures 2019-01-11 15:06:18 +01:00
Carlos Jimenez 203a674407 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-11 12:49:06 +01:00
Carlos Jimenez abfa544a4c removed fdescribe 2019-01-11 12:48:52 +01:00
Carlos Jimenez 9dcad609d4 #776 e2e de ticket.log 2019-01-11 12:41:07 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Bernat 07637da5d5 merge 2019-01-10 09:13:06 +01:00
Carlos Jimenez edfba5e7a7 updated test for task #953 2019-01-10 08:54:21 +01:00
Bernat 85b4f46479 structuredb step 2 2019-01-10 07:26:10 +01:00
Carlos Jimenez 7bb1033162 #863 e2e client.paymethod update 2019-01-09 16:45:56 +01:00
Gerard 16333e6143 updated selectors 2019-01-09 13:49:37 +01:00
Juan Ferrer 3f215c5265 Merge branch 'test' into dev 2019-01-09 12:40:44 +01:00
Carlos Jimenez 40434dd694 removed fdescribe 2019-01-09 11:17:35 +01:00
Juan Ferrer 5130295a0c Deploy test 2019-01-08 23:51:24 +01:00
Gerard c3d23fb657 #891 e2e order.basic-data 2019-01-08 12:02:38 +01:00
Carlos Jimenez 3dc64c8aa4 small typo corrected 2019-01-07 16:27:55 +01:00
Carlos Jimenez e85405eb9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-07 10:55:35 +01:00
Carlos Jimenez 0ac99b9d8b #907 Extensiones nightmare 2019-01-07 10:55:23 +01:00
Carlos Jimenez f67dce0a91 #907 Extensiones nightmare 2019-01-07 09:33:07 +01:00
Juan Ferrer f3a52a9b43 Paths fixed, unused files removed, deploy fixes 2019-01-07 08:41:54 +01:00
Juan Ferrer 5241fac7de #814 Docker & test 2019-01-04 13:32:04 +01:00
Juan Ferrer f89cb0e661 #424 Plus tests fixes 2018-12-19 08:42:07 +01:00
Gerard 6203abafa6 test fixed 2018-12-14 13:47:32 +01:00
Gerard 380294a7f6 added provisional wait 2018-12-14 11:39:41 +01:00
Gerard 399baf9576 modified selectors 2018-12-13 15:04:36 +01:00
Carlos Jimenez 19b533aff0 added wait to avoid extensions to break test run 2018-12-13 12:01:33 +01:00
Carlos Jimenez dc43a8bced corrected small typos 2018-12-13 11:35:13 +01:00
Gerard 181baebec9 #836 borrar linea debe tener el icono de la papelera 2018-12-11 08:50:54 +01:00
Carlos Jimenez de24fdfac8 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-12-03 00:45:52 +01:00
Carlos Jimenez 4d42e417c0 #781 Extensiones nightmare for search and access sections 2018-12-03 00:45:34 +01:00
Gerard 5305bfcae1 test fixed 2018-11-29 14:24:57 +01:00
Gerard 7a368f3dd0 salesperson is now accessory 2018-11-29 11:06:57 +01:00
Joan d7c567c661 autoload en componente table #876 2018-11-27 15:02:54 +01:00
Carlos Jimenez 2bcfb0532e #781 Extensiones nightmare loginAndModule extenstion 2018-11-23 08:05:57 +01:00
Carlos Jimenez 00d0342d50 #781 Extensiones nightmare correct usage of extensions 2018-11-22 15:44:33 +01:00
Carlos Jimenez d571bdbbb3 error corrected 2018-11-22 12:53:11 +01:00
Carlos Jimenez b0d531756e #781 implemented waittoGetProperty and nightmare extensions registration 2018-11-22 12:34:20 +01:00
Carlos Jimenez 635a80104b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-21 16:59:16 +01:00
Carlos Jimenez 53333df3a7 #781 Extensiones nightmare 1st steps 2018-11-21 16:59:09 +01:00
Joan 59c67290ca Modules index do not load data automatically 2018-11-21 14:30:32 +01:00
Carlos Jimenez a3be9a1b6d #833 e2e ticket.request 2018-11-21 14:09:22 +01:00
Gerard 134def6d65 #821 Back da errores de forma incorrecta en Pay Method 2018-11-21 11:53:18 +01:00
Gerard 4283012b2b #832 refactor ticket.request 2018-11-21 08:58:34 +01:00
Carlos Jimenez 8f307b28b6 e2e refactor 2018-11-20 14:22:00 +01:00
Carlos Jimenez f90bad0719 #822 E2E client.fiscal-data 2018-11-20 14:21:24 +01:00
Javi Gallego ae3d8f93a1 Tarea #782 client validacion back recargo 2018-11-20 11:02:57 +01:00
Carlos Jimenez b667c07d12 #828 E2E client.risk 2018-11-19 14:33:18 +01:00
Carlos Jimenez 0b3c898a46 #827 E2E seccion ticket/weekly 2018-11-19 09:27:15 +01:00
Carlos Jimenez c20cb9af37 #827 E2E seccion ticket/weekly 2018-11-19 08:57:11 +01:00
Carlos Jimenez ed15d5566e #820 e2e item.diary 2018-11-16 12:03:52 +01:00
Carlos Jimenez e213511cb3 #816 e2e ticket.sale botón mas 2018-11-15 14:15:34 +01:00