 Joan Sanchez
|
8f9f7c1fe6
|
Ticket basic data and date-picker refactor
|
2018-05-16 08:13:39 +02:00 |
 Javi Gallego
|
63cd55cd66
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-15 14:02:20 +02:00 |
|
Javi Gallego
|
8cffc556d0
|
bug: al clonar item no clonaba su iva
|
2018-05-15 14:02:16 +02:00 |
Bernat
|
d9b43ce84d
|
update fixtures tbl:ticket and ticketTracking
|
2018-05-14 14:32:58 +02:00 |
|
Bernat
|
fa222ab398
|
refactor fixtures
|
2018-05-14 07:50:33 +02:00 |
|
Bernat
|
b301d07cd6
|
delete deprecated files
|
2018-05-11 15:06:31 +02:00 |
|
Bernat
|
4191c97beb
|
update views sale and componenTypeRate
|
2018-05-11 14:09:24 +02:00 |
|
Bernat
|
0dbba4e159
|
add model deliveryMethod
|
2018-05-11 13:08:01 +02:00 |
|
Joan Sanchez
|
35735c15a3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 11:34:20 +02:00 |
|
Joan Sanchez
|
a990a950a1
|
Keep SQL comments on docker dump
|
2018-05-11 11:34:05 +02:00 |
gerard
|
f841e25b7f
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:30:05 +02:00 |
|
gerard
|
85aa3b0156
|
Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta""
This reverts commit d9862b8922.
|
2018-05-11 11:16:16 +02:00 |
|
gerard
|
d9862b8922
|
Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"
This reverts commit 9b07cd444c.
|
2018-05-11 11:10:15 +02:00 |
|
gerard
|
9b07cd444c
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:09:07 +02:00 |
|
Joan Sanchez
|
700fea1d54
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-10 14:07:28 +02:00 |
|
Joan Sanchez
|
b14154b4e2
|
Prevent container shutdown forcing SQL import
|
2018-05-10 14:07:25 +02:00 |
|
gerard
|
4ebca3f3cb
|
pequeño refactor CR JOAN
|
2018-05-10 13:39:11 +02:00 |
|
Bernat
|
52b3567b47
|
update Local schema from Production schema and update fixtures bugs
|
2018-05-10 12:04:08 +02:00 |
|
Bernat
|
dfd4242c00
|
update fixtures tbl clientCredit
|
2018-05-09 14:42:51 +02:00 |
|
Bernat
|
86766b88e0
|
update fixtures tbl recovery
|
2018-05-09 14:22:21 +02:00 |
|
Bernat
|
0c4378f562
|
update fixtures
|
2018-05-09 14:17:33 +02:00 |
|
Bernat
|
a74eff251f
|
update fixtures tbl agencyHour and saleComponent
|
2018-05-09 12:20:40 +02:00 |
|
Bernat
|
806ba305f0
|
add ACl for workerMana
|
2018-05-09 11:27:47 +02:00 |
|
Bernat
|
868dac95a2
|
add new ACL for workerMana
|
2018-05-09 11:19:54 +02:00 |
|
Bernat
|
f6a7efae0c
|
update fixtures and schema
|
2018-05-09 07:20:30 +02:00 |
|
Joan Sanchez
|
3c839cea07
|
gulp docker && docker-build tasks updated
|
2018-05-08 11:34:50 +02:00 |
|
gerard
|
5111efa2b9
|
refactorizacion InstallCrudModel CR: JUAN
|
2018-05-08 09:57:11 +02:00 |
|
gerard
|
ba5a135434
|
CRUD para Tarea #284
|
2018-05-08 09:56:25 +02:00 |
|
gerard
|
a9ade07aa0
|
Cambiado ticketTracking por tracking CR JUAN
|
2018-05-08 09:40:37 +02:00 |
|
gerard
|
b37dbfb9f7
|
ACL para Tarea #265
|
2018-05-08 09:32:30 +02:00 |
|
gerard
|
024a248797
|
#265 Añadir boton ok y estado CR: JUAN
|
2018-05-08 09:25:15 +02:00 |
|
Bernat
|
68b13efb83
|
add new fixtures and update BD schema
|
2018-05-07 12:31:48 +02:00 |
|
Joan Sanchez
|
e1bc434f34
|
Added front-end & back-end "order" service #267
|
2018-05-07 09:08:46 +02:00 |
|
Joan Sanchez
|
22250984ae
|
CSS class ellipsize with max-width 20em
|
2018-05-04 14:27:45 +02:00 |
|
Joan Sanchez
|
681731e886
|
back-end refactor & item search fix. #260
|
2018-05-04 11:46:03 +02:00 |
|
Bernat
|
7732dfc5ec
|
new model ticketWeekly with fixtures
|
2018-05-03 13:24:35 +02:00 |
Daniel Herrero
|
628dd5a99b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-30 13:57:14 +02:00 |
|
Daniel Herrero
|
a7e5f1a623
|
new component for infinite scroll vnAutoPaging
|
2018-04-30 13:57:10 +02:00 |
|
Bernat
|
c31d1ed888
|
update fixtures and dumpedfixtures with table vn.state
|
2018-04-30 12:48:29 +02:00 |
|
Bernat
|
09a731c812
|
refactor docker for mac users CR: Joan
|
2018-04-30 08:46:41 +02:00 |
|
Bernat
|
3ff20d48d7
|
refactor back end test,failed because of new fixtures
|
2018-04-29 13:50:42 +02:00 |
|
Bernat
|
f7b2bf9794
|
add fixtures and model for workerMana
|
2018-04-29 13:47:33 +02:00 |
Carlos Jimenez
|
57123f4887
|
#266 popover for item descriptor on ticket section plus some minor refactors on inte tags relations
|
2018-04-26 16:41:08 +02:00 |
|
Joan Sanchez
|
e4b536e439
|
Added gulp task docker-image.
|
2018-04-26 15:13:56 +02:00 |
|
Bernat
|
9f3609a3be
|
update fixutes table itemTag ans sale with more items
|
2018-04-25 09:13:47 +02:00 |
|
Bernat
|
73e92d3c5b
|
update fixtures table invoiceOut
|
2018-04-25 07:47:30 +02:00 |
|
Bernat
|
d3ad20055e
|
update dumpedFixtures and create model for updateTicketAction
|
2018-04-24 14:03:43 +02:00 |
|
Carlos Jimenez
|
e11c0936bc
|
eslint errors corrected
|
2018-04-24 12:46:07 +02:00 |
|
Bernat
|
93653ca67e
|
update fixtures and dumpedfixtures with table vn.state
|
2018-04-24 12:36:20 +02:00 |
|
Bernat
|
c9941ac1a7
|
update fixtures #211
|
2018-04-24 07:54:30 +02:00 |
|
Carlos Jimenez
|
64bddaa0b4
|
#269 back end unit test for creditClassification/insurance transaction CR Joan
|
2018-04-23 14:50:06 +02:00 |
|
Carlos Jimenez
|
03c61bb30f
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-20 16:26:06 +02:00 |
|
Joan Sanchez
|
12e67b7b60
|
Added method to send message to salesPerson on credit classification.
|
2018-04-20 15:16:03 +02:00 |
|
Carlos Jimenez
|
1fb366d11c
|
#190 install crud model backend unit test CR Mr Joan
|
2018-04-20 12:53:30 +02:00 |
|
Javi Gallego
|
de40c400b4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 16:32:59 +02:00 |
|
Javi Gallego
|
59979b87bd
|
#263 No mostrar sumatorio en client.factura CR Juan
|
2018-04-19 16:31:47 +02:00 |
|
Carlos Jimenez
|
4748f594de
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-19 15:48:29 +02:00 |
|
Carlos Jimenez
|
b959982911
|
#192 item clone test CR Joan
|
2018-04-19 15:48:19 +02:00 |
|
Gerard
|
1e15826f8d
|
Bug #211 Forzar a ciertos tags
|
2018-04-19 15:12:39 +02:00 |
|
Gerard
|
592b34a879
|
Bug #243 Indice de Tickets
|
2018-04-19 14:56:05 +02:00 |
|
Gerard
|
79fafa7dfc
|
merge
|
2018-04-19 14:51:21 +02:00 |
|
Carlos Jimenez
|
6f162c774e
|
fixes and refactor in several spec files
|
2018-04-19 11:20:41 +02:00 |
|
Gerard
|
b4af50cc48
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 09:31:28 +02:00 |
|
Joan Sanchez
|
ded1ab5d93
|
Sql messageSend() and messageSendWithUser()
|
2018-04-18 15:11:05 +02:00 |
|
Gerard
|
25d099513d
|
fix wrong type of data
|
2018-04-18 14:42:48 +02:00 |
|
Carlos Jimenez
|
bf66dcbf10
|
disabled clone spec while investigating how to extend loopback methods
|
2018-04-18 14:42:30 +02:00 |
|
Gerard
|
2d5cd04b8a
|
fix wrong type of the id after a change iin the fixtures
|
2018-04-18 14:42:11 +02:00 |
|
Carlos Jimenez
|
e5bd430ff8
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-18 14:37:23 +02:00 |
|
Carlos Jimenez
|
f3eecf53b7
|
#192 refactor on back end unit test helpers to ready loopback methods extensions CR Joan
|
2018-04-18 14:37:17 +02:00 |
|
Javi Gallego
|
9e6aaf8ac6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-18 13:59:28 +02:00 |
|
Javi Gallego
|
f5014b7824
|
# 186 CANCEL button en secciones pertinentes CR juan
|
2018-04-18 13:47:45 +02:00 |
|
Bernat
|
78b79b6fde
|
update fixtures and refactor ticketVolume and backend test
|
2018-04-18 13:40:09 +02:00 |
|
Joan Sanchez
|
228239b027
|
Added step-control component and basic data step controllers
|
2018-04-18 09:47:05 +02:00 |
|
Joan Sanchez
|
5e09df1c9d
|
Ticket summary. #213
|
2018-04-17 14:49:55 +02:00 |
|
Joan Sanchez
|
f95a2f646b
|
Refactor back-end unit test + helpers
|
2018-04-17 13:38:40 +02:00 |
|
Joan Sanchez
|
808ff40794
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-17 12:19:51 +02:00 |
|
Joan Sanchez
|
136a5e26a3
|
Created component vn-label-value and replaced vn-label on descriptors
|
2018-04-17 12:19:40 +02:00 |
|
Bernat
|
7426bc9e04
|
update fixtures with table cache.calc and dumpedfixtures with table cache
|
2018-04-17 11:20:00 +02:00 |
|
Bernat
|
ba22900908
|
update fixtures, table ticket
|
2018-04-17 08:17:37 +02:00 |
|
Carlos Jimenez
|
18cf6eb739
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-16 16:47:24 +02:00 |
|
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 |