514 Commits

Author	SHA1	Message	Date
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	03ea2b4f11	refs #4700 translations	2022-11-14 08:55:27 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Vicent Llopis	918ea3030d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-10 14:41:12 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Vicent Llopis	1bc8cf52d5	add translate	2022-11-08 08:20:36 +01:00
Vicent Llopis	d34a4ae992	add translate	2022-11-08 08:19:25 +01:00
Vicent Llopis	51b047eacc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 07:40:31 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Alex Moreno	6a9134d8f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-02 13:48:36 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Alex Moreno	8985a678d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-18 09:49:06 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Pau	d91814473e	Merge branch 'dev' into 4124-webp-images	2022-10-17 06:45:49 +00:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +02:00
Alex Moreno	acc88c8239	use ejs template	2022-10-11 14:56:33 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Pau	452745b04a	Added webp to the list of allowed images	2022-10-10 09:01:52 +02:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Joan Sanchez	284524e3fa	Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev ... Reviewed-on: #1054 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:49:44 +00:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Alex Moreno	4f7218ab76	translation	2022-09-14 13:01:40 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Alex Moreno	cac4e74793	refactor	2022-05-31 09:06:15 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Vicent Llopis	579ff3aa4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-21 07:13:34 +02:00
Vicent Llopis	5db20ee3e2	refactor: deleteOldFiles in claim	2022-04-20 14:46:37 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Joan Sanchez	47a2f76aa4	3837 - Import data from external service	2022-04-11 11:58:40 +02:00
Vicent Llopis	5567e07773	feat(claim_photo): can upload videos	2022-04-08 09:34:46 +02:00
Vicent Llopis	1915850a09	feat(claim_photo): added videos	2022-04-07 14:12:56 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Vicent Llopis	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00
Vicent Llopis	fae267f539	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	aa5ff474ec	solved test e2e	2022-03-11 12:21:39 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Carlos Jimenez Ruiz	5a9523642d	Merge branch 'dev' into 3258-import_buys	2022-02-01 12:07:41 +00:00
Joan Sanchez	87ae05c997	Added translation	2022-02-01 12:51:38 +01:00
Joan Sanchez	67985077e7	fix(loggable): removed private properties from logs	2022-02-01 11:24:04 +01:00