521 Commits

Author	SHA1	Message	Date
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
Carlos Jimenez Ruiz	e025368af1	updaloadFile transaction commit conditional	2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz	8797444553	importTicketSales refactor + tests	2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz	c1f457c263	allowContentTypes and removeFile refactors	2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz	740cc79bc0	uploadFile refactor	2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz	de2a17e840	removeFile and filter refactors	2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz	8d8bdacd86	updateClaimAction refactor + tests	2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz	3054cbcadb	updateClaim refactor + tests	2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz	c4cbc064c9	regularice claim refactor + test	2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz	ee79f23185	createFromSales refactor + tests	2021-03-29 15:14:23 +02:00
Joan Sanchez	6da84e46c1	Added throw error	2021-03-22 10:20:04 +01:00
Joan Sanchez	6210e60896	2669 - Changes to the translate values function	2021-03-19 19:20:19 +01:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
Jorge Padawan	aaf77677d1	Aligned title with column	2021-02-16 15:50:48 +01:00
Jorge Padawan	ac4a19841d	Added shrink for date	2021-02-16 15:40:20 +01:00
Joan Sanchez	20116ac620	2741 - Claim detail deletion visual fix	2021-02-02 09:08:11 +01:00
Jorge Padawan	509de4fa0a	Fix for good practique code	2021-01-12 10:11:37 +01:00
Jorge Padawan	f45aa7937d	Added conditionals with rols to display or not the icons with link	2021-01-12 07:39:12 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Joan Sanchez	a521ad4262	Fixed claim basicData back error	2020-12-31 14:18:06 +01:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00
Carlos Jimenez Ruiz	116730a3b2	claim module refactors	2020-12-15 17:24:13 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Joan Sanchez	80bae4de0a	2607 - Changed preview icon	2020-11-24 08:22:54 +01:00
Joan Sanchez	c654e14cfe	2611 - Summary go to entity	2020-11-23 13:41:51 +01:00
Joan Sanchez	ac5f30924a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-18 08:20:46 +01:00
Joan Sanchez	0fc01b2316	1419 - Claim update discount hotfix	2020-11-18 08:16:37 +01:00
Carlos Jimenez Ruiz	e22e74a725	expanded date columns + order index translations	2020-11-10 16:47:39 +01:00
Bernat Exposito Domenech	a5e6f99b1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:06:50 +01:00
Joan Sanchez	343358c231	Updated translations	2020-10-27 14:42:43 +01:00
Joan Sanchez	3675f7ed34	2511 - Changed salesAssitant role to claimManager	2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech	58168e78ab	test, translate and supplier searpanel, summary	2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech	0f6e1eae24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-21 08:22:51 +02:00
Bernat Exposito Domenech	256206ace4	supplier summary dscriptor and card	2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz	c04b7a0657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 10:31:06 +02:00
Joan Sanchez	7538b1c941	Merge branch 'dev' into 1447-updateClaim_refactor	2020-10-13 06:56:23 +00:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Carlos Jimenez Ruiz	641eb93282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech	fcebbb68b6	delete comments	2020-10-06 14:46:58 +02:00
Joan Sanchez	a29d92718a	Updated description	2020-10-06 14:37:03 +02:00
Joan Sanchez	254c391138	Removed test exclusion	2020-10-06 14:32:24 +02:00
Bernat Exposito Domenech	3d39467613	refactor updateclaim	2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech	134d1c4385	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1447-updateClaim_refactor	2020-10-06 13:06:43 +02:00
Bernat Exposito Domenech	e6b4d21ddb	refactor updateClaim	2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz	0dbdb5103e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz	ea077e8d4a	added auto-load to some combos	2020-09-17 20:12:52 +02:00
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz	5b69ce983c	salesPersonUser replaces salesPerson relation	2020-09-15 19:43:07 +02:00
Juan Ferrer	4b5d2cd0dd	2177 account module ... LDAP test RC1 SQL version changed Tests fixes Back & front tests fixed All tests passed Front and back tests plus some fixes	2020-09-11 14:36:16 +02:00
Joan Sanchez	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Carlos Jimenez Ruiz	0e4fc7e2bd	removed unused code.	2020-08-14 18:43:57 +02:00