verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity
12,722 Commits 261 Branches 0 Tags 123 MiB
Commit Graph

408 Commits

Author SHA1 Message Date
Juan Ferrer 38b4483edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-31 13:43:15 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good Details
2019-10-31 12:54:16 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-22 13:44:36 +02:00
Joan Sanchez 8e1d594a13 was saving data on page load #1820
gitea/salix/dev There was a failure building this commit Details
2019-10-21 13:43:17 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer de9a8443ca Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 22:28:08 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 43fd8fe75e Merge 2019-10-18 21:37:28 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Joan Sanchez 18b0ae034c #1815 - show summary correct photos on claim index
gitea/salix/dev This commit looks good Details
2019-10-18 09:53:30 +02:00
Joan Sanchez b2b76b05d8 css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:27:50 +02:00
Joan Sanchez 4ca001d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:09:03 +02:00
Joan Sanchez 79f9e616d2 added treeview unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:08:40 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 08:56:13 +02:00
Juan Ferrer a2881e5b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 16:19:38 +02:00
Juan Ferrer 3bf44d08de vnDatePicker refactor 2019-10-15 16:19:35 +02:00
Joan Sanchez 81097287fa #1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good Details
2019-10-14 11:44:54 +02:00
Juan Ferrer 7dfd1fe6f2 Merge
gitea/salix/dev This commit looks good Details
2019-10-11 17:43:29 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Joan Sanchez 756acd41ef added data-viewer
gitea/salix/dev This commit has test failures Details
2019-10-10 09:26:44 +02:00
Joan Sanchez 21c32b0af2 dialog css fixes
gitea/salix/dev This commit has test failures Details
2019-10-10 08:07:11 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Joan Sanchez a8f2000f3f Cambios mockup #1745
gitea/salix/dev This commit looks good Details
2019-10-03 11:37:44 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good Details
2019-10-02 21:02:49 +02:00
Joan Sanchez 26be791cf0 fixed styles
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-10-01 10:35:27 +02:00
Carlos Jimenez Ruiz 6c438a9109 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-01 07:56:26 +02:00
Juan Ferrer 9319067697 Front tests & DMS imports fixed
gitea/salix/dev This commit has test failures Details
2019-09-30 20:55:41 +02:00
Carlos Jimenez Ruiz 4658c843cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-30 15:24:25 +02:00
Joan Sanchez 6d54e7a89d Claim dms upload file with drag & drop #1731
gitea/salix/dev There was a failure building this commit Details
2019-09-30 14:57:54 +02:00
Carlos Jimenez Ruiz 5b38889a72 #1739 claim.detail dialog add cambiar campos 2019-09-30 14:49:04 +02:00
Carlos Jimenez Ruiz d5d7b1ef96 Bug/Test #1736 back errors 2019-09-26 13:45:42 +02:00
Joan Sanchez b64a6fd05c Mostrar fotos de reclamaciones en el summary #1732
gitea/salix/dev This commit looks good Details
2019-09-26 11:41:56 +02:00
Bernat f28305de9b Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good Details
2019-09-26 09:13:18 +02:00
Joan Sanchez 335f92173c updated transactions
gitea/salix/dev There was a failure building this commit Details
2019-09-18 15:11:09 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez 8b8463e936 Updated dms colums size #1692
gitea/salix/dev This commit looks good Details
2019-09-12 12:12:39 +02:00
Joan Sanchez 7fad401624 Send delivery note to client #1332 2019-09-06 11:06:44 +02:00
Joan Sanchez 176750046a Scroll component #643
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Joan Sanchez 6f508838c9 claim.action falla el boton import #1679
gitea/salix/dev This commit looks good Details
2019-09-04 13:39:01 +02:00
Javi Gallego 2b14a9050e Bug/Test #1679 claim.action falla el boton import
gitea/salix/dev This commit has test failures Details
2019-09-04 12:17:33 +02:00
Joan Sanchez 50c989a267 Add attendedBy and salesPerson filters #1661
gitea/salix/dev This commit looks good Details
2019-09-02 12:23:49 +02:00
Carlos Jimenez Ruiz 5e3b8fe1f0 #1648 claim.detail add cambiar campos 2019-08-28 08:08:30 +02:00
Bernat f05f3a3df7 Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good Details
2019-08-12 14:58:46 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Carlos Jimenez Ruiz 4ac419b419 #1528 e2e claim/detail 2019-07-02 14:44:36 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Joan Sanchez dae43bb9b0 transactions refactor #1546
gitea/salix/dev This commit has test failures Details
2019-06-21 08:26:59 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533
gitea/salix/dev There was a failure building this commit Details
2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz 6e029a3623 merged test fix
gitea/salix/dev This commit has test failures Details
2019-06-19 15:30:04 +02:00
Bernat 1336bf092d Test #1540 Reparar test back db
gitea/salix/dev This commit looks good Details
2019-06-19 07:20:02 +02:00
Bernat c02d576bb9 erese a fdescribe
gitea/salix/dev This commit looks good Details
2019-06-18 07:57:41 +02:00
Bernat 53f6db7a4a Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice
gitea/salix/dev This commit looks good Details
2019-06-17 12:13:05 +02:00
Bernat 5203c33483 Bug #1463 Las reclamaciones no se eliminan por completo
gitea/salix/dev This commit looks good Details
2019-06-14 09:29:23 +02:00
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 58cc90929f TX fixes, debug disabled, glob transaction timeout
gitea/salix/master This commit looks good Details
2019-06-12 17:31:45 +02:00
Bernat a6951bc0a1 Tarea #1419 claim.detail permitir modificar descuento
gitea/salix/dev This commit looks good Details
2019-06-12 08:19:02 +02:00
Bernat 62f4abf6ed Refactor #1418 claim.action Mover casilla mana
gitea/salix/dev This commit looks good Details
2019-06-04 11:00:05 +02:00
Joan Sanchez cc72432a37 accessType refactor #1460
gitea/salix/master This commit looks good Details
2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460
gitea/salix/dev This commit looks good Details
2019-05-22 12:35:24 +02:00
Bernat b86cf1d98a 1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good Details
2019-05-17 07:34:25 +02:00
Joan Sanchez 5c9d06b5d2 edit claim basic data for salesPerson #1433
gitea/salix/master This commit looks good Details
2019-05-16 10:49:27 +02:00
Joan Sanchez b70316551b edit claim basic data for salesPerson #1433
gitea/salix/dev This commit looks good Details
2019-05-16 09:33:56 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good Details
2019-05-07 11:32:35 +02:00
Bernat 86e0d66f55 #926 update fixtures and model claimState
gitea/salix/dev This commit looks good Details
2019-05-07 08:18:14 +02:00
Bernat fabe4f396f #1371 claim descriptor hour
gitea/salix/dev This commit looks good Details
2019-04-25 14:51:22 +02:00
Carlos Jimenez Ruiz 3cb7319efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-25 14:24:08 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Joan Sanchez aec46bb855 fix send notification to salesPerson #1382
gitea/salix/dev This commit looks good Details
2019-04-25 13:32:14 +02:00
Bernat b2f88872fa #1366 bug in claim-index
gitea/salix/dev This commit looks good Details
2019-04-24 09:10:56 +02:00
Carlos Jimenez Ruiz 02c63b0d5f refactor tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:46:59 +02:00
Javi Gallego 28bbc024b2 #1195 claim.action regularize 2019-04-16 08:09:16 +02:00
Bernat 6a68003d84 #1212 refactor claim filter
gitea/salix/dev This commit looks good Details
2019-04-15 11:06:42 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Javi Gallego 6eef192929 añade opcion mana con permisos
gitea/salix/dev This commit looks good Details
2019-04-11 12:44:43 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Joan Sanchez d0dc192fc4 navigate to next claim section for salesAssistant #1119
gitea/salix/dev This commit has test failures Details
2019-04-08 09:01:10 +02:00
Gerard 00b7442b89 #1247 reparar tests excluidos
gitea/salix/dev This commit looks good Details
2019-04-05 07:52:08 +02:00
Gerard 9abaa8ce51 bug sending messages to buyers fixed
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-04-04 12:05:01 +02:00
Gerard 66d94dde3a claim detail now adds a sale with its total quantity
gitea/salix/test This commit looks good Details
2019-04-01 09:03:05 +02:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Joan Sanchez 6c9f1cfdfa fix claim regularize & message.send methods #1242
gitea/salix/dev This commit looks good Details
2019-03-22 13:45:17 +01:00
Javi Gallego 0dd7e528dd #1245 bug ticket line
gitea/salix/dev This commit looks good Details
2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good Details
2019-03-01 11:50:26 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz ac6851bf4a eslint rules passed
gitea/salix/dev This commit looks good Details
2019-02-27 16:50:14 +01:00
Gerard 1324d53e1b claim action now shows ticket
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-21 13:48:34 +01:00
Gerard 444d531162 summary action now shows ticket id
gitea/salix/test This commit looks good Details
2019-02-21 07:46:27 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good Details
2019-02-19 15:09:50 +01:00
Carlos Jimenez Ruiz b034a8fab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 15:33:11 +01:00
Javi Gallego 7f7f47d861 bug no results duplicado 2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Joan Sanchez 604f75c84b Show/send claim pickup order #1106 2019-02-12 07:42:19 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Juan Ferrer 03406a7d9b Style fixes 2019-02-06 11:24:29 +01:00
Juan Ferrer 1dbb75a1b8 vnSideMenu, vnBackground, style fixes 2019-02-05 09:13:15 +01:00
Carlos Jimenez Ruiz 8e6d38ab31 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:58:14 +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 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 f27ca4ce3b #1069 descriptor de claim 2019-01-30 16:03:29 +01:00
Carlos Jimenez Ruiz f4e202dc62 #1069 index now show nicknames 2019-01-30 15:10:52 +01:00
Juan Ferrer 259079b051 Translations fixed 2019-01-30 14:13:47 +01:00
Gerard b791195b89 #1068 claim.descriptor 2019-01-30 08:44:15 +01:00
Juan Ferrer d46575a072 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 16:38:11 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Gerard d4c6d28fec Merge branch 'test' into dev 2019-01-29 11:23:42 +01:00
Gerard 036a75617a Merge branch 'master' into test 2019-01-29 11:22:48 +01:00
Gerard f6f1dba1d9 #1071 modificar update.claim para que no utilice updateAll 2019-01-29 11:14:01 +01:00
Juan Ferrer 9209424bca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-28 16:24:56 +01:00
Juan Ferrer 3e40c651af #998 worker.index 2019-01-28 16:24:45 +01:00
Joan Sanchez 0fcbc65ecc plantilla claim-pickup #1044 2019-01-28 12:28:22 +01:00
Juan Ferrer 317102b612 Section titile in topbar, responsive 2019-01-28 00:26:01 +01:00
Juan Ferrer af5ab770ec More cleaning, deps in routes.json, module autodetection 2019-01-26 02:30:46 +01:00
Joan Sanchez 8f07ac1751 print fixes & claim pickup order 2019-01-25 15:08:11 +01:00
Juan Ferrer 1ccffd63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:25:57 +01:00
Juan Ferrer 498ae5d4fe Keybindings bugs fixed 2019-01-24 09:25:51 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Juan Ferrer 30749f0f4d #981 Back & front tests passed, keybinds on it's own module routes.json 2019-01-23 17:49:28 +01:00
Gerard 61bd8740ce modal-form class renamed 2019-01-23 12:46:45 +01:00
Gerard 9ebd7a2922 unwanted property deleted 2019-01-23 08:37:52 +01:00
Carlos Jimenez Ruiz 8f23b0b127 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 14:08:35 +01:00
Carlos Jimenez Ruiz 5f850e76e2 #884 e2e claim.detail + bug fixes en autocompleteSearch extension 2019-01-22 13:18:20 +01:00
Gerard b24f0a9442 #1023 claim.detail cantidad total parecer ser erronea 2019-01-22 12:24:19 +01:00
Gerard b0a60fc94a #1023 claim.detail cantidad total parecer ser erronea 2019-01-22 10:31:12 +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
Joan Sanchez 5a53195574 agency module 2019-01-21 11:45:53 +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
Joan Sanchez 9cb298fb08 modules summary were not updating view data #978 2019-01-18 14:04:12 +01:00
Gerard 175926d7fb #965 claim.index colores 2019-01-16 15:05:35 +01:00
Gerard 542dd9f280 #973 order.action 2019-01-16 12:55:38 +01:00
Gerard 08a9233e8d #964 claim bugs solved 2019-01-15 12:06:19 +01:00
Gerard f5d44bbbd1 ids removed due duplicities 2019-01-15 08:56:20 +01:00
Gerard 24837b231f added missing autoload property 2019-01-14 11:47:34 +01:00
Gerard 100871edf6 clients autocompletes now order by id 2019-01-11 08:03:36 +01:00
Juan Ferrer 2ead6f145d Merge 2018-12-27 12:55:54 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00
Juan Ferrer f2fc5b6b2b #841 Client modules mixed with service modules 2018-12-22 11:59:26 +01:00
Juan Ferrer 97e0b33d0d #814 Service modules moved to project root, models reclassified 2018-12-21 20:22:13 +01:00