801 Commits

Author	SHA1	Message	Date
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +02:00
Alex Moreno	48be8b9fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-02 11:27:14 +02:00
Alex Moreno	c3038a4d61	fix(imageCollection):	2023-04-28 11:54:11 +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
Vicent Llopis	87ffd2668e	refs #5468 scope para VnUser	2023-04-27 15:06:05 +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
Vicent Llopis	37a7d02006	quitado scope	2023-04-26 12:18:32 +02:00
Vicent Llopis	74d543884e	refs #5468 añadido scope al modelo VnUser	2023-04-26 11:55:01 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +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
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +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	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	ef87dcc0f5	require authentication on every login	2023-04-18 07:38:40 +02:00
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +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
Juan Ferrer	ca3a1be20f	refs #4480 md5 removed from VnUser	2023-04-15 01:52:22 +02:00
Juan Ferrer	2af48b3049	refs #4480 Fix: VnUser before save hook removed -> setting password attribute	2023-04-15 01:51:38 +02:00
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +02:00
Joan Sanchez	6e7b452792	Max quality	2023-04-14 13:19:17 +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
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +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	b49307463e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-04 13:53:25 +02:00
Joan Sanchez	e8f0a49f0c	fix(resetPassword): increased token TTL for password recovery ... Refs #5474	2023-04-04 13:51:44 +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
Vicent Llopis	c46d325e23	fix: add transaction	2023-03-09 07:58:39 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Alexandre Riera	06dd72f30c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-08 12:13:48 +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	5ccfe6bf90	refs #5160 callback added	2023-02-28 11:19:41 +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	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Joan Sanchez	71167ffa1f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-21 14:02:25 +01:00
Joan Sanchez	49c2ec7f9a	fix(image): Enabled failOn option ... Refs: #5266	2023-02-21 14:01:12 +01:00
Joan Sanchez	0393d9cb6a	Removed commented block code	2023-02-20 14:17:18 +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
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +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
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +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	e16c16c194	Merge branch 'dev' into 5170-recover-password_use_user	2023-02-03 08:12:54 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Joan Sanchez	eded1ebf20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 11:42:48 +01:00
Joan Sanchez	644d98ec1c	syncUser() and setPassword() changes	2023-02-02 07:32:38 +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
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
Joan Sanchez	12cf79ab39	Updated e2e	2023-01-25 14:14:55 +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
Pau	a2150b8b08	change test to adhere to the fixtures	2023-01-24 10:15:32 +01:00
Pau	c13bffcc57	refs #4797 @1h requested changes	2023-01-24 10:11:16 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Pau	dfa3022949	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-24 08:20:45 +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	a425d54bf6	add back test	2023-01-18 12:16:47 +01:00
Pau	10c70f5388	Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications	2023-01-18 09:06:18 +01:00
Pau	a5f83021db	requested changes	2023-01-18 09:06:17 +01:00
Pau	ec4c628adf	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-18 06:43:45 +00:00
Pau	cc806cc08f	requested changes	2023-01-18 07:41:10 +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
Pau	3b69d76525	fix error preventing subscriptions	2023-01-09 08:43:11 +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	24b8b172b9	use notification id	2023-01-05 14:13:42 +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
Pau	1653439c44	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-03 12:33:21 +00: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	a55d007655	requested changes	2023-01-03 08:12:46 +01:00
Pau	0a602892e6	changed let to const and removed duplicate code	2022-12-27 14:59:23 +01:00
Pau	ee0cd2174f	requested changes refs #4797 @2h	2022-12-27 14:32:19 +01:00
Pau	c9468990b7	Merge branch 'dev' into 4797-lilium-worker-notifications	2022-12-27 10:08:39 +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
Vicent Llopis	2becc0200c	Merge branch 'master' into 4943-master_closeTickets	2022-12-21 10:53:37 +00:00
Pau	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +00:00
Vicent Llopis	cb9ad5d012	refactor: show ticketId error	2022-12-20 08:45:14 +01:00
Alex Moreno	fb3f3c64c9	refs #4858	2022-12-19 09:59:03 +01:00
Pau	f652e86c78	Merge branch 'dev' into 4732-previa-label	2022-12-19 07:47:08 +01:00
Alexandre Riera	6130547420	Merge branch 'dev' into 4503-opcion-rocket	2022-12-16 12:42:42 +00:00
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Pau	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Vicent Llopis	e7173fe156	fix: backTest	2022-12-01 11:59:30 +01:00