628 Commits

Author	SHA1	Message	Date
Vicent Llopis	998597dfcc	refs #4734 recator: cambiado nombre ruta	2023-06-16 13:49:21 +02:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Vicent Llopis	425118d333	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-06-16 13:09:38 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Alex Moreno	aa2d3be451	typo	2023-06-14 07:30:50 +02:00
Vicent Llopis	0cc5781f3f	refs #4734 feat: añadido método putExpedicionInternacional de viaexpress	2023-06-13 15:05:37 +02:00
Alex Moreno	dd4b62d0a5	description	2023-06-13 12:42:12 +02:00
Alex Moreno	aeb04efe82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-13 11:49:42 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Vicent Llopis	61f99744c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-13 07:43:23 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Alex Moreno	5c1b867d05	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
Alex Moreno	051269d646	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-12 09:11:17 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Vicent Llopis	3fdb546d86	refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created	2023-06-07 10:28:29 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Vicent Llopis	98af8ee10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-06 12:31:20 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Vicent Llopis	2b34dd19e8	refs #554 delete: test back que falla	2023-05-30 12:06:15 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Vicent Llopis	06d1de5a63	refs #5554 feat: add back test	2023-05-25 12:06:40 +02:00
Vicent Llopis	91700e096e	refs #5554 fix: cambiada extensión de archivos de test, y solucionado test	2023-05-25 11:51:27 +02:00
Vicent Llopis	f471d62d41	refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken	2023-05-25 10:09:38 +02:00
Vicent Llopis	6010bc1253	refs #5554 movido codigo al vnLayout y parar el evento periódico	2023-05-25 09:51:56 +02:00
Alex Moreno	37a3275b27	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-25 08:56:10 +02:00
Vicent Llopis	834a3aa959	refs #5554 fix: eliminada transacción en el back 'renewToken'	2023-05-24 15:16:04 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +00:00
Alex Moreno	0045edb698	refs #5094 fix get email	2023-05-23 07:39:43 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Alex Moreno	3189799b4c	correct type	2023-05-22 14:45:00 +02:00
Alex Moreno	ddab59a10c	refs #5472 refactor(changePassword): convert in async	2023-05-22 09:17:40 +02:00
Alex Moreno	c6c15d7c69	refs #5472 feat: changePassword with passExpired	2023-05-19 14:44:19 +02:00
Alex Moreno	15a1965a53	refs #5094 add scopes	2023-05-18 14:12:46 +02:00
Alexandre Riera	2c254cbc08	refs #4797 added fields	2023-05-15 14:34:32 +02:00
Alexandre Riera	7bcb00c127	refs #5655 removed relation	2023-05-11 08:55:11 +02:00
Alexandre Riera	33ef9bdf61	refs #4797 refactor	2023-05-11 07:18:58 +02:00
Alexandre Riera	9cb756544e	refs #4797 added id to notification in activeNotifications	2023-05-10 14:13:38 +02:00
Alexandre Riera	f9e7963e74	refs #4797 minor fixes	2023-05-10 14:10:00 +02:00
Alexandre Riera	5171e63188	refs #4797 minor fixes	2023-05-09 14:20:20 +02:00
Alexandre Riera	e7d16dc8ba	refs #4797 fix test, add getList	2023-05-09 11:34:32 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Alex Moreno	2da4289695	refs #5472 feat(vn-user): override change-password & set-password	2023-05-04 15:01:29 +02:00
Alex Moreno	a22a8a6bd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-04 11:34:19 +02:00
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Alexandre Riera	878f232fda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking	2023-04-26 14:20:23 +02:00
Alex Moreno	294bf2b8a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:30:34 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Joan Sanchez	c3443ecc7c	Updated e2e	2023-04-18 14:37:20 +02:00
Joan Sanchez	c2af40edb5	changes	2023-04-18 13:15:04 +02:00
Joan Sanchez	d5ea45e36f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 13:14:57 +02:00
Joan Sanchez	cdf092a989	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 11:52:17 +02:00
Joan Sanchez	ef87dcc0f5	require authentication on every login	2023-04-18 07:38:40 +02:00
Joan Sanchez	3ee29553b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 09:00:52 +02:00
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Joan Sanchez	9aaea7e8ed	Changed to new SQL version	2023-04-13 12:01:51 +02:00
Joan Sanchez	b5f2cf3711	Added unit test & translation fixes	2023-04-13 11:54:56 +02:00
Joan Sanchez	4807fcb394	Removed focus	2023-04-11 09:01:59 +02:00
Joan Sanchez	b0f1bae33e	Added unit test	2023-04-11 08:56:50 +02:00
Joan Sanchez	087e91e898	Updated unit tests	2023-04-11 08:15:46 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Joan Sanchez	f4ff869c4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-03 08:55:51 +02:00
Joan Sanchez	02a1bcbfd3	fix(setPassword): proper access type ... Refs #5471	2023-04-03 08:54:15 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Joan Sanchez	cc759373a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-29 15:20:57 +02:00
Vicent Llopis	b0d205c4da	refs #5464 fix: utiliza una sola cookie	2023-03-29 13:36:23 +02:00
Vicent Llopis	dca760d4e4	Merge branch 'dev' into 4858-chat_realTime	2023-03-24 10:02:51 +00:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Vicent Llopis	4141a97356	refs #4858 fix: backTest	2023-03-21 11:37:26 +01:00
Vicent Llopis	32e2d1c0fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-03-21 11:26:41 +01:00
Vicent Llopis	d1f0ae3865	refs #4858 fix: filtro corregido	2023-03-21 11:26:25 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Alexandre Riera	106f96b9a6	refs #4713 fixed front test	2023-03-08 12:10:08 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Alexandre Riera	8679aefb48	refs #4713 procs deprecated, originalQuantity deleted	2023-03-03 07:36:04 +01:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +01:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +01:00
Alex Moreno	f06fc92ae8	refactor(chat): not use transactions	2023-02-08 15:15:26 +01:00
Alex Moreno	44055775cb	fix: not use variables and direct send in send	2023-02-06 10:11:41 +01:00
Alex Moreno	7ad9e2cb5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-02-06 10:05:17 +01:00
Joan Sanchez	d773837740	Removed user model	2023-02-03 14:44:00 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Alex Moreno	4a587049fc	feat(recover-password): use user ... refs #5170	2023-02-01 15:13:38 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Alex Moreno	d77730dd47	fix: mockedDate in e2e	2023-01-25 10:10:25 +01:00
Joan Sanchez	f0b44a2992	Updated back unit tests	2023-01-24 10:35:21 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +01:00
Pau	51b2e5a3bc	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:37:07 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	73c3f05377	refactor(docuware_upload): simplify json	2023-01-16 07:36:06 +01:00
Alex Moreno	9a3fea99ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-13 13:45:10 +01:00
Alex Moreno	def41c011c	feat(docuware_upload): send to trash last file	2023-01-13 13:33:59 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Vicent Llopis	1c532d81e8	fix: permite cerrar varios estados	2023-01-13 08:38:03 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Vicent Llopis	6a8e7873fa	fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º	2023-01-12 15:07:48 +01:00
Joan Sanchez	fe6211e965	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 09:56:59 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Alex Moreno	b8fe919b2a	feat(docuware): upload deliveryNote file	2023-01-10 15:03:23 +01:00
Vicent Llopis	f103931e50	fix: se concatenan pq sino no muestra el id del ticket	2023-01-10 08:14:13 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Vicent Llopis	201987fb99	feat: muestra el error	2023-01-09 11:42:16 +01:00
Vicent Llopis	0c6d335c4a	refactor: machacar stack	2023-01-05 15:01:29 +01:00
Vicent Llopis	a68fe26952	refactor: machar stack	2023-01-05 15:01:20 +01:00
Vicent Llopis	f356188491	feat: salta los tickets bloqueados	2023-01-05 14:54:43 +01:00
Vicent Llopis	1a74e84359	feat: salta los tickets bloqueados	2023-01-05 14:32:14 +01:00
Vicent Llopis	8f81aa2eeb	fix: salta los tickets que estan bloqueados	2023-01-05 14:28:35 +01:00
Pau	4ae903191a	Merge branch 'dev' into 4732-previa-label	2023-01-05 12:48:03 +00:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00
Alex Moreno	d85717ca04	feat: chat in real time	2023-01-04 11:23:06 +01:00
Alex Moreno	8dfc588a7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-01-04 09:48:46 +01:00
Alexandre Riera	6185b2f055	refs #5051 changed fixture	2023-01-03 12:04:38 +01:00
Alexandre Riera	c6083ebe61	refs #5051 fdescribe	2023-01-03 11:53:47 +01:00
Alexandre Riera	b5ef090080	refs #5051 json date	2023-01-03 11:39:50 +01:00
Alexandre Riera	5c2e85d499	refs #5051 consolelog date	2023-01-03 11:00:01 +01:00
Alexandre Riera	04d3d13e82	refs #5051 sub stmt	2023-01-03 10:36:31 +01:00
Alexandre Riera	0ae76746ae	refs #5051 limit stmt	2023-01-03 10:20:44 +01:00
Alexandre Riera	17a7bfbf3b	refs #5051 continue fixing test jenkins	2023-01-03 10:11:52 +01:00
Alexandre Riera	cef0152ef5	refs #5052 fixing jenkins test	2023-01-03 09:44:27 +01:00
Pau	7a5993b4fe	Merge branch 'dev' into 4732-previa-label	2022-12-26 07:12:13 +01:00
Pau	a8ca163321	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 10:49:41 +01:00
Pau	6ded11a4c2	requested changes refs #3681 @3h	2022-12-22 10:35:11 +01:00
Pau	aa716634db	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-12-22 08:30:36 +01:00
Pau	a713cf92cf	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 08:00:33 +01:00
Pau	f6f6d0866d	requested changes refs #4732 @1h	2022-12-22 08:00:18 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00