577 Commits

Author	SHA1	Message	Date
Alexandre Riera	aecde484f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections	2023-04-20 07:52:05 +02:00
Alexandre Riera	84c2512847	refs #5293 open lilium in the same page	2023-04-20 07:51:25 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Alexandre Riera	0dcbc9fc8b	refs #5293 redirected claim.photos to lilium	2023-04-17 10:46:26 +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	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Alexandre Riera	71e202d586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro	2023-04-13 08:45:05 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Alexandre Riera	ce28339973	refs #5522 deleted trigger afterInsert, added hook beforeInsert	2023-04-11 09:48:31 +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
Carlos Satorres	1302665d98	refs #5436 showSucces	2023-03-27 10:00:00 +02:00
Joan Sanchez	00a0f88dc4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-24 10:03:23 +01:00
Joan Sanchez	e67a40714c	Claim log hotfix	2023-03-24 09:59:55 +01:00
Vicent Llopis	a45308c6a5	refs #5342 fix: testFront	2023-03-24 07:58:27 +01:00
Joan Sanchez	ea50da8a19	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 14:33:10 +01:00
Vicent Llopis	805df64bb2	fallo cantidad reclamados	2023-03-23 10:54:04 +01:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Joan Sanchez	fcd422eb49	added relation	2023-03-22 14:55:54 +01:00
Joan Sanchez	0d5272de30	Merge branch 'dev' into 5182-print_publish	2023-03-15 15:05:43 +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
Pablo Natek	63ccb26bf3	refs #5151	2023-03-10 08:17:10 +01:00
Pablo Natek	901a8ab112	refs #5151 botones	2023-03-09 14:34:06 +01:00
Joan Sanchez	c93d3f8846	Updated front unit test	2023-03-08 07:47:25 +01:00
Javi Gallego	bb691ccf1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 07:45:25 +01:00
Javi Gallego	98c8cd67e5	minor bug	2023-03-08 07:45:22 +01:00
Joan Sanchez	445a0b0e1f	Claim fixes	2023-03-07 10:20:10 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Joan Sanchez	9f4aed7d83	Updated unit test	2023-03-06 13:44:03 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +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
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +01:00
Joan Sanchez	1bc715cde5	Updated claim state field	2023-02-24 14:32:56 +01:00
Alex Moreno	cc5a867bf4	feat(claim_model): add claimDms relations	2023-02-20 15:16:19 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Javi Gallego	4a562c3110	unificado todo a claimState isEditable	2023-02-07 15:40:03 +01:00
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Joan Sanchez	9bf4cd5cff	Merge branch 'dev' into 4480-vnUser	2023-01-27 08:20:32 +00:00
Alexandre Riera	25f0c0d9e3	refs #5141 province added	2023-01-26 14:16:30 +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
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alexandre Riera	7720c32bc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-13 09:58:03 +01:00
Vicent Llopis	1aa21c16b5	refactor: borrado join a worker	2023-01-05 11:42:21 +01:00
Vicent Llopis	ba7e5d6a91	refator: se usa loopback cuando se puede	2022-12-28 11:56:34 +01:00
Vicent Llopis	eed6d05e23	delete console.log	2022-12-28 08:51:39 +01:00
Vicent Llopis	eb4cb318ed	refactor: evitar join innecesarios en el filter general	2022-12-28 08:43:02 +01:00
Alexandre Riera	d827795441	refs #4930 agency changed for zone	2022-12-23 12:38:05 +01:00
Vicent Llopis	9bcef08397	feat: buscar por responsibleFk sin afectar a la consulta principal	2022-12-12 12:08:30 +01:00
Vicent Llopis	4c0effc48a	refacor: description actualizada	2022-12-01 07:25:18 +01:00
Vicent Llopis	14eba75a8e	feat: backTest	2022-11-23 14:08:43 +01:00
Vicent Llopis	1c6a5164d4	feat: buscar por itemFk y claimResponsibleFk	2022-11-23 14:04:43 +01:00
Alex Moreno	acf76aeeef	Merge branch 'dev' into 4159-tableQ_filter	2022-11-02 12:25:38 +00:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +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
Joan Sanchez	463d3e6e12	Fixes	2022-10-31 12:39:26 +01:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02: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
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Alex Moreno	57b2ae770d	fix(e2e)	2022-10-17 11:44:29 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Alex Moreno	2b060a1437	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-17 07:32:32 +02:00
Joan Sanchez	3dee50a796	Updated method accessType	2022-10-09 20:14:14 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Joan Sanchez	68f3544477	Claim pickup order	2022-09-22 09:17:14 +02:00
Joan Sanchez	5cff983d4c	Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev ... Reviewed-on: #1040 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:33:04 +00:00
Alex Moreno	6fcb1e54b4	refactor(claim_action): set translations	2022-09-06 09:35:01 +02:00
Javi Gallego	9fe32788fc	regularizado	2022-08-24 14:38:05 +02:00
Alex Moreno	3fd34e0861	feat(claim_pickup_order): modify email	2022-07-25 14:49:39 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Joan Sanchez	58a1eea642	Merge branch 'dev' into 4111-claim.summary	2022-06-07 12:27:12 +00:00
Joan Sanchez	fab4705618	Rollback	2022-06-01 14:01:19 +02:00
Joan Sanchez	4ac26895ba	fix(regularizeClaim): refound with negative quantity ... Refs: #4148	2022-06-01 09:36:47 +02:00
Vicent Llopis	4baf1afb83	fix: show videos in claim.summary	2022-05-25 07:51:47 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	bb4dbb60b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-05-10 07:11:26 +02:00
Vicent Llopis	11a7f48bd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-29 08:32:02 +02:00
Vicent Llopis	c10e4c04b6	refactor: delete file	2022-04-29 08:23:35 +02:00
Vicent Llopis	4a6873a0fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-21 09:34:37 +02:00
Vicent Llopis	0ec51202e0	pull request changed	2022-04-21 09:34:13 +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	c1edb8206e	refactor	2022-04-12 12:46:26 +02:00
Vicent Llopis	9a171d5202	refactor	2022-04-12 12:45:07 +02:00
Vicent Llopis	ad3b3c44d6	refactor: replace let for const	2022-04-12 12:44:46 +02:00
Vicent Llopis	1e11191e79	fix: frontTest	2022-04-12 12:32:48 +02:00
Vicent Llopis	5921891161	refactor: updated css	2022-04-12 12:20:36 +02:00
Vicent Llopis	4872407723	fix test	2022-04-12 11:57:56 +02:00
Vicent Llopis	e1de41f801	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-12 10:09:36 +02:00
Vicent Llopis	313e911940	fix(claim_action): smart-table	2022-04-12 10:09:00 +02:00
Vicent Llopis	6e999302bf	refactor: replace let for const	2022-04-11 10:09:54 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Vicent Llopis	ddd6d61d9e	fix(claim_photos): consider other image types in html	2022-04-11 07:58:23 +02:00
Vicent Llopis	5431dbdc3e	refactor: resize vide0s	2022-04-08 14:33:00 +02:00
Vicent Llopis	c00be015ab	feat(claim_photo): add fixtures and backTest	2022-04-08 13:53:25 +02:00
Vicent Llopis	90b079a0ac	refactor: description back routes	2022-04-08 12:25:06 +02:00
Vicent Llopis	ea4266ef8c	feat: add deleteOldFiles	2022-04-08 12:20:39 +02:00
Vicent Llopis	5567e07773	feat(claim_photo): can upload videos	2022-04-08 09:34:46 +02:00
Alex Moreno	238a9fd5da	feat(client.defaulter&claim): change socialName to name	2022-04-08 08:52:21 +02:00
Vicent Llopis	5ddce43dd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-08 07:57:02 +02:00
Vicent Llopis	df26a40e63	feat(claim_action): add smart-table and 'change destinantion' to all rows	2022-04-08 07:37:17 +02:00
Vicent Llopis	1915850a09	feat(claim_photo): added videos	2022-04-07 14:12:56 +02:00
Joan Sanchez	fa1fb37795	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-07 12:24:41 +02:00
Alex Moreno	c312eff12e	fix(claim_search-panel): filter	2022-04-07 12:09:11 +02: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
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Carlos Jimenez Ruiz	63fc58b6ba	Merge branch 'dev' into 3649-claim_log	2022-03-03 12:00:02 +00:00
Alex Moreno	619baf2896	refactor claim_main controller	2022-03-02 11:07:35 +01:00
Alex Moreno	a05223681e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-03-02 10:43:06 +01:00
Carlos Jimenez Ruiz	2b0f54c3aa	Merge branch 'dev' into 3646-claim-summary	2022-03-02 09:17:19 +00:00
Alex Moreno	44318903e7	feat(claim): add log section	2022-03-01 15:15:58 +01:00
Alex Moreno	60e908d82a	feat(claim_summary): parentReload(), and test	2022-02-28 12:40:44 +01:00
Alex Moreno	5434dd3baf	feat(claim_index): implemented smart-table and change state in summary	2022-02-28 07:57:46 +01:00
Alex Moreno	fc3a46eb26	refactor(claim): removed importTicketSales and fix tests	2022-02-24 13:52:26 +01:00
Alex Moreno	52cf79516a	refactor(claim_summary): move responsability and improve fixtures	2022-02-23 12:23:47 +01:00
Joan Sanchez	9d298c2a5e	Updated unit tests	2022-02-23 12:07:05 +01:00
Vicent Llopis	34730f48ed	fix: add role salesBoss to filter	2022-02-16 12:51:45 +01:00
Carlos Jimenez Ruiz	cb21d4db01	removed a typo	2022-02-07 17:59:40 +01:00
Alex Moreno	1250382209	missing zero	2022-02-03 09:52:17 +01:00
Alex Moreno	001aed3cb5	fix(claim): filter created	2022-02-02 14:32:16 +01:00
Carlos Jimenez Ruiz	d86aa5535c	refactor(createFromSales): now claimManager can claim any time	2022-01-04 16:16:39 +01:00
Joan Sanchez	46d7a6e765	Added unit tests	2021-11-19 09:24:49 +01:00
Joan Sanchez	8c5f0d3019	feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago ... Refs: 3278	2021-11-19 09:24:31 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
Alex Moreno	bb0745532b	fix(claim): salesPersonFk where add officeBoss	2021-11-02 11:24:52 +01:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz	9578895f95	backend unit tests adapted	2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz	8d682f4e03	chat notifications for many sales modifications	2021-07-29 17:20:57 +02:00
Carlos Jimenez Ruiz	dd3473b93d	small refactors correcting constants and adding transactions	2021-07-12 12:50:15 +02:00
Carlos Jimenez Ruiz	3b2b4e3819	client module changes for transactions	2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz	10c7aa70d6	claim module transactions for filter, summary and isEditable	2021-07-05 12:00:49 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	9a1b6e4653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse	2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz	1bfe537186	claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig	2021-05-21 15:31:05 +02:00
Joan Sanchez	a5c3ba3926	2921 - Changed the ticket url of rocket notifications	2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz	5843140cf5	minor refactor for code usage instead of description	2021-05-17 12:27:26 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Joan Sanchez	d4c6695629	2631 - Notify status change to incomplete	2021-04-07 07:45:00 +02:00