Carlos Jimenez
|
03b2a75a84
|
#236 client side unit test for ticket volumes
|
2018-04-16 16:47:04 +02:00 |
Bernat
|
ae9c545796
|
refactor fixtures and delete outdated files
|
2018-04-16 15:16:30 +02:00 |
|
Carlos Jimenez
|
3e8b26c91e
|
#235 back end unit tests for getAverageInvoiced
|
2018-04-16 11:21:13 +02:00 |
|
Carlos Jimenez
|
9928521557
|
#235 getMana back unit test plus helpers setup
|
2018-04-13 18:32:20 +02:00 |
|
Carlos Jimenez
|
dafb554792
|
#232 components section plus unit tests
|
2018-04-13 16:03:43 +02:00 |
|
Bernat
|
946aa7d8e8
|
update fixtures
|
2018-04-13 13:07:52 +02:00 |
|
Bernat
|
d663013f60
|
update fixtures and dumpedFixtures with tarifaComponent and tarifaTypeCompoennt
|
2018-04-13 12:59:05 +02:00 |
|
Bernat
|
d05dfc5da8
|
update fixtures and dumpedFixtures adding componentRate and componentTypeRate
|
2018-04-13 12:44:00 +02:00 |
Gerard
|
4c6213cd01
|
Tarea #240 Añadir comprador
|
2018-04-13 08:59:23 +02:00 |
|
Bernat
|
e377562d99
|
update fixtures with inserts in company and refactor e2e
|
2018-04-13 08:11:40 +02:00 |
|
Gerard
|
d814de9d65
|
Tarea #242 agencyModes debe devolver sólo aquellas con isActive<> FALSE
|
2018-04-11 15:01:51 +02:00 |
|
Bernat
|
c3017185c6
|
update fixtures for clientAdressesEdit redmine 242
|
2018-04-11 14:02:41 +02:00 |
|
Bernat
|
6cae47c07b
|
update fixtures
|
2018-04-11 13:06:44 +02:00 |
|
Bernat
|
ec90f70c56
|
update fixtures for ticketComponents
|
2018-04-11 12:56:16 +02:00 |
|
Bernat
|
22a5f8d495
|
update export-data.cmd
|
2018-04-11 11:37:39 +02:00 |
|
Bernat
|
af3e9b4b4e
|
update fixtures for function ticketGetTotal and refactor dumpedFixtures.sql
|
2018-04-11 11:22:09 +02:00 |
|
Carlos Jimenez
|
d12bbed929
|
linter error
|
2018-04-11 08:11:14 +02:00 |
|
Carlos Jimenez
|
d3743e2548
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-10 14:06:27 +02:00 |
|
Bernat
|
8e6b44cbc2
|
new procedure for ticket Volumes
|
2018-04-10 13:47:17 +02:00 |
|
Carlos Jimenez
|
ee7651b4e6
|
bug fixes for ticket volume procedure
|
2018-04-10 13:40:24 +02:00 |
|
Carlos Jimenez
|
e65942a296
|
#229 ticket descriptor
|
2018-04-10 11:14:33 +02:00 |
joan
|
4b8ae91705
|
Ticket summary
|
2018-04-10 07:48:04 +02:00 |
|
Carlos Jimenez
|
65e7b97ec0
|
type corrected on fixtures
|
2018-04-05 14:58:26 +02:00 |
Juan
|
98edab2869
|
Merge
|
2018-04-05 13:40:12 +02:00 |
|
Juan
|
71e22bac7f
|
Translations and style fixes
|
2018-04-05 13:20:27 +02:00 |
|
Juan
|
01eba8b070
|
Translation fixes
|
2018-04-05 13:08:10 +02:00 |
|
Juan
|
66c66f7696
|
vnHome style fix
|
2018-04-05 12:46:02 +02:00 |
|
Gerard
|
13c9cb56c7
|
Arreglado bug revision
|
2018-04-05 11:09:22 +02:00 |
|
Bernat Exposito
|
e1495c652d
|
update dumped Fixtures
|
2018-04-05 07:47:16 +02:00 |
|
Juan
|
ded0c6a53a
|
#166 - Item list ordered by name
|
2018-04-04 19:59:03 +02:00 |
|
Carlos Jimenez
|
04ac260738
|
#175 e2e for ticket packages
|
2018-04-04 16:41:06 +02:00 |
 Javi Gallego
|
8f37b69bc2
|
data step one Tarea #215
|
2018-04-04 13:56:16 +02:00 |
|
Juan
|
04cd9b2389
|
#223 - Global error handler refactor
|
2018-04-04 12:55:06 +02:00 |
|
Carlos Jimenez
|
2e5c632562
|
fixed e2e paths plus selectors
|
2018-04-04 09:21:33 +02:00 |
|
Juan
|
ae7a8f1245
|
Bugs solved on method Client.activeSalesPerson()
|
2018-04-03 19:37:37 +02:00 |
|
Juan
|
749681ac73
|
Client.activeSalesPerson() method refactor
|
2018-04-03 19:29:01 +02:00 |
|
Juan
|
8970abe903
|
Test bug solved
|
2018-04-03 18:33:00 +02:00 |
|
Juan
|
bf04c73b42
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-03 18:31:54 +02:00 |
|
Juan
|
c8aa7dc43c
|
#199 - Bug solved: Client service crash when calling Client.card() method with invalid id
|
2018-04-03 18:31:13 +02:00 |
|
Juan
|
fd324df1c9
|
#222 - DNI validation bug solved
|
2018-04-03 16:54:41 +02:00 |
|
Carlos Jimenez
|
ce3600a01e
|
ticket volume plus e2e, and back-front unit test fixed
|
2018-04-03 16:10:39 +02:00 |
|
joan
|
ffde937022
|
Credit classification fixes #189
|
2018-03-28 15:07:48 +02:00 |
|
Javi Gallego
|
1dc9345bec
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-28 11:33:28 +02:00 |
|
Javi Gallego
|
619d51c6a7
|
datasources sin name
|
2018-03-28 11:33:19 +02:00 |
|
Javi Gallego
|
6136a1c8de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-28 10:45:13 +02:00 |
|
Javi Gallego
|
02a173da36
|
Bug #220 Al crear un consignatario mirar RE
|
2018-03-28 10:45:09 +02:00 |
|
Gerard
|
cf98b1303e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-28 09:30:58 +02:00 |
|
Gerard
|
28c80d9ed3
|
Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE
|
2018-03-28 09:30:33 +02:00 |
 Joan Sanchez
|
85810e2f7e
|
Client summary & package
|
2018-03-27 15:06:22 +02:00 |
|
Gerard
|
6b390b72f8
|
Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE
|
2018-03-27 14:28:02 +02:00 |
|
Gerard
|
151a19b0ba
|
Tarea #171 Añadir revision
|
2018-03-27 14:26:20 +02:00 |
|
Gerard
|
4d1609c445
|
Tarea #170 Mostrar modelo ticketTracking
|
2018-03-27 14:24:47 +02:00 |
|
Gerard
|
a746d2d58f
|
Listar modelo saleChecked
|
2018-03-26 15:10:51 +02:00 |
|
Joan Sanchez
|
1cb9432922
|
Credit insurance validations fix
|
2018-03-26 11:43:17 +02:00 |
|
Bernat Exposito
|
dcce890bea
|
fix e2e
|
2018-03-23 15:08:14 +01:00 |
|
Javi Gallego
|
6351f4a93d
|
merge
|
2018-03-22 18:05:52 +01:00 |
|
Javi Gallego
|
46a6b0fb70
|
ticket line basico
|
2018-03-22 18:02:48 +01:00 |
|
Carlos Jimenez
|
0c4246847b
|
#182 files preparation for ticket volume
|
2018-03-22 15:06:21 +01:00 |
|
Carlos Jimenez
|
d57dbe2224
|
#208 ticket expedition e2e path plus some ticket volume files preparation and refactors
|
2018-03-22 15:01:36 +01:00 |
|
Carlos Jimenez
|
8c631012b1
|
ticket notes logic refactor plus unit tests
|
2018-03-22 10:57:55 +01:00 |
|
Carlos Jimenez
|
f7cac19be4
|
merge conflict
|
2018-03-21 15:56:20 +01:00 |
|
Carlos Jimenez
|
613054e29f
|
#184 listar modelo expeditions
|
2018-03-21 15:51:09 +01:00 |
|
Joan Sanchez
|
a9c690a48c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-21 14:55:10 +01:00 |
|
Joan Sanchez
|
7aeed467e9
|
Quantity validation on ticket packaging
|
2018-03-21 14:54:12 +01:00 |
|
Bernat Exposito
|
7ac6e903f4
|
add table accion.dits to export-data
|
2018-03-21 14:09:01 +01:00 |
|
Juan
|
2a7c73988c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-21 12:57:29 +01:00 |
|
Juan
|
70f854a463
|
French TIN validation bugs fixed
|
2018-03-21 12:57:23 +01:00 |
|
Gerard
|
735544aed6
|
Mostrar modelo ticketTracking
|
2018-03-21 12:56:18 +01:00 |
|
Joan Sanchez
|
ff047559e3
|
Ticket packaging
|
2018-03-21 11:08:59 +01:00 |
|
Bernat Exposito
|
9df0312c80
|
update fixtures and Acl for model AnnualAverageInvoice
|
2018-03-21 09:35:04 +01:00 |
|
Javi Gallego
|
cec2b2a3a5
|
creacion de item con busqueda por codigo de tipo y de intrastat
|
2018-03-21 08:59:18 +01:00 |
|
Javi Gallego
|
256b872dd5
|
filter js
|
2018-03-21 07:24:00 +01:00 |
|
Bernat Exposito
|
1ceab52d0d
|
update fixtures for bi.rotacion and add mobel annualAverageInvoiced
|
2018-03-20 15:01:49 +01:00 |
|
Javi Gallego
|
d4e3855b0d
|
rutas vacias de sale
|
2018-03-20 14:45:39 +01:00 |
|
Javi Gallego
|
e93daa9299
|
modelo sale con hasMany
|
2018-03-20 14:01:46 +01:00 |
|
Carlos Jimenez
|
559f5fc3ae
|
#179 ticket observations path
|
2018-03-19 16:29:55 +01:00 |
|
Carlos Jimenez
|
ece2fd384d
|
#179 listar notas de ticket
|
2018-03-16 15:06:42 +01:00 |
|
Joan Sanchez
|
af2fca3879
|
Ticket packages, moved Item model to loopback service
|
2018-03-15 14:36:09 +01:00 |
|
Bernat Exposito
|
34a0c37797
|
update ACLs for expedition
|
2018-03-15 13:53:28 +01:00 |
|
Bernat Exposito
|
0b21cc231c
|
new model expedition, add fixtures for the model and update ACL
|
2018-03-15 13:47:47 +01:00 |
|
Bernat Exposito
|
b8979e76f5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 14:20:17 +01:00 |
|
Bernat Exposito
|
0e04d97dc0
|
update model packaging.sql
|
2018-03-14 14:20:01 +01:00 |
Daniel Herrero
|
8f0f71a3ca
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 13:59:04 +01:00 |
|
Daniel Herrero
|
e6a8b34fe4
|
filter tickets
|
2018-03-14 13:59:01 +01:00 |
|
Bernat Exposito
|
a4166cc14d
|
update model packaging.json
|
2018-03-14 13:51:07 +01:00 |
|
Bernat Exposito
|
ab3ead6a28
|
added modelconfig.json for models in the commit 60f3bfc and new procedure 04.ticketVolume
|
2018-03-14 13:00:17 +01:00 |
|
Bernat Exposito
|
5e01ab1a9f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:58:30 +01:00 |
|
Bernat Exposito
|
60f3bfc7b8
|
create models saleChecked saleComponent, added fixtures and ACL
|
2018-03-14 12:06:21 +01:00 |
|
Javi Gallego
|
19870a7732
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:04:09 +01:00 |
|
Joan Sanchez
|
708c822ab0
|
Credit classification & credit insurance task #150, #151, #152
|
2018-03-14 11:36:57 +01:00 |
|
Javi Gallego
|
6879435011
|
fuentes client descriptor
|
2018-03-14 11:15:14 +01:00 |
|
Carlos Jimenez
|
0e8fe7fead
|
merge plus #167 error en el id al crear item task
|
2018-03-13 14:46:39 +01:00 |
|
Daniel Herrero
|
5530828d62
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:30:51 +01:00 |
|
Daniel Herrero
|
176ce860ca
|
Tarea #164 Filtros con superpoderes
|
2018-03-13 14:30:25 +01:00 |
|
Javi Gallego
|
a6994b0179
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:07:47 +01:00 |
|
Javi Gallego
|
d9f932b2c1
|
añadir fuentes
|
2018-03-13 14:07:42 +01:00 |
|
Juan
|
9b153aec5a
|
DNI validation fixes
|
2018-03-13 12:14:06 +01:00 |
Vicente Falco
|
95e96a91a7
|
datasource loopback unique
|
2018-03-13 11:15:39 +01:00 |
|
Juan
|
6b1ad875cb
|
DNI validation fix
|
2018-03-12 17:18:18 +01:00 |
|
Juan
|
ada0f40ece
|
DNI validation fixed
|
2018-03-12 14:13:36 +01:00 |
|
Bernat Exposito
|
a813fe805e
|
create services ticket, fixtures and models for salix 1.7.0
|
2018-03-12 13:55:18 +01:00 |
|
Juan
|
3dbd7e6bc0
|
Client.createWithUser refactored to async/await
|
2018-03-12 13:09:52 +01:00 |
|
Javi Gallego
|
fdd71951a0
|
sin el id falla el test de back
|
2018-03-12 12:16:18 +01:00 |
|
Javi Gallego
|
f0164fc4a4
|
fix Validador de mail ahora acepta guiones
|
2018-03-12 12:08:34 +01:00 |
|
Javi Gallego
|
dcf45f014c
|
minor bugs en account
|
2018-03-12 12:07:55 +01:00 |
|
Carlos Jimenez
|
db88d00560
|
#156 client descriptor icons missing correct icons
|
2018-03-09 16:44:18 +01:00 |
|
Carlos Jimenez
|
8ef0814fcc
|
back end unit test fixes plus small refactors
|
2018-03-08 12:23:51 +01:00 |
|
Carlos Jimenez
|
1e48f4a4a9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 14:55:42 +01:00 |
|
Daniel Herrero
|
f82a616940
|
semantic refactor
|
2018-03-07 14:13:30 +01:00 |
|
Bernat Exposito
|
dd677b11f7
|
update fixtures #155 and fixed listWorker back unit test
|
2018-03-07 13:07:48 +01:00 |
|
Carlos Jimenez
|
11d4c835ba
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 12:25:37 +01:00 |
|
Carlos Jimenez
|
a95f2c3ada
|
#155 back end unit tests for webaccess new functionality
|
2018-03-07 12:25:23 +01:00 |
|
Carlos Jimenez
|
60e4ca132a
|
#155 web access functionality completed
|
2018-03-07 12:24:47 +01:00 |
|
Bernat Exposito
|
f1ef403126
|
update salix.ACL with invoiceOut permissions
|
2018-03-07 09:53:44 +01:00 |
|
Carlos Jimenez
|
7de0db5902
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-06 15:14:57 +01:00 |
|
Carlos Jimenez
|
a47769f7c0
|
#154 credito ya inserta el usuario que efectua el cambio
|
2018-03-06 15:14:49 +01:00 |
|
Bernat Exposito
|
afaa7504e9
|
update models creditInsurance and creditClassification
|
2018-03-06 13:11:22 +01:00 |
|
Bernat Exposito
|
a6556e594d
|
update trigger client, #154
|
2018-03-06 11:22:57 +01:00 |
|
Carlos Jimenez
|
bc13abbe50
|
#114 mostrar current user en la top bar
|
2018-03-06 11:13:05 +01:00 |
|
Bernat Exposito
|
e9ad6bf879
|
update model creditClassification
|
2018-03-06 09:41:16 +01:00 |
|
Bernat Exposito
|
96689eccc8
|
add models creditClassification and creditInsurance, update fixtures #151
|
2018-03-06 08:55:54 +01:00 |
|
Carlos Jimenez
|
13c3ffce27
|
routes spec fix
|
2018-03-05 15:24:54 +01:00 |
|
Bernat Exposito
|
70ef95fc8f
|
refactor fixtures update id clients,debug web test and back test
|
2018-03-05 14:59:26 +01:00 |
|
Joan Sanchez
|
24abbffba7
|
Client summary updated
|
2018-03-05 10:56:51 +01:00 |
|
Juan
|
8673d2b25f
|
Eslint fix
|
2018-03-02 13:46:25 +01:00 |
|
Bernat Exposito
|
8776a46e58
|
add more tables in export-data.cmd
|
2018-03-02 12:41:52 +01:00 |
|
Carlos Jimenez
|
d3e2f93816
|
now two users havent got the verified data checked
|
2018-03-02 12:00:47 +01:00 |
|
Carlos Jimenez
|
f354a420bc
|
e2e item tags #121, plus item tags and item descriptor refactor #117
|
2018-03-02 10:51:01 +01:00 |
|
Bernat Exposito
|
836d7dc054
|
update structure and data from production DB
|
2018-03-01 14:47:25 +01:00 |
|
Juan
|
2c88d24e24
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 14:04:40 +01:00 |
|
Juan
|
9881c4e6f3
|
Merge
|
2018-03-01 14:04:33 +01:00 |
|
Bernat Exposito
|
f6c6ee1596
|
update fixtures adding data to vn.recovery
|
2018-03-01 14:02:51 +01:00 |
|
Juan
|
de145bd814
|
#128 - Client invoices form
|
2018-03-01 14:01:45 +01:00 |
|
Bernat Exposito
|
cfbb94e9c3
|
Update fixtures in backend test
|
2018-03-01 12:28:22 +01:00 |
|
Javi Gallego
|
c8eab7dc24
|
merge model-config
|
2018-03-01 11:57:33 +01:00 |
|
Javi Gallego
|
f3b00f4b47
|
entidad recovery con list, create y tests
|
2018-03-01 11:55:28 +01:00 |
|
Bernat Exposito
|
319cab6223
|
update fixtures for invoiceOut
|
2018-02-28 15:52:24 +01:00 |
|
Bernat Exposito
|
274d1475c9
|
resolve bugs in e2e test in windows and new module invoice-out
|
2018-02-28 15:40:52 +01:00 |
|
Juan
|
d9c54415cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-28 12:07:59 +01:00 |
|
Juan
|
a1ee22d153
|
#96 - Email validation errors fixed
|
2018-02-28 12:07:56 +01:00 |
|
Carlos Jimenez
|
884f7fe954
|
mini refactor on validateDni back end unit test
|
2018-02-28 10:02:57 +01:00 |
|
Juan
|
8ee649b9d0
|
Bug with empty value validations fixed
|
2018-02-27 22:50:14 +01:00 |
|
Juan
|
4eebdf96ee
|
Small fix before commit
|
2018-02-27 20:28:59 +01:00 |
|
Juan
|
fba637f3b3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-27 20:28:19 +01:00 |
|
Juan
|
2a06244fd6
|
Create client E2E fixed, tests for validateDni
|
2018-02-27 20:28:07 +01:00 |
|
Daniel Herrero
|
34e35ee139
|
new global crudMethod
|
2018-02-27 14:55:59 +01:00 |
|
Carlos Jimenez
|
cdfc2a6779
|
solved merge comflics with item tags
|
2018-02-27 13:40:33 +01:00 |
|
Juan
|
688881fac4
|
Bug #97 - Show dash when no secured credit
|
2018-02-27 13:28:07 +01:00 |
|
Juan
|
b864a8382c
|
Backend test repaired
|
2018-02-27 12:56:03 +01:00 |
|
Carlos Jimenez
|
c22d1b0e72
|
salesperson spec repairs
|
2018-02-27 12:08:19 +01:00 |
|
Juan
|
3c1467ec97
|
Bug validateDni
|
2018-02-27 12:00:39 +01:00 |
|
Juan
|
4bfdf2a90f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-27 10:00:56 +01:00 |
|
Juan
|
5830a0d8f9
|
Bug #94 - FI validation
|
2018-02-27 10:00:43 +01:00 |
|
Bernat Exposito
|
665fcd3976
|
uptade ACL table and add recovery model
|
2018-02-26 14:37:01 +01:00 |
|
Juan
|
eb582b51a9
|
Bug #132 solved
|
2018-02-26 12:56:42 +01:00 |
|
Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +01:00 |
Juan Ferrer Toribio
|
bff00dc98e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 13:05:00 +01:00 |
|
Juan Ferrer Toribio
|
cfc4b01fb0
|
Item tax form and service
|
2018-02-23 13:04:44 +01:00 |
|
Javi Gallego
|
f4a244398a
|
greuge con decimales y favicon
|
2018-02-23 12:51:36 +01:00 |
|
Juan Ferrer Toribio
|
fdf2f017a0
|
DB upgraded
|
2018-02-23 11:59:58 +01:00 |
|
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +01:00 |
|
Vicente Falco
|
443c888d73
|
merge
|
2018-02-23 07:18:26 +01:00 |
|
Vicente Falco
|
b3d692aaa0
|
Docker nginx
|
2018-02-23 07:17:33 +01:00 |
|
Javi Gallego
|
51f8d01d24
|
Error de roles solucionado a falta de dump
|
2018-02-22 16:17:30 +01:00 |
|
Daniel Herrero
|
10e47acd6b
|
item clonation finish
|
2018-02-22 13:40:23 +01:00 |
|
Daniel Herrero
|
91b7be32fb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 11:20:22 +01:00 |
|
Daniel Herrero
|
43eef84ecf
|
renamed item models to kebab-case
|
2018-02-22 11:20:08 +01:00 |
|
Bernat Exposito
|
f92c6faa22
|
fixed blocking errors on e2e due to snackbar restet time plus fixtures permisions
|
2018-02-22 10:03:58 +01:00 |
|
Bernat Exposito
|
e377e9e452
|
update fixtures and mudole itemTag.json
|
2018-02-21 13:44:25 +01:00 |
|
Javi Gallego
|
41dfa9f9a1
|
creacion de ACL en diferentes modelos
|
2018-02-21 09:28:17 +01:00 |
|
Bernat Exposito
|
2daed2bda9
|
import fixtures from DB produccion and create unique index for vn2008.Articles_nicho
|
2018-02-20 15:01:59 +01:00 |
|
Daniel Herrero
|
60e2d8132b
|
itemBotanical
|
2018-02-20 14:30:02 +01:00 |
|
Daniel Herrero
|
ada3d9480b
|
bug fixed acl obervationType
|
2018-02-20 14:05:05 +01:00 |
|
Carlos Jimenez
|
6b70556320
|
acls are back to obersvation-type.json properties
|
2018-02-20 13:38:04 +01:00 |
|
Carlos Jimenez
|
4251ee20e4
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-20 12:26:29 +01:00 |
|
Carlos Jimenez
|
144d5a2bf0
|
issue 40 completed: niches
|
2018-02-20 12:25:51 +01:00 |
|
Bernat Exposito
|
4c26879fdb
|
update fixtures edi.genus/specie
|
2018-02-20 11:16:02 +01:00 |
SAMBA\bernat
|
20229cf3e1
|
update fixtures
|
2018-02-19 13:39:31 +01:00 |
|
SAMBA\bernat
|
171d0f5867
|
update changes05-articles_nicho
|
2018-02-19 13:21:15 +01:00 |
|
SAMBA\bernat
|
0f1004f5de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-19 12:52:33 +01:00 |
|
SAMBA\bernat
|
3018898cad
|
update fixtures / alter table vn2008.articles_nicho
|
2018-02-19 12:50:14 +01:00 |
|
Carlos Jimenez
|
84bc505937
|
adapted test to show now 6 sales person
|
2018-02-19 11:58:02 +01:00 |
|
Carlos Jimenez
|
b8e6a8d0b3
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-19 11:56:05 +01:00 |
|
Carlos Jimenez
|
dcf5bf61da
|
backend unit test for barcode duplicity plus e2e path completed
|
2018-02-19 11:55:45 +01:00 |
|
SAMBA\bernat
|
f4735b4666
|
update fixtures Botanical
|
2018-02-19 09:42:40 +01:00 |
|
SAMBA\bernat
|
f2d5d58513
|
fixtures for Barcode and itemPlacement
|
2018-02-16 14:58:51 +01:00 |
|
SAMBA\bernat
|
2390ee3b01
|
update fixtures / script for automatic change update in the BD
|
2018-02-16 13:01:04 +01:00 |
|
Juan Ferrer Toribio
|
2240b4f6d8
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-15 16:11:54 +01:00 |
|
Juan Ferrer Toribio
|
e6a753d1cf
|
Addresses ordered by nickname
|
2018-02-15 16:11:44 +01:00 |
|
Daniel Herrero
|
6fe1f96ef3
|
Bug fixeds and merge with test
|
2018-02-15 14:37:54 +01:00 |
|
Daniel Herrero
|
754cfbc7b0
|
MD5 in password web access
|
2018-02-15 14:35:04 +01:00 |
|
Daniel Herrero
|
505ff1dcfe
|
removed role from activeSalesPerson
|
2018-02-15 13:11:23 +01:00 |
|
Daniel Herrero
|
1b4fd50929
|
Bugs fixed: postalCode, credit list and validate DNI
|
2018-02-15 13:04:48 +01:00 |
|
Daniel Herrero
|
a3cfb155e0
|
new models: genus, item-botanical, specie
|
2018-02-15 10:58:02 +01:00 |
|
Daniel Herrero
|
81b374d744
|
Merge conflicts
|
2018-02-15 10:51:31 +01:00 |
|
Carlos Jimenez
|
3abc4c7a68
|
backend unit test for crudItemBarcodes
|
2018-02-14 16:49:19 +01:00 |
|
Carlos Jimenez
|
bde655bd1e
|
merge
|
2018-02-14 14:32:26 +01:00 |
|
Carlos Jimenez
|
6e1d3135d5
|
mini refactor on routes.json and crudAddressObervations
|
2018-02-14 14:24:14 +01:00 |
|
Carlos Jimenez
|
61cd4acca5
|
item-barcode functionality plus front end tests
|
2018-02-14 14:22:35 +01:00 |
|
Daniel Herrero
|
fea4b379c7
|
Bug #78 Fixed
|
2018-02-14 14:06:01 +01:00 |
|
Juan Ferrer Toribio
|
87dfa49692
|
Bugs with webpack assets solved
|
2018-02-14 12:52:24 +01:00 |
|
Juan Ferrer Toribio
|
e4595da2a7
|
E2E test partially fixed
|
2018-02-14 10:03:00 +01:00 |
|
Juan Ferrer Toribio
|
fd0d5b70be
|
Solved bug that caused main webpack assets incorrecly cached by browsers (Deployment should be tested)
|
2018-02-13 23:01:28 +01:00 |
|
Juan Ferrer Toribio
|
8be4e0fb1f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 22:40:17 +01:00 |
|
Juan Ferrer Toribio
|
72830652b4
|
Documented Gulpfile, improved 'docker-wait' to handle errors
|
2018-02-13 22:40:02 +01:00 |
|
Javi Gallego
|
595cbfbed6
|
quitado el antiguo campo de iva
|
2018-02-13 14:19:06 +01:00 |
|
Javi Gallego
|
a50c3d565e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 13:29:28 +01:00 |
|
Javi Gallego
|
b5db0abbf1
|
Creacion sin relevancy y acl de clientObservation
|
2018-02-12 12:02:00 +01:00 |
|
Carlos Jimenez
|
813e160499
|
pagination for item log plus more fixtures
|
2018-02-12 12:01:39 +01:00 |
|
Carlos Jimenez
|
845dfc77bb
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-12 10:53:43 +01:00 |
|
Carlos Jimenez
|
100b5a09ed
|
fixtures for item log
|
2018-02-12 10:53:03 +01:00 |
|
Juan Ferrer Toribio
|
b45ab59076
|
Updated template datasources.json
|
2018-02-09 15:10:33 +01:00 |
|
Juan Ferrer Toribio
|
f79b70e264
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-09 12:43:17 +01:00 |
|
Juan Ferrer Toribio
|
d369db9dc0
|
Debug fixes
|
2018-02-09 12:43:14 +01:00 |
|
Vicente Falco
|
58d5e7add9
|
Services Jenkins
|
2018-02-09 12:26:27 +01:00 |
|
Carlos Jimenez
|
540a65476b
|
fixtures updated
|
2018-02-09 08:54:53 +01:00 |
|
Carlos Jimenez
|
e11e0be029
|
fixtures for addresses listed for Bruce Banner are now enough to trigger pagination
|
2018-02-08 14:40:32 +01:00 |
|
Vicente Falco
|
725fe79022
|
package md5
|
2018-02-08 13:11:15 +01:00 |
|
Vicente Falco
|
d6b010387a
|
service auth package md5
|
2018-02-08 13:06:12 +01:00 |
|
Daniel Herrero
|
4ec0a3c46d
|
item history
|
2018-02-08 12:04:33 +01:00 |
|
Carlos Jimenez
|
76f808e7f6
|
itemLog for item history refactor
|
2018-02-08 11:40:06 +01:00 |
|
Javi Gallego
|
378c04b123
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-08 09:44:32 +01:00 |
|
Vicente Falco
|
6011a2ecaf
|
Docker
|
2018-02-08 08:30:24 +01:00 |
|
Vicente Falco
|
bf7a286b1c
|
Dockerfile
|
2018-02-08 07:15:25 +01:00 |
|
Juan Ferrer Toribio
|
45606303fe
|
Script to import local-db changes, fixtures fixed, structure updated
|
2018-02-07 19:55:47 +01:00 |
|
Juan Ferrer Toribio
|
f84bf44550
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 16:45:50 +01:00 |
|
Juan Ferrer Toribio
|
4876f36190
|
Local database structure updated & import changes script
|
2018-02-07 16:45:40 +01:00 |
|
Carlos Jimenez
|
03faa09284
|
item history functionality, awaiting for clientfilters refactor
|
2018-02-07 15:06:21 +01:00 |
|
SAMBA\bernat
|
249a622e2d
|
update fixtures
|
2018-02-07 14:45:04 +01:00 |
|
Vicente Falco
|
c61748ec95
|
Dockerfile Services
|
2018-02-07 14:37:26 +01:00 |
|
Javi Gallego
|
220baa717e
|
roles de credito y greuges
|
2018-02-07 14:16:11 +01:00 |
|
Carlos Jimenez
|
3d7d0762b6
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-07 13:49:05 +01:00 |
|
Carlos Jimenez
|
de9f7a5545
|
item history
|
2018-02-07 13:48:55 +01:00 |
|
Juan Ferrer Toribio
|
fda8750304
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 10:29:27 +01:00 |
|
Juan Ferrer Toribio
|
0fc1dc0faa
|
Address id fixtures, gulpfile clean, eslint no-empty
|
2018-02-07 10:29:23 +01:00 |
|
Carlos Jimenez
|
93ef3c7fea
|
item history js files implementation
|
2018-02-07 08:49:27 +01:00 |
|
Carlos Jimenez
|
8de88aa046
|
small refactor on greuge list and fixtures
|
2018-02-07 08:47:04 +01:00 |
|
Juan Ferrer Toribio
|
853b16bd81
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-07 08:30:20 +01:00 |
|
Carlos Jimenez
|
86aab2ca31
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-06 16:23:22 +01:00 |
|
Daniel Herrero
|
7eee1cad50
|
address observations crud created
|
2018-02-06 15:09:31 +01:00 |
|
Carlos Jimenez
|
335847358f
|
fixtures addition plus item en.yml created
|
2018-02-06 14:03:09 +01:00 |
|
Juan Ferrer Toribio
|
65e197d555
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-06 09:10:57 +01:00 |
|
Daniel Herrero
|
f0356eb047
|
join addressObservation into list Addresses service
|
2018-02-06 07:59:36 +01:00 |
|
Juan Ferrer Toribio
|
5ff996a4c7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-05 19:34:12 +01:00 |
|
Juan Ferrer Toribio
|
90ce07881a
|
Gulpfile refactor, SQL scripts
|
2018-02-05 19:34:04 +01:00 |
|
Joan Sanchez
|
692a226b69
|
El servicio de Nginx ahora se inicia desde Gulp. Añadido alias de instalacion "gulp i".
|
2018-02-05 19:22:38 +01:00 |
|
Juan Ferrer Toribio
|
89c745244a
|
YAML configuration, client module register simplified
|
2018-02-04 19:39:56 +01:00 |
|
Juan Ferrer Toribio
|
cf2f8b77ff
|
Log removed
|
2018-02-03 23:54:31 +01:00 |
|
Juan Ferrer Toribio
|
d1096a270f
|
Bugs solved in Nginx starting scripts
|
2018-02-03 23:46:52 +01:00 |
|
Juan Ferrer Toribio
|
4a388f241c
|
Gulp refactor
|
2018-02-03 23:07:28 +01:00 |
|
Juan Ferrer Toribio
|
681310d9b6
|
Dockerfile bug
|
2018-02-03 22:56:49 +01:00 |
|
Juan Ferrer Toribio
|
e7d3ff9272
|
Refactor gulp and config
|
2018-02-03 22:53:02 +01:00 |
|
Juan Ferrer Toribio
|
ca7e299fbc
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-03 20:14:52 +01:00 |
|
Juan Ferrer Toribio
|
597299b1c5
|
Autogenerated Nginx config and docker compose
|
2018-02-03 20:14:44 +01:00 |
|
Carlos Jimenez
|
48f6f5a18d
|
successfully moved all specs from services/client/c../m../client alongside their respective js files
|
2018-02-02 16:24:22 +01:00 |
|
Javi Gallego
|
ac8db83582
|
README fixes, bugfixes for windows
|
2018-02-02 09:51:38 +01:00 |
|
Juan Ferrer Toribio
|
aae0cd9128
|
Merge
|
2018-02-01 12:55:06 +01:00 |
|
Juan Ferrer Toribio
|
57479aaf76
|
Bug fixes
|
2018-02-01 12:52:58 +01:00 |
|
Carlos Jimenez
|
03116ed595
|
item descriptor now shows itemTags ordered by priority
|
2018-02-01 10:05:20 +01:00 |
|
Juan Ferrer Toribio
|
b5e5b5bd6b
|
Merge
|
2018-02-01 08:50:26 +01:00 |
|
Juan Ferrer Toribio
|
52db3bbf2f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-01 08:49:10 +01:00 |
|
SAMBA\bernat
|
94693c3a7e
|
structure dblocal syncronize with produccion
|
2018-02-01 08:46:13 +01:00 |
|
Carlos Jimenez
|
b01b333481
|
inserts sql updated for items
|
2018-02-01 08:32:48 +01:00 |
|
Juan Ferrer Toribio
|
87b3ac995d
|
Development environment now points to local database by default
|
2018-01-31 14:56:55 +01:00 |
|
Juan Ferrer Toribio
|
9090c56c64
|
Backend tests fixed
|
2018-01-31 13:40:26 +01:00 |
|
Juan Ferrer Toribio
|
cba0645f92
|
Merge with dev
|
2018-01-31 12:19:34 +01:00 |
|
Juan Ferrer Toribio
|
3d6f9fbbca
|
Backend tests refactor, bug fixes
|
2018-01-31 12:17:17 +01:00 |
|
Carlos Jimenez
|
cd027a3e12
|
refactor to avoid using import on backend testing env
|
2018-01-31 12:02:35 +01:00 |
|
Carlos Jimenez
|
215ae09b70
|
refactor to remove import from backend testing in order to use require
|
2018-01-31 11:15:12 +01:00 |
|
Juan Ferrer Toribio
|
109f04c517
|
Merge
|
2018-01-30 16:34:32 +01:00 |
|
Carlos Jimenez
|
801926bd27
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-01-30 15:49:26 +01:00 |
|
Carlos Jimenez
|
d700d3a905
|
routes backend unit test completed
|
2018-01-30 15:49:22 +01:00 |
|
Daniel Herrero
|
90fab7b01a
|
address observations, list and view edit (TODO save)
|
2018-01-30 14:47:47 +01:00 |
|
Daniel Herrero
|
7eab262175
|
CRUD item basic data finish
|
2018-01-30 08:59:43 +01:00 |
|
Juan Ferrer Toribio
|
9d92b9def7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-01-30 08:59:12 +01:00 |
|
Carlos Jimenez
|
7c36daf496
|
backend unit test for routes logout
|
2018-01-29 21:20:04 +01:00 |
|
Juan Ferrer Toribio
|
f688090cba
|
i18n on backend, improved backend error handling, redundant model-config removed
|
2018-01-29 19:57:00 +01:00 |
|
Carlos Jimenez
|
09f244bc62
|
backend unit test for the try to define loginUrl
|
2018-01-29 14:39:08 +01:00 |
|
Carlos Jimenez
|
ea3988351c
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-01-29 14:28:47 +01:00 |
|
Carlos Jimenez
|
ba6a1f0f16
|
backend unit test for routes login
|
2018-01-29 14:28:31 +01:00 |
|
Juan Ferrer Toribio
|
f4a790f87c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-01-29 12:38:08 +01:00 |
|
Juan Ferrer Toribio
|
a3188b204f
|
Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved
|
2018-01-29 12:37:54 +01:00 |
|
SAMBA\bernat
|
71d587764c
|
update fixtures
|
2018-01-26 14:12:41 +01:00 |
|
Carlos Jimenez
|
0e88c2c4e7
|
renived private method tests and implemented HeadLessChrome on Karma and removed Firefox as browser
|
2018-01-26 12:13:39 +01:00 |
|
Carlos Jimenez
|
6dba8c7a40
|
salesperson back end unit tests plus small refactor on addresses, employee and filter specs
|
2018-01-26 11:23:53 +01:00 |
|
Carlos Jimenez
|
8dafd8c3b0
|
roles backend unit tests plus typos corrected on card and filer specs
|
2018-01-26 09:00:16 +01:00 |
|
SAMBA\bernat
|
9f5b42d149
|
localDB Update
|
2018-01-26 08:26:01 +01:00 |
|
Carlos Jimenez
|
28096df321
|
nightmare controlles now the snackbarTimeout with nightmareModifiers.js plus small db update
|
2018-01-26 08:01:26 +01:00 |
|
Daniel Herrero
|
56e868c3dd
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-01-25 13:37:40 +01:00 |
|
Daniel Herrero
|
abed869052
|
onErrorSrc directive for images
|
2018-01-25 13:37:27 +01:00 |
|
Carlos Jimenez
|
092efc80c1
|
greuge filter backend unit test
|
2018-01-25 11:40:54 +01:00 |
|
Carlos Jimenez
|
506d6e0688
|
small file name refactor and client employee backend unit tests
|
2018-01-24 15:13:42 +01:00 |
|
Carlos Jimenez
|
48aef1f9b0
|
client Card backend unit tests
|
2018-01-24 13:45:32 +01:00 |
|
SAMBA\bernat
|
16a193071c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-01-24 08:13:42 +01:00 |
|
SAMBA\bernat
|
ab7f064800
|
merging dev
|
2018-01-24 08:13:14 +01:00 |
|
Carlos Jimenez
|
8801c20071
|
added restoreFixtures to a afterAll method on create and addressesPropagateRe spec files
|
2018-01-24 08:09:39 +01:00 |
|
SAMBA\bernat
|
74e8e93ffd
|
add fixtures and update the structure DB
|
2018-01-24 08:06:49 +01:00 |
|
Carlos Jimenez
|
108fb92d73
|
removed unnused code placed during testing steps
|
2018-01-23 16:41:28 +01:00 |
|
Carlos Jimenez
|
0d8feaef60
|
addressesPropagateRe backend unit tests
|
2018-01-23 15:59:21 +01:00 |
|
Carlos Jimenez
|
83f4a2d6bd
|
back end unit tests for addresses plus refactor on fixtures stuff
|
2018-01-23 14:18:46 +01:00 |