Daniel Herrero
9fe0aadff8
modelos con inicial mayuscula
2017-12-13 13:40:21 +01:00
Daniel Herrero
69934a4869
[R12 - T16] Bug corregido, faltaba la asociacion con cliente para el modelo Mandate
2017-12-13 09:05:58 +01:00
Daniel Herrero
b8a6340afd
[R12 - T16] REST para mandatos
2017-12-13 08:24:14 +01:00
Daniel Herrero
5c54550283
refactorizacion de production, menos watchers
2017-12-12 14:00:02 +01:00
Daniel Herrero
34016dfa1e
production: asignar tickets
2017-12-12 12:26:18 +01:00
Carlos Jimenez
a8d79a578f
e2e pay method path until due day
2017-12-11 12:33:27 +01:00
Carlos Jimenez
78a2887ab3
several repairs on both e2e paths create client and edit basic data plus some required refactors
2017-12-05 15:28:48 +01:00
Carlos Jimenez
08bfb80912
refactor to fix and update testing fixtures
2017-12-05 11:21:48 +01:00
Javi Gallego
8755d4846a
merge
2017-12-04 08:17:29 +01:00
Joan Sanchez
02fb54efa9
merge
2017-11-22 20:55:44 +01:00
Joan Sanchez
774f577edd
Ruta de validación de token en servicio Auth
2017-11-22 20:54:20 +01:00
Daniel Herrero
aae137d35e
changed datasource in employeeList service
2017-11-22 13:35:05 +01:00
Daniel Herrero
ba73869fd3
changes in getRoleCustomer service
2017-11-22 13:24:36 +01:00
Daniel Herrero
3bd913cbd9
changed datasource in salesperson service
2017-11-22 13:19:51 +01:00
Javi Gallego
bfd584487f
limpieza de models auth obsoleto, ahora vn
2017-11-22 12:43:12 +01:00
Javi Gallego
b3e8b4542a
model client con la nueva nomenclatura
2017-11-22 08:59:21 +01:00
Daniel Herrero
e7d19da8f5
added sales person property into create new client
2017-11-21 14:53:09 +01:00
Daniel Herrero
28c4cdfa5f
removed eslint problems
2017-11-21 11:59:43 +01:00
Daniel Herrero
730d52169e
bug fixed in salesperson query
2017-11-21 11:50:37 +01:00
Daniel Herrero
13c15bb5b3
production with searchbar
2017-11-21 11:12:52 +01:00
Joan Sanchez
a138554301
Cambiada ruta de petición al desactivar cliente.
2017-11-20 18:56:53 +01:00
Daniel Herrero
96f1db5cb7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-16 15:06:04 +01:00
Daniel Herrero
ea35c1feda
new searchBar
2017-11-16 15:05:45 +01:00
Juan Ferrer Toribio
e03d257930
Errores en spinner
2017-11-16 13:47:18 +01:00
Juan Ferrer Toribio
519a55fac7
Merge, errores en spinner solucionados
2017-11-16 13:46:56 +01:00
Juan Ferrer Toribio
67829f5694
Correcciones varias
2017-11-16 12:35:07 +01:00
Vicente Falco
79e09e32e3
client: dni validation
2017-11-16 12:02:45 +01:00
Daniel Herrero
5c1f4321ed
removed favicon
2017-11-16 07:51:42 +01:00
Daniel Herrero
be286f6057
favicon moved
2017-11-16 07:16:10 +01:00
Daniel Herrero
dfb5552181
new Favicon
2017-11-15 14:39:46 +01:00
Daniel Herrero
d4a0cf205d
bug fixed in edit addresses
2017-11-15 12:11:35 +01:00
Daniel Herrero
d19ebe0c8c
bug fixed list producction
2017-11-14 11:20:12 +01:00
Carlos
77ccc0e8af
temp favicon.ico (to update once we have the right one)
2017-11-14 08:24:01 +01:00
Carlos
29149b1b58
corrected some eslint errors and small refactor
2017-11-13 22:15:44 +01:00
Carlos
154c06e7f4
added hasToInvoiceByAddress checkbox to client > billingData
2017-11-13 11:47:41 +01:00
Daniel Herrero
6ea0f05054
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-09 14:27:23 +01:00
Daniel Herrero
17143883f8
address data changes
2017-11-09 14:27:01 +01:00
Carlos
7223922251
typo corrected at dblocal fixtures plus renamed files and selectors added
2017-11-09 13:54:06 +01:00
Daniel Herrero
b77395762c
bug fixed in address
2017-11-09 13:22:54 +01:00
Daniel Herrero
3d33c21cc8
removed eslint errors
2017-11-09 08:59:40 +01:00
Daniel Herrero
d2491bfbf4
refact production list
2017-11-09 08:54:41 +01:00
Vicente Falco
10c52a75b9
microservices: configuration
2017-11-09 07:45:46 +01:00
Vicente Falco
14820fbb3e
merge
2017-11-09 07:34:17 +01:00
Vicente Falco
20a6728ed6
microservices: boot
2017-11-09 07:34:02 +01:00
Vicente Falco
a9cab91acc
Production Package
2017-11-08 20:06:00 +01:00
Vicente Falco
9cddb00a19
Client: Request Package
2017-11-08 18:27:31 +01:00
Vicente Falco
18121e1d9d
docker context
2017-11-08 17:44:10 +01:00
Vicente Falco
2de3ccff8e
Docker auth
2017-11-08 17:40:15 +01:00
Vicente Falco
c03e5297a2
Docker loopback
2017-11-08 17:24:23 +01:00
Vicente Falco
254615331a
Docker: Faster
2017-11-08 17:04:08 +01:00
Daniel Herrero
f71dfa53ef
refact list production
2017-11-08 14:59:46 +01:00
Vicente Falco
1d109f2371
docker
2017-11-08 14:11:33 +01:00
Daniel Herrero
063b97d3e1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-08 13:42:41 +01:00
Daniel Herrero
061ae64c50
production filtering in temporary table
2017-11-08 13:42:33 +01:00
Vicente Falco
0a107ba0bc
docker
2017-11-08 09:57:51 +01:00
Vicente Falco
b1f17349c3
Docker changes
2017-11-07 19:21:11 +01:00
Daniel Herrero
5a1aca198b
localizador rutas maquetacion 90%
2017-11-07 11:22:33 +01:00
Vicente Falco
e04cda0f35
service Production: bugs
2017-10-31 09:26:11 +01:00
Carlos
d839ba2aca
local db inserts update
2017-10-27 13:39:50 +02:00
Vicente Falco
ac8797f24d
Client Service: Employee List active
2017-10-25 13:47:39 +02:00
Carlos
2eeae6cc36
local DB user emails inserts updated to fix bug plus gitignore
2017-10-25 14:48:23 +08:00
Joan Sanchez
9d6eeba1a3
merge
2017-10-25 00:39:34 +02:00
Joan Sanchez
13981ae023
Quita contraseña de smtp.test.json
2017-10-25 00:38:02 +02:00
Vicente Falco
e7223ef493
Client: email from Account not required
2017-10-24 14:29:53 +02:00
Vicente Falco
a58d530523
Client: add notes
2017-10-24 14:10:09 +02:00
Vicente Falco
64497d70e1
Client Address: Change default address
2017-10-24 13:37:27 +02:00
Carlos
ea001f44b1
SQL changes for localDB docker
2017-10-24 12:47:58 +02:00
Vicente Falco
1c5a65928e
change on services, docker localDB y jasmime
2017-10-24 08:56:18 +02:00
Vicente Falco
b32f0b199f
mailer localDB
2017-10-22 14:03:04 +02:00
Joan Sanchez
7b2506df80
setup-printer translation, added client-welcome report
2017-10-20 14:03:25 +02:00
Joan Sanchez
ac21ceb399
Vista previa de email, desde el parámetro isPreview
2017-10-19 12:47:05 +02:00
Daniel Herrero
83d262ec32
agencyService changes to agencyMode
2017-10-19 09:21:34 +02:00
Daniel Herrero
9159af69f4
correciones varias
2017-10-19 09:12:27 +02:00
Dani Herrero
070cd764b6
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-19 07:16:51 +02:00
Dani Herrero
59577bcb7f
bug fixed rawSQL
2017-10-18 15:06:38 +02:00
Carlos
09a24fe8e8
fixtures
2017-10-18 14:48:39 +02:00
Dani Herrero
3d52031dc2
cambios en validacion de credito de cliente
2017-10-18 12:51:33 +02:00
vicentefalco
a0955cf50d
docker dbLocal
2017-10-18 06:41:17 +02:00
Dani Herrero
a366ef1fc1
facke active drivers rest created
2017-10-17 12:22:19 +02:00
Dani Herrero
5514ec222a
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-17 09:41:08 +02:00
Dani Herrero
09f54b40d0
parse vars in filer routes
2017-10-17 09:40:56 +02:00
Joan Sanchez
d66fed5a3d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-17 09:01:51 +02:00
Dani Herrero
22ccf278a4
config file
2017-10-17 08:45:51 +02:00
unknown
eab51e1b9d
Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 08:22:59 +02:00
Juan Ferrer Toribio
0962fa19e5
Eliminando codigo redundante v5
2017-10-13 16:54:07 +02:00
Juan Ferrer Toribio
8fc14348d7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-13 16:23:08 +02:00
Juan Ferrer Toribio
5f1066ff03
Eliminando codigo redundante v3
2017-10-13 16:23:00 +02:00
Juan Ferrer Toribio
4267b5fe0a
Eliminando código redundante v2
2017-10-13 16:22:45 +02:00
Vicente Falco
09e7e7f4ce
DockerFile db local
2017-10-13 08:53:54 +02:00
Juan Ferrer Toribio
ad24380043
Merge
2017-10-11 16:00:36 +02:00
Juan Ferrer Toribio
08da6c9713
Eliminando código redundante v1
2017-10-11 15:36:47 +02:00
dherrero
f24e16b81d
moved model agency
2017-10-11 15:00:18 +02:00
dherrero
e52b31ceb3
service validations moved into generic folder
2017-10-11 14:10:51 +02:00
dherrero
760d63ec6c
removed unused files
2017-10-11 13:03:05 +02:00
dherrero
4dae59aa09
zone model and rest api
2017-10-11 12:47:02 +02:00
dherrero
cf36d7d6be
module routes: front dev 80%
2017-10-11 12:09:22 +02:00
dherrero
911fbb2f8b
filtro de rutas con paginación
2017-10-11 09:18:26 +02:00
dherrero
5a07973789
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-10 15:01:21 +02:00
dherrero
eeda5b45fd
routes change model and first look
2017-10-10 15:01:10 +02:00
joan
c3d611adb2
Login sin url de redirección
2017-10-10 14:45:13 +02:00
dherrero
2d7e3f8dfe
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-10 11:14:45 +02:00
dherrero
96235a6752
route service models
2017-10-10 11:14:35 +02:00
Vicente Falco
48cac24d88
Jenkins y routes
2017-10-10 11:09:47 +02:00
dherrero
431032177c
new micro-service route: need reinstall all dependencies
2017-10-05 14:26:04 +02:00
Dani Herrero
dd004fdc89
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 13:32:44 +02:00
Dani Herrero
0925451364
spread equivalent tax in all addresses
2017-10-04 13:32:26 +02:00
Joan Sanchez
9ebd705aea
Errores en servicio de autenficación solucionados.
2017-10-04 13:27:38 +02:00
Dani Herrero
9fbc404aa1
bug fixed in formatCard function
2017-10-04 09:07:14 +02:00
Dani Herrero
8e5eca5629
validation client credit - refact
2017-10-04 08:33:51 +02:00
Dani Herrero
2aed5d088c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 08:18:49 +02:00
Dani Herrero
627d27ad51
validate client credit
2017-10-04 08:18:31 +02:00
Joan Sanchez
666928b1a9
Auth login json response
2017-10-03 14:44:11 +02:00
Dani Herrero
4e309b67f0
bug fixed on LoadMore action in autocomplete
2017-10-03 09:16:02 +02:00
Joan Sanchez
aef9659798
Mailer: Autentificación token por ruta. Fix creditClassification
2017-10-02 11:19:55 +02:00
Javi Gallego
19e7e0d76b
cambio de enabled y default por isEnabled y isDefaultAddress
2017-09-29 14:41:30 +02:00
Dani Herrero
ecf88f6b66
new address list
2017-09-28 14:34:18 +02:00
Dani Herrero
70e4b22e8a
get address return province data
2017-09-28 11:29:01 +02:00
Dani Herrero
1d47bf58f1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 09:14:31 +02:00
Dani Herrero
62cc0c3c9e
sales person formated
2017-09-28 09:13:42 +02:00
Vicente Falco
895b3435c4
getRoleCustomer return object not array of object
2017-09-28 08:41:45 +02:00
Joan Sanchez
677e8ddd62
Token authenticate, solunion notification
2017-09-27 17:44:51 +02:00
Dani Herrero
bc20725c6c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 09:25:39 +02:00
Dani Herrero
fbd5fea126
[finish] active salesPerson service
2017-09-27 09:25:33 +02:00
Carlos
79438f31cb
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
active salesperson service in progress
2017-09-27 08:55:38 +02:00
Carlos
6798655869
removed unused file
2017-09-27 08:54:37 +02:00
Dani Herrero
4eeb5df74f
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 07:22:44 +02:00
Dani Herrero
43a55f60c4
active salesperson service in progress
2017-09-27 07:22:40 +02:00
Juan Ferrer Toribio
f647e9e2d1
Modelos y código común para servicios loopback
2017-09-26 16:59:24 +02:00
Javi Gallego
bf0bd37773
validacion del Iban
2017-09-25 17:40:02 +02:00
Javi Gallego
9b76d3d004
validaciones custom se bajan al cliente solo si son isExportable
2017-09-25 17:39:51 +02:00
Carlos
a5df4afc0f
refactor on routes.js
2017-09-22 13:06:38 +02:00
Carlos
f588e3f046
linter errors corrected
2017-09-21 14:49:14 +02:00
Carlos
747d5f5e36
datasource.test files for the local test db plus dockerfile refactor
2017-09-21 14:46:42 +02:00
Vicente Falco
35ce85e3fc
docker DB
2017-09-21 12:17:48 +02:00
Carlos
76b0b955cf
fixed ESLint errores for the commited files.
2017-09-20 15:06:38 +02:00
Carlos
9ed9e13b54
jasmine ESLint plugging added to dev dependencies and refactor on all specs according to eslint rules.
2017-09-20 14:01:33 +02:00
Carlos
e20dd82928
repaired ESLint to work everywhere, plus refactor on all package.json's that included ESLint dependencies.
2017-09-20 13:15:12 +02:00
Vicente Falco
6c3ac042f1
CreateUserProfile: save first email on account table and all emails on client table
2017-09-20 12:15:38 +02:00
Carlos
2e5989cc7f
removed console.log from filter.js
2017-09-19 14:36:48 +02:00
Carlos
e8d24a52ef
basic-data.html info tag added, plus refactor on backend create.js and filter.js, plus spec commented until db docker implementation
2017-09-19 14:34:59 +02:00
Vicente Falco
93568237f0
boolean return method getRoleCustomer
2017-09-18 11:52:03 +02:00
Vicente Falco
7f6e9fc617
Service gets if a client has got a Role customer -
...
getRoleCustomer
2017-09-18 07:39:06 +02:00
Dani Herrero
b288692b6c
ticket json
2017-09-12 10:36:07 +02:00
Dani Herrero
be24b31339
ticket.json
2017-09-12 07:39:45 +02:00
Carlos
f5fd729634
e2e tests on clients path
2017-09-11 16:12:32 +02:00
Carlos
0cc707bc2c
server-side tests settings and e2e settings
2017-09-10 20:04:22 +02:00
Carlos
9c80cd8466
server-side unit tests env setup
2017-09-08 14:37:55 +02:00
Carlos
a9763e728c
refactor for backend create.js transaction and it's html error notification for account implemented
2017-09-06 09:56:36 +02:00
Carlos
9607b2d897
transaction for account and client creation at create.js
2017-09-05 23:01:51 +02:00
Carlos
e2d1103607
tarea Añadir email y user al formulario de creación de clientes
2017-09-05 16:15:11 +02:00
Joan Sanchez
4c9383038f
Notification rest, mail log and error catch
2017-08-31 16:11:37 +02:00
Joan Sanchez
22b5e2e8bf
Mailer mail.send() and mail.sendWithTemplate()
2017-08-30 14:50:46 +02:00
Vicente Falco
0656fea23b
mailer: cambio email destinatario cuando no es production
2017-08-30 14:10:43 +02:00
Vicente Falco
c3707cc1eb
Docker Services
2017-08-30 09:58:10 +02:00
Javi Gallego
cad2aaf121
campo isManaged para que no muestre todos los almacenes en los combobox
2017-08-29 12:21:00 +02:00
Javi Gallego
1743db2174
isEqualizated en Address
2017-08-22 14:27:09 +02:00
Juan Ferrer Toribio
5c80a8b4d7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-08-22 09:51:24 +02:00
Juan Ferrer Toribio
c65d69c62f
Archivos duplicados borrados
2017-08-22 09:51:13 +02:00
Dani Herrero
9fa608b11f
bug fixed filter in clients
2017-07-13 13:12:09 +02:00
Dani Herrero
5e41f573f5
añadido campo Date al modelo de FakeProduction
2017-07-12 14:02:03 +02:00
Vicente Falco
139579e78f
FakeProductionSql campo date
2017-07-12 08:53:55 +02:00
Vicente Falco
ace002e02b
time production
2017-07-12 08:21:36 +02:00
Vicente Falco
62b0a29f7c
messageSend Production
2017-07-12 07:57:30 +02:00
Dani Herrero
22829aa218
nuevos iconos de módulos
2017-07-11 14:28:53 +02:00
Dani Herrero
4e087139b4
CAU 2593 Busqueda Avanzada - campo telefono busca en: phone or mobile
2017-07-11 11:18:42 +02:00
Dani Herrero
c788ea5e29
config en minusculas
2017-07-11 10:34:25 +02:00
Dani Herrero
35d213874e
merge
2017-07-11 10:32:54 +02:00
Vicente Falco
f1fda284cb
varios cambios
2017-07-11 09:36:11 +02:00
Dani Herrero
bbd09b3d36
eliminado console.log
2017-07-06 14:48:05 +02:00
Dani Herrero
2b7abef98f
corregido filtro principal
2017-07-06 14:46:22 +02:00
Juan Ferrer Toribio
5929b8be32
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 13:04:51 +02:00
Juan Ferrer Toribio
46e9029be3
Directorio obsoleto borrado
2017-07-06 13:04:43 +02:00
Dani Herrero
283d2ab440
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 12:58:54 +02:00
Dani Herrero
25ac346b2b
filtro principal y ajustes css
2017-07-06 12:58:50 +02:00
Vicente Falco
d8727b380c
change-worker
2017-07-06 12:21:19 +02:00
Vicente Falco
a7af81383b
merge
2017-07-06 11:31:26 +02:00
Vicente Falco
607c781f15
merge
2017-07-06 11:28:06 +02:00
Dani Herrero
0339fdaef1
cambio de hora funcionando
2017-07-06 11:05:26 +02:00
Vicente Falco
525c8bbcf8
merge
2017-07-06 10:39:52 +02:00
Vicente Falco
15fee03060
Endpoint change-time
2017-07-06 09:55:28 +02:00
Dani Herrero
4b767aa61f
tooltip template
2017-07-06 09:26:26 +02:00
Vicente Falco
d2e0051b38
Endpoint RouteFk
2017-07-06 08:45:33 +02:00
Vicente Falco
c47c88dd10
model Routes
2017-07-04 10:13:17 +02:00
nelo
e26838063b
rutas
2017-07-03 14:29:44 +02:00
nelo
f993504157
rutas
2017-07-03 14:29:09 +02:00
nelo
d5d5c3079a
corrección errores brocal
2017-07-03 14:23:53 +02:00
Vicente Falco
ba2d803f28
merge
2017-07-03 14:20:06 +02:00
Vicente Falco
9e6bd8522e
vies
2017-07-03 14:19:47 +02:00
nelo
ffe85cca17
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-03 09:42:55 +02:00
nelo
9b68abef9d
allowBlank client
2017-07-03 09:42:51 +02:00
Vicente Falco
e3e7c9f863
endpoint ListadoTrabajadores
2017-06-30 09:26:55 +02:00
nelo
37c1c654b7
get correct user sender
2017-06-29 14:15:23 +02:00
nelo
c5363155c4
send message
2017-06-29 14:08:57 +02:00
Dani Herrero
d8f4e0489e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 13:56:56 +02:00
Dani Herrero
491ea3b796
dropDown with search and columHeader preview icon
2017-06-29 13:56:52 +02:00
nelo
2e7a225249
rawsql with promises
2017-06-29 11:48:57 +02:00
nelo
ddcec00c4f
change time
2017-06-29 09:48:00 +02:00
nelo
80121de6c3
change state
...
message send
change time
2017-06-28 08:57:33 +02:00
nelo
d996a56a1e
new fake production table
...
list filter with fields
2017-06-22 14:51:37 +02:00
nelo
4890a69238
page and offset filter FakeProduction
2017-06-22 09:09:31 +02:00
nelo
26e1e9a71b
list ticket fake production
2017-06-21 13:29:01 +02:00
nelo
a7a4a211e2
fake production in table
2017-06-21 12:11:38 +02:00
nelo
a4d9c3008a
agencies
2017-06-21 08:00:34 +02:00
nelo
df320908ae
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-21 07:28:07 +02:00
nelo
ce15b68a92
list for all models
2017-06-21 07:28:03 +02:00
Dani Herrero
7c28d42be0
merge conflicts
2017-06-20 15:02:23 +02:00
Dani Herrero
d444980ab1
[En progreso] nuevo componente vnGridHeader para ordenación de tablas
2017-06-20 15:00:27 +02:00
nelo
509dab5ce4
list states
2017-06-20 13:14:20 +02:00
nelo
50e086fbc0
list for my model
2017-06-20 13:06:13 +02:00
nelo
729ddf3358
warehouses inventory
2017-06-20 10:40:04 +02:00
nelo
80b9815a57
callback error list warehouses, change-state
2017-06-15 11:59:15 +02:00
nelo
b86f71bb25
llamamos al servicio client para obtener el empleado
...
cambiamos el estado
2017-06-15 11:02:50 +02:00
nelo
18ff74b17f
get user and employee
2017-06-14 14:27:16 +02:00
nelo
6996352029
get warehouses
2017-06-14 12:55:10 +02:00
nelo
16302e1f9a
problemas con riesgo
2017-06-14 12:16:53 +02:00
Dani Herrero
888f5c0cc6
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-14 09:58:36 +02:00
Dani Herrero
e43827ab28
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
# Conflicts:
# services/production/common/methods/ticket-state/change-state.js
2017-06-14 09:58:30 +02:00
nelo
956264a529
fake son con notas
2017-06-14 09:56:08 +02:00
Dani Herrero
afff93cce6
Tooltip: admite html, Localizador: añadido icono con información adicional
2017-06-14 09:54:00 +02:00
nelo
3da67266bb
promesa para obtener usuario
2017-06-14 08:54:45 +02:00
nelo
6adc734f69
change state ticket
2017-06-13 13:57:40 +02:00
nelo
87857488c0
modificaciones fake son
2017-06-13 12:00:11 +02:00
nelo
cbc364db38
get states production
2017-06-13 11:26:54 +02:00
nelo
ecf347e7e2
modificaciones fake
2017-06-13 09:07:14 +02:00
nelo
c24c126734
fake son de tickets
...
my model tiene el meted raw sql
2017-06-13 08:44:40 +02:00
Joan Sanchez
e4f9420697
Parser de estilos en plantillas para el servicio mailer.
2017-06-12 13:41:02 +02:00
Joan Sanchez
9aa549cfc5
No mostrar dia de pago en metodo de pago por tarjeta.
2017-06-08 16:53:10 +02:00
Vicente Falco
dbb1632632
nginx docker
2017-06-08 11:08:45 +02:00
Joan Sanchez
e178bd8676
Traducciones de plantillas y mostrar nuevos datos de facturación en servicio mailer.
2017-06-07 19:29:16 +02:00
Joan Sanchez
73c5f5581f
Cambios en servicio mailer
2017-06-07 15:28:42 +02:00
Vicente Falco
3ffa020564
nginx docker
2017-06-07 09:09:35 +02:00
Vicente Falco
7ec66e862c
nginx
2017-06-07 09:07:58 +02:00
Vicente Falco
00dd05ba6d
Docker
2017-06-07 08:43:25 +02:00
nelo
ce256b395e
tarea gula para copiar los ficheros comunes
...
puerto 3004 para production
2017-06-07 08:38:48 +02:00
nelo
47f9d29686
servicio production creado
2017-06-06 08:21:38 +02:00
Vicente Falco
622884d31c
Docker nginx
2017-06-05 09:22:36 +02:00
Juan Ferrer Toribio
609c984426
Loopback 3, errores solucionados, codigo reorganizado
2017-06-05 09:01:21 +02:00
Juan Ferrer Toribio
b427361156
Loopback 3, Errores solucionados
2017-06-03 13:01:47 +02:00
Juan Ferrer Toribio
8cd312e145
Errores solucionados
2017-06-02 15:39:16 +02:00
Juan Ferrer Toribio
f9842000d3
Codigo gulp reorganizado, errores redirección solucionados
2017-06-02 15:23:19 +02:00
Juan Ferrer Toribio
481a2219ce
Ruta desarrollo http://localhost:5000 , producción 80
2017-06-02 09:29:14 +02:00
Juan Ferrer Toribio
80e6b0c666
Merge
2017-06-01 18:48:11 +02:00
Juan Ferrer Toribio
61829e1ae4
Validación credito beta
2017-06-01 18:23:41 +02:00
nelo
60de6056c1
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 14:39:26 +02:00
nelo
b18c2c4966
Administración solo recargo equivalencia
...
Razón social único
Si no hay comercial, modificar los datos
2017-06-01 14:39:22 +02:00
Dani Herrero
55a66c992c
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 14:05:31 +02:00
Dani Herrero
310ad81a69
emails separados con coma
2017-06-01 14:05:23 +02:00
Vicente Falco
f4ed484b90
Notas: Anadir usuario
2017-06-01 13:52:13 +02:00
Dani Herrero
fb8e62c840
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 13:31:47 +02:00
Dani Herrero
cd750cb86f
ACL corregido error
2017-06-01 13:31:42 +02:00
Juan Ferrer Toribio
2ac41f390a
Carpetas renombradas, plantillas configuración
2017-06-01 09:58:24 +02:00
Dani Herrero
0cc64bf285
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 09:32:01 +02:00
Dani Herrero
a3dda662ae
ACLs, json configuracion y script SQL
2017-06-01 09:31:57 +02:00
Joan Sanchez
bb75fd783c
merge
2017-06-01 08:52:25 +02:00
Joan Sanchez
c9968cf550
Eliminado logger y renombradas carpetas
2017-06-01 08:51:29 +02:00
Dani Herrero
cf9e2f3d14
arreglado fallo al actualizar el consignatario predeterminado
2017-06-01 08:44:37 +02:00
Dani Herrero
dd9ec548e1
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-06-01 08:29:15 +02:00
Dani Herrero
8815b927ac
merge solved conflicts
2017-06-01 08:29:01 +02:00
Juan Ferrer Toribio
410f0490c6
Errores solucionados
2017-06-01 08:28:52 +02:00
Juan Ferrer Toribio
94bdcd66e7
Errores solucionados
2017-06-01 08:28:12 +02:00
Dani Herrero
b9c43ec961
fixed pass
2017-06-01 08:26:48 +02:00
Juan Ferrer Toribio
5507c84670
Errores solucionados
2017-06-01 08:25:59 +02:00
Juan Ferrer Toribio
7f661afa1a
Errores solucionados
2017-06-01 08:24:57 +02:00
Dani Herrero
6dcf37fc5a
logger fixed
2017-06-01 08:20:05 +02:00
Dani Herrero
36a5051634
arreglos en merge 2
2017-06-01 08:01:49 +02:00
Dani Herrero
342ca3bd30
arreglos de conflictos
2017-06-01 07:59:41 +02:00
Dani Herrero
25bac942a3
merge
2017-06-01 07:10:28 +02:00
Juan Ferrer Toribio
0c82c83ca3
Errores solucionados, configuración mailer, eslint
2017-05-31 18:19:55 +02:00
Joan Sanchez
b2c5fe8a28
dependencia path
2017-05-31 14:59:05 +02:00
Joan Sanchez
a4d8574321
Cambios en servicio mailer
2017-05-31 14:55:41 +02:00
Joan Sanchez
552559adaa
Service mailer, plantillas y traducciones
2017-05-31 13:46:18 +02:00
Vicente Falco
f2e5b4824e
merge
2017-05-31 13:00:16 +02:00
Vicente Falco
3acca753bb
merge
2017-05-31 13:00:16 +02:00
Vicente Falco
89c90b0af2
merge
2017-05-31 12:57:18 +02:00
Vicente Falco
fae56408bb
merge
2017-05-31 12:57:18 +02:00
Dani Herrero
96dd6de8a6
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
Dani Herrero
72d5e3e0a3
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
Dani Herrero
b8287efdc2
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
Dani Herrero
528dcac06f
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
nelo
c8424f98f4
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
nelo
9e550e746a
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
Dani Herrero
11c3b2de2d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
Dani Herrero
9cea151f4d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
Dani Herrero
74a0eedb47
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
Dani Herrero
cadbb2b6c2
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
Vicente Falco
2dab567b98
gulp services y service mailer
2017-05-30 08:50:16 +02:00
Vicente Falco
65cc23b280
gulp services y service mailer
2017-05-30 08:50:16 +02:00
Joan Sanchez
04aadb76a2
Service mailer
2017-05-30 08:06:14 +02:00
Joan Sanchez
609c13efbf
Service mailer
2017-05-30 08:06:14 +02:00
Vicente Falco
3d43bf57cd
mailer docker
2017-05-29 13:57:18 +02:00
Vicente Falco
0ad4558c17
nginx
2017-05-29 13:48:20 +02:00
Juan Ferrer Toribio
025bd4224e
Errores en validación solucionados
2017-05-26 17:05:33 +02:00
Juan Ferrer Toribio
daaf73a143
Errores validacion solucionados
2017-05-26 14:44:56 +02:00
Juan Ferrer Toribio
64813b3fd3
Errores en validación solucionados
2017-05-26 14:39:59 +02:00
Juan Ferrer Toribio
3d71f454a0
Errores en validación IBAN solucionados
2017-05-26 14:39:36 +02:00
Vicente Falco
51f112fc02
Validar campos loopback diferentes modelos
2017-05-26 14:06:21 +02:00
Dani Herrero
571692f4ca
Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl
2017-05-25 14:23:19 +02:00
Juan Ferrer Toribio
041be5ec93
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 12:52:49 +02:00
Juan Ferrer Toribio
1482b842bd
Errores solucionados
2017-05-25 12:52:38 +02:00
Dani Herrero
81f9de098d
ACLs , permisos a nivel de rutas, menu y componentes
2017-05-25 11:48:10 +02:00
Dani Herrero
3c54a222b9
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 07:21:43 +02:00
Dani Herrero
2ab756a403
primera version de ACL
2017-05-25 07:21:36 +02:00
Juan Ferrer Toribio
345f2e55a5
vnAutocomplete: Acepta plantillas
2017-05-24 13:24:32 +02:00
Juan Ferrer Toribio
5b9fcf868a
401 redirecciona a login, vnAutocomplete: campos seleccionados
2017-05-23 14:05:26 +02:00
Juan Ferrer Toribio
aabc190c08
crlf -> lf
2017-05-22 12:39:36 +02:00
Dani Herrero
4857fce33e
Añadido logoutSessionsOnSensitiveChanges
2017-05-22 12:33:06 +02:00
Juan Ferrer Toribio
3f84230619
Autenticación por email o usuario
2017-05-22 11:31:06 +02:00
Juan Ferrer Toribio
ac3f7c2da0
Autenticación: errores solucionados
2017-05-22 11:04:37 +02:00
Juan Ferrer Toribio
5cfdd51cf4
Integración usuarios, errores solucionados
2017-05-21 18:36:07 +02:00
Juan Ferrer Toribio
72415ebeb2
ACLs
2017-05-18 17:54:23 +02:00
Juan Ferrer Toribio
c4cb0906ad
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 17:35:51 +02:00
Juan Ferrer Toribio
a2ac778c9a
Peticiones XHR con token
2017-05-18 17:35:07 +02:00
nelo
a031f31a05
restablecido filtre
2017-05-18 13:59:02 +02:00
nelo
7691449e52
restablecido filtre
2017-05-18 13:40:42 +02:00
nelo
5e965f485f
eliminado el filter de MyModel
2017-05-18 11:55:46 +02:00
nelo
b4d167bbb7
header.js
2017-05-18 11:54:39 +02:00
nelo
2aa7c9731d
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 08:18:53 +02:00
Juan Ferrer Toribio
2c7a37c4b6
Errores solucionados, modelos loopback ocultados
2017-05-17 21:38:02 +02:00
Juan Ferrer Toribio
9d4acfc64f
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-17 21:23:54 +02:00
Juan Ferrer Toribio
4eff9d451b
Autenticación por token
2017-05-17 21:23:47 +02:00
nelo
726bb73ca0
Todos heredan de MyModel
2017-05-17 14:58:23 +02:00
Vicente Falco
5f9160c172
ng-disabled vn-textfield
2017-05-17 14:04:02 +02:00
nelo
e4559c3959
Corrección error autocomplete
...
Separado meted activate
Separado meted addresses
2017-05-17 09:45:34 +02:00
nelo
ae3f9db948
VnAutocomplete ya no carga los datos cuando los datos se pueden bandera.
...
Creado el método card en client para listar el cliente con sus datos para el combo.
2017-05-17 08:19:03 +02:00
Vicente Falco
fc37c59574
nginx
2017-05-15 11:12:00 +02:00
Vicente Falco
d8df17ad07
salix routes static
2017-05-15 10:44:19 +02:00
Vicente Falco
eacd133d00
Docker nginx
2017-05-15 09:03:05 +02:00
Vicente Falco
6a4235a9a2
Ajustes conf
2017-05-15 08:47:58 +02:00
Vicente Falco
77d8a8f090
Jenkins
2017-05-15 08:33:51 +02:00
Vicente Falco
8a9d8c83b6
docker
2017-05-15 08:07:30 +02:00
Vicente Falco
8c47938bd0
merge
2017-05-15 07:53:40 +02:00
Vicente Falco
d5da337d52
Jenkins - docker nginx
2017-05-15 07:53:06 +02:00
Juan Ferrer Toribio
60a3b049de
Campos renombrados
2017-05-12 15:21:37 +02:00
Juan Ferrer Toribio
88992438e2
Errores solucionados
2017-05-12 13:58:08 +02:00
Juan Ferrer Toribio
34e0537b64
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-12 13:36:56 +02:00
Juan Ferrer Toribio
ebb59d1eef
Errores en relaciones solucionados
2017-05-12 13:36:12 +02:00
Vicente Falco
a9212721f1
docker nginx conf
2017-05-12 13:14:52 +02:00
Vicente Falco
4df1a7898c
Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev
2017-05-12 13:05:54 +02:00
Vicente Falco
d93c6e1885
Jenkins - Docker
2017-05-12 12:41:35 +02:00
nelo
89f397da2c
Arreglado ClientObservation
2017-05-12 11:20:32 +02:00
Juan Ferrer Toribio
b7fb0bca98
Relaciones arregladas
2017-05-12 11:14:55 +02:00
nelo
8ce3325f06
Renombrado Chanel a ContactChannel
2017-05-11 14:19:43 +02:00
nelo
495e3b7c5e
creado el modelo Chanel.
...
Se puede seleccionar en el cliente.
2017-05-11 13:01:33 +02:00
Vicente Falco
27d086843f
Jenkins - Docker
2017-05-11 12:07:33 +02:00
Juan Ferrer Toribio
85184d71eb
Modelo modificado
2017-05-10 17:18:25 +02:00
Juan Ferrer Toribio
0efdd3565e
Modelos loopback
2017-05-09 14:04:44 +02:00
Juan Ferrer Toribio
0da217e9bc
Errores solucionados
2017-05-05 13:32:07 +02:00
Juan Ferrer Toribio
f7ec186a77
Errores solucionados
2017-05-05 12:54:47 +02:00
Juan Ferrer Toribio
f8cd8ee776
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-04-28 15:04:36 +02:00
Juan Ferrer Toribio
ce2d7936af
Integración con MySQL, errores solucionados
2017-04-28 15:04:29 +02:00
Vicente Falco
0cf11ceff0
i18n loopback client
2017-03-31 12:12:46 +02:00
Juan Ferrer Toribio
1eb0fb9c8d
Merge
2017-03-14 13:11:34 +01:00
Juan Ferrer Toribio
f1c5a45657
ACLs habilitadas
2017-03-14 13:08:55 +01:00
Vicente Falco
4bc1cf455b
notes: Crear
2017-03-10 11:18:16 +01:00
Juan Ferrer Toribio
7059eadfc7
Correciones varias
2017-03-07 17:11:56 +01:00
Vicente Falco
2cb110feee
consignatario sin bind
2017-03-06 11:44:02 +01:00
Juan Ferrer Toribio
2cc7d96dce
Eslint
2017-03-01 09:55:17 +01:00
Juan Ferrer Toribio
0ef8995724
PersistedModel extendido
2017-02-28 18:10:11 +01:00
Juan Ferrer Toribio
ded4e07ab7
Errores solucionados
2017-02-28 11:46:18 +01:00
Juan Ferrer Toribio
0f360db06e
mgCrud v2
2017-02-21 16:21:55 +01:00
Vicente Falco
63784c689e
Quitado Comentario Html
2017-02-21 13:19:24 +01:00
Vicente Falco
33bc79cb70
icons locales
2017-02-21 12:49:41 +01:00
Juan Ferrer Toribio
139cc770a5
Merge
2017-02-21 11:41:30 +01:00
Juan Ferrer Toribio
c694f00644
mgCrud v1
2017-02-21 11:36:43 +01:00
Vicente Falco
1f5fe03b81
icon cuadrado
2017-02-16 08:16:59 +01:00
Vicente Falco
8e437f9837
iconbutton cuadrado
2017-02-09 08:18:50 +01:00
Vicente Falco
71cad27187
focus
2017-02-08 14:45:27 +01:00
Juan Ferrer Toribio
51c58d9a9b
mg-crud añadida, filtro phone
2017-02-08 12:45:55 +01:00
Juan Ferrer Toribio
558ad8f393
Errores solucionados
2017-02-07 17:38:30 +01:00
Juan Ferrer Toribio
a98580dc10
Errores solucionados
2017-02-07 17:02:17 +01:00
Vicente Falco
5a6682c773
paging clients
2017-02-07 13:24:04 +01:00
Juan Ferrer Toribio
ec08e271f0
Errores solucionados, código preparado para mgCrud
2017-02-07 12:58:25 +01:00
Juan Ferrer Toribio
06accec04a
Validaciones RC2
2017-02-02 13:48:25 +01:00
Juan Ferrer Toribio
a13526f3e7
Validaciones beta
2017-02-01 18:55:02 +01:00
Juan Ferrer Toribio
a2d56480f3
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-31 14:15:11 +01:00
Juan Ferrer Toribio
abf6a6c142
Cargador modulos: modulo ng, validaciones, traducciones
2017-01-31 14:13:06 +01:00
nelo
afe2d1ea79
dirección por defecto.
2017-01-30 08:23:18 +01:00
nelo
87dda33a20
Modificaciones en el activar del descriptor.
...
Se envía solo la modificación de la dirección.
Cambios en address. Se comprueba el valor por defecto. Falla pero no da error. Se sube para no perderse los cambios.
2017-01-26 15:00:13 +01:00
nelo
c0de02a4ca
Endpoint desactivar
2017-01-25 11:46:15 +01:00
Juan Ferrer Toribio
278d764575
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-24 16:06:15 +01:00
Juan Ferrer Toribio
85c22f4523
i11n en modulos app y crud
2017-01-24 16:06:07 +01:00
nelo
ab7342e6a0
Modificación en client para que meta el nombre en el put.
...
Cambio de relaciones en client para sacar account fuera.
2017-01-24 12:30:17 +01:00
Javi Gallego
a0bc7f68de
account con relation
2017-01-24 10:15:13 +01:00
nelo
b9c0745b73
modifcaciones direcciones
2017-01-23 10:56:12 +01:00
nelo
83632dc3f1
modificaciones servidor consignatarios
2017-01-23 07:23:16 +01:00
nelo
47fec183a7
notas
2017-01-19 13:21:01 +01:00
nelo
ce055f4f3e
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-18 14:48:50 +01:00
nelo
aa23160aee
Separación de notas en listar y crear
2017-01-18 14:48:35 +01:00
Javi Gallego
dead10641b
merge
2017-01-18 13:51:45 +01:00
Javi Gallego
8a3dcb4698
webAccess sin error dialog
2017-01-18 13:49:04 +01:00
nelo
2694b14c53
validación consignatarios
2017-01-18 10:42:53 +01:00
Juan Ferrer Toribio
1e282656ab
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 16:08:43 +01:00
Javi Gallego
a5f378b70a
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 15:04:50 +01:00
Javi Gallego
826b340c20
clientObservation contra modelo correcto
2017-01-17 15:03:32 +01:00
nelo
4a065d073d
Merge con vicente
2017-01-17 14:33:06 +01:00
Juan Ferrer Toribio
02f8363c69
Merge
2017-01-17 13:12:05 +01:00
Juan Ferrer Toribio
3a5e718066
Merge
2017-01-17 13:09:27 +01:00
Javi Gallego
b469b52ba1
merge index.html
2017-01-17 13:06:08 +01:00
Javi Gallego
102c344859
dialog-confirm y acceso-Web
...
dialog-confirm ahora es generico y se ha añadido la entidad account
2017-01-17 13:02:35 +01:00
nelo
76df23ec00
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-17 11:27:02 +01:00