997 Commits

Author	SHA1	Message	Date
Pablo Natek	6c9215bb51	feat(mrw): refs #6403 big commit	2024-02-07 16:52:43 +01:00
Sergio De la torre	844bab3cc8	#refs 5890 feat:add assignCollection	2024-02-06 16:17:53 +01:00
Javier Segarra	9448b40533	refs #6386 feat: add extension when return file	2024-02-02 14:53:48 +01:00
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Jorge Penadés	2a6abffef9	fix: refs #6276 fix errors & refactor	2024-01-30 16:07:33 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Sergio De la torre	0f3ffcfa61	fix: refs #6184 Upload sign	2024-01-30 08:11:33 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Guillermo Bonet	49a08a96da	Merge branch 'dev' into 6184-saveCmr	2024-01-26 11:56:43 +00:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Jorge Penadés	63fb3db8a1	fix: refs #6276 test item_card & general fixes	2024-01-25 12:14:14 +01:00
Jorge Penadés	01340408c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 08:14:02 +01:00
Jorge Penadés	02e38eb711	fix: refs #6276 fix tests	2024-01-25 08:13:47 +01:00
Jorge Penadés	e527780622	fix: refs #6276 drop suitcase sectorCollection_getSales	2024-01-24 11:24:49 +01:00
Jorge Penadés	e849f0b6e2	fix: refs #6276 sectorCollection_getSales	2024-01-24 11:20:08 +01:00
Pablo Natek	065dd0581d	feat(spec): refs #6403 add test	2024-01-24 09:06:05 +01:00
Javier Segarra	40d5e8662b	refs #6694 perf: remove unused imports	2024-01-24 08:38:34 +01:00
Javier Segarra	5b2b6a15ad	refs #6694 perf: improve filter	2024-01-24 08:36:08 +01:00
Jorge Penadés	ae89d59bde	feat: refs #6276 WIP test sectorCollection_getSales	2024-01-23 15:58:09 +01:00
Javier Segarra	5d53d69754	refs #6694 perf: update postCode/filter method	2024-01-23 12:52:35 +01:00
Jorge Penadés	08dd37e9e4	feat: refs #6276 test sectorCollection_getSales	2024-01-23 12:13:23 +01:00
Jorge Penadés	65e5c6dac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-22 12:45:25 +01:00
Guillermo Bonet	6701f70a33	Merge branch 'dev' into 6184-saveCmr	2024-01-22 09:07:31 +00:00
Jorge Penadés	b7ce6cac9c	fix: refs #6276 machineWorker_update & tests	2024-01-19 12:38:58 +01:00
Jorge Penadés	5c0425b942	feat: refs #6276 test machineWorker_update	2024-01-19 09:52:49 +01:00
Jorge Penadés	19edd7868e	feat: refs #6276 test getVersion	2024-01-18 14:18:21 +01:00
Jorge Penadés	d41d57143f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-18 13:53:26 +01:00
Jorge Penadés	c8bfb35cf6	feat: refs #6276 test itemShelvingMake_multi	2024-01-18 13:28:22 +01:00
Jorge Penadés	6f35c62cd5	feat: refs #6276 test collection_addItem	2024-01-18 11:51:21 +01:00
Pablo Natek	854447f7c1	feat: refs #6403 mrw cancelShipment	2024-01-18 07:36:21 +01:00
Javier Segarra	145e72022a	refs #6694 perf: handle minor errors	2024-01-17 14:58:55 +01:00
Javier Segarra	38c93e8c76	refs #6694 test: add test	2024-01-17 14:49:35 +01:00
Javier Segarra	d2db0661e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6694_postcode_location_filter	2024-01-17 14:16:50 +01:00
Javier Segarra	92a3e841ed	refs #6694 perf: change let to const	2024-01-17 14:16:09 +01:00
Javier Segarra	71f387f626	refs #6694 feat: move filter remote method to own file	2024-01-17 14:15:21 +01:00
Jorge Penadés	6be2f07c22	fix: refs #6276 assignCollection	2024-01-17 13:57:57 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Jorge Penadés	6a78123fca	fix: refs #6276 machineWorke_update	2024-01-17 09:01:48 +01:00
Jorge Penadés	53a10dda58	feat: refs #6276 machineWorke_update	2024-01-17 08:17:55 +01:00
Jorge Penadés	2fbea6f9dd	feat: refs #6276 wip machineWorke_update	2024-01-16 15:43:34 +01:00
Pablo Natek	7e3660aece	feat(cancelShipment): refs #6403 mrwintegration	2024-01-16 15:04:06 +01:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Pablo Natek	73c0ca5382	feat(mrwXml): refs #6403 render and transmEnvio integrated	2024-01-15 15:00:36 +01:00
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Carlos Satorres	3cdf8b2011	Merge branch 'dev' into 6489-authSupport	2024-01-15 12:42:05 +00:00
Jorge Penadés	7a9f2bd79c	refactor: refs #6276 align rows	2024-01-09 11:23:54 +01:00
Jorge Penadés	9afc3840c7	fix: refs #6276 machineWorker_add	2024-01-09 11:22:11 +01:00
Jorge Penadés	7a64b57a2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 15:07:33 +01:00
Jorge Penadés	e354de4ff5	fix: updateInTime refs #6276	2024-01-04 10:09:41 +01:00
Jorge Penadés	7d0c11e937	Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 08:51:46 +01:00
Jorge Penadés	6d0e1cc47c	refactor: fix conficts refs #6276	2024-01-04 08:51:18 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Sergio De la torre	0b5ffcc81c	refs #6276:modify back silex→salix	2024-01-03 12:50:53 +01:00
Javier Segarra	4510f0a037	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-02 09:26:18 +00:00
Jorge Penadés	767894b128	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:41:47 +01:00
Jorge Penadés	cd701ccd9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-02 08:42:06 +01:00
Alex Moreno	0101dcda3a	refs #5925 fix: add options	2024-01-02 08:12:45 +01:00
Alex Moreno	318761185b	refs #6434 fix: remove console.log	2024-01-02 08:07:16 +01:00
Jorge Penadés	2e1715a968	refactor renewToken & replace ACL: refs #6274	2023-12-22 15:19:45 +01:00
Javier Segarra	4d2cf87f49	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:37:53 +00:00
Javier Segarra	8d08adca21	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-22 09:36:02 +00:00
Javier Segarra	ec1befcfb0	Merge branch 'dev' into 6434-signIn_issue	2023-12-22 09:25:57 +00:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Javier Segarra	dc661f298b	refs #6434 test: update tests	2023-12-21 09:10:18 +00:00
Alex Moreno	d30dcd7d70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet	2023-12-21 09:22:49 +01:00
Javier Segarra	cb35c36328	refs #6434 test: update tests	2023-12-20 10:59:36 +00:00
Juan Ferrer	10bfafdd3c	Merge branch 'dev' into 6264-renewToken	2023-12-20 09:05:53 +00:00
Pablo Natek	3e2cac5544	Merge branch 'dev' into 6005-backupLabeler	2023-12-19 14:05:45 +01:00
Pablo Natek	f68529960e	fix(notification): refs #6005 notification changes	2023-12-19 10:51:18 +01:00
Jorge Penadés	779cbd2c0a	refs #6276 collection_getTickets	2023-12-18 11:43:15 +01:00
Jorge Penadés	5c22f51043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-18 10:29:14 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javier Segarra	d2461d67c9	refs #6264 test: perf renew-token.spec.js	2023-12-14 12:25:40 +01:00
Javier Segarra	8d29850917	refs #6264 perf: remove UserError exception	2023-12-14 12:21:07 +01:00
Javier Segarra	61a323078b	refs #6264 fix: remove DEFAULT_COURTESY_TIME	2023-12-14 12:04:05 +01:00
Jorge Penadés	36a9b0eee4	refs #6276 collectionAddItem	2023-12-13 16:00:07 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Javier Segarra	bdf5dd6e3c	refs #2051 feat: restore dms methods	2023-12-13 13:48:22 +01:00
Javier Segarra	d364a50ec4	refs #6264 feat: remove validateToken endpoint	2023-12-13 13:39:43 +01:00
Carlos Satorres	4e8bec5684	refs #5925 user error	2023-12-13 12:03:04 +01:00
Carlos Satorres	2393625a48	refs #5925 Tablet	2023-12-13 08:22:58 +01:00
Javier Segarra	8441877f36	refs #6264 perf: remove field's query	2023-12-12 19:43:32 +01:00
Carlos Satorres	412cac7e94	refs #5925 models table docuware	2023-12-12 14:42:36 +01:00
Javier Segarra	6334431d2b	refs #2051 feat: uploadFile approach	2023-12-12 14:00:35 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Javier Segarra	5656ed7a2b	refs #6264 perf: use functions extracted previously	2023-12-04 14:46:05 +01:00
Javier Segarra	b9671c0b67	refs #6264 perf: remove files related to token	2023-12-04 14:44:50 +01:00
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Javier Segarra	d4cd23853f	refs #6264 perf: try to remove jasmine.clock()	2023-11-30 07:32:16 +01:00
Jorge Penadés	375cb1acc0	refs #6276 console removed	2023-11-29 16:28:14 +01:00
Jorge Penadés	27d223cbab	refs #6276 machineWorker_add	2023-11-29 16:25:15 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Pablo Natek	d8cf059027	fix: refs #6005 add fixtures for a spec	2023-11-29 09:10:45 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Pablo Natek	b713a32fe1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2023-11-28 08:12:06 +01:00
Pablo Natek	c929119797	fix(spec): refs #6005 backupLabeler spec	2023-11-28 08:11:42 +01:00
Alex Moreno	7911cc12df	Merge branch 'dev' into 6489-authSupport	2023-11-27 12:57:46 +00:00
Carlos Satorres	a7361a89bd	refs #6489 remove auth	2023-11-27 12:58:07 +01:00
Javier Segarra	9da5fb9a14	refs #6264 other: rename camel-case variable	2023-11-27 10:24:25 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	81be3b18f7	refs #6264 test: validate-token and renew-token	2023-11-27 09:48:15 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Javi Gallego	4a62588464	Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev ... Reviewed-on: #1857 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-23 14:01:53 +00:00
Jorge Penadés	1f9030c36d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 13:35:46 +01:00
Jorge Penadés	eeef279483	refs #5811 replace decription	2023-11-23 13:34:29 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	cf3b5efee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-23 12:36:19 +01:00
Alex Moreno	4735307f5d	refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls	2023-11-23 11:49:00 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Jorge Penadés	fac6aab26c	refs #6276 machineWorker_update	2023-11-22 14:25:19 +01:00
Sergio De la torre	707173d618	refs #5890 fix: getTickets	2023-11-22 07:04:33 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Javier Segarra	abf772ae87	refs #6434 feat: check if signIn inserts signInLog	2023-11-16 10:43:00 +01:00
Javier Segarra	386b556216	refs #6434 feat: new test user signIn with email	2023-11-16 10:29:57 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Javier Segarra	58edcb9055	refs #6434 feat: save token in db for each login	2023-11-15 13:50:06 +01:00
Javier Segarra	11352798f0	refs #6434 feat: save token in db for each login	2023-11-15 09:41:12 +01:00
Javier Segarra	bcccd1894c	refs #6264 test: init test	2023-11-10 13:13:17 +01:00
Alex Moreno	204323ac69	test(notification_getList): fix	2023-11-08 14:57:07 +01:00
Alex Moreno	0de5bc5109	refs #4797 refactor: getList & notificationSubscription method	2023-11-08 14:56:47 +01:00
Javier Segarra	784f5bb7f9	refs #6264 perf: replace now with vnNew	2023-11-07 23:23:02 +01:00
Javier Segarra	67faf076d2	refs '#6264' feat: memoization accessTokenConfig	2023-11-04 16:51:25 +01:00
Javier Segarra	8c6eab23e5	handle expired token and return new token	2023-11-04 14:39:26 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Alex Moreno	2edfacb91c	refs #5979 fix(sendCheckingPresence)!	2023-10-23 07:33:52 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Pablo Natek	5c69d9c7f0	fix: add await in async functions refs #5979	2023-10-20 12:53:54 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Carlos Andrés	17e6cffa3d	refs #6254 collection getTickets	2023-09-29 13:47:29 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +02:00
Carlos Andrés	9a7cb3ef7b	refs #6254 collection_getTickets	2023-09-29 12:30:05 +02:00
Alex Moreno	d4e5815d41	refs #6254 feat(collection_getTickets): refactor code and add test	2023-09-28 08:30:50 +02:00
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Alex Moreno	6cf1095b10	refs #6067 feat: vnUser use verify() and more security when update user and mailForward	2023-09-25 08:33:16 +02:00
Alex Moreno	2dbd711104	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-09-19 05:24:05 +00:00
Guillermo Bonet	690df509d3	refs #5684 Fixed no error	2023-09-18 07:10:12 +02:00
Vicent Llopis	f3e43686a3	refs #5811 feat: al borrar expedicion borrar tmb de viaexpress	2023-08-24 14:59:28 +02:00
Alex Moreno	508a4b2d34	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-23 12:04:27 +02:00
Alex Moreno	a26652045c	refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel	2023-08-22 10:17:46 +02:00
Alex Moreno	14d4de0e1f	refs #5941 fix(sendToSupport): add as a collaborator	2023-08-21 14:48:05 +02:00
Alex Moreno	36623c1cae	refs #5941 fix(sendToSupport): fix email from	2023-08-21 13:48:51 +02:00
Alex Moreno	02dddaeffe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support	2023-08-11 11:55:02 +02:00
Alex Moreno	4c199f66b2	refs #5762 refactor: recoverPassword use app param	2023-08-04 14:33:38 +02:00
Alex Moreno	75d3d12ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform	2023-08-04 14:31:56 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Vicent Llopis	fbc1e28031	Merge branch 'dev' into 4734-addViaexpress	2023-07-28 07:54:26 +00:00
Alex Moreno	47b2aa0ee7	Merge branch 'dev' into 5941-send-to-support	2023-07-26 05:10:30 +00:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Alex Moreno	985e258529	refs #5769 fix(web-access): email rule	2023-07-21 12:33:14 +02:00
Vicent Llopis	834e4b3723	refs #4734 refactor: variables definindas	2023-07-18 07:56:44 +02:00
Alex Moreno	d2120cdc3d	refs #5762 feat: multiplatform recover-password and change-password	2023-07-17 14:24:50 +02:00
Alex Moreno	9097a1dc28	refs #5941 feat: sendToSuppor component and fix CSS and JSON format	2023-07-14 14:30:08 +02:00
Alex Moreno	7881385f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support	2023-07-14 07:53:40 +02:00
Vicent Llopis	c91db1b429	a	2023-07-13 10:19:57 +02:00
Vicent Llopis	112d7a84e3	solved test	2023-07-13 09:32:08 +02:00
Vicent Llopis	17b2b02246	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-07-13 09:16:32 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	7aaaf5492c	refs #5887 refacotr: move code to hook	2023-07-12 15:07:06 +02:00
Vicent Llopis	551d06ee83	refs #5887 para eliminar sigue las mismas reglas que para añadir	2023-07-12 13:55:57 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Vicent Llopis	808a9976ab	refs #5887 fix: back etst	2023-07-11 13:53:25 +02:00
Vicent Llopis	a215797390	tranalstion	2023-07-11 13:39:22 +02:00
Vicent Llopis	d4217ff8d3	refs #5887 correct translations	2023-07-11 13:38:48 +02:00
Vicent Llopis	5a5a1ed20b	refs #5887 feat: addback test	2023-07-11 13:22:54 +02:00
Vicent Llopis	d4a4e04f25	refs #5887 feat: cambiados permisos para añadir/quitar alias de correo	2023-07-11 12:33:34 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Alex Moreno	467c4e997c	refs #5941 feat: when error can send email to support	2023-06-30 14:24:50 +02:00
Vicent Llopis	3bd890c343	refs #5554 fix: solo llama al back cuando se tiene q renovar	2023-06-29 12:11:16 +02:00
Alex Moreno	840a88bdc1	refs #5833 remove console.logs	2023-06-29 07:14:45 +02:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Alex Moreno	89c25c07b6	refs #5475 fix e2e and back test	2023-06-28 09:59:55 +02:00
Alex Moreno	162faf0d01	Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:18:10 +02:00
Alex Moreno	4b8b7a9d82	refs #5475 fix accessScope	2023-06-27 15:30:54 +02:00
Alex Moreno	1cf5ff9a62	refs #5554 new Date()	2023-06-27 08:24:31 +02:00
Alex Moreno	46ffd8d95a	refs #5554 console.log	2023-06-27 08:07:54 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Alex Moreno	6ab431f8ef	refs #5475 tests	2023-06-21 14:17:25 +02:00
Vicent Llopis	d9afdccd9c	fix: acl renewToken	2023-06-21 14:12:42 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Vicent Llopis	4444b45b08	refs #4734 feat: se utiliza la libreria ejs y xmldom	2023-06-20 14:07:36 +02:00
Vicent Llopis	13e95bcd35	add vue commented code	2023-06-20 11:25:47 +02:00
Vicent Llopis	c3af2e3c92	refs #4734 refactor: actualizada descripcion	2023-06-20 07:19:32 +02:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Vicent Llopis	cfe340eeff	refs #4734 feat: xml en otro archivo	2023-06-19 14:27:24 +02:00
Vicent Llopis	303be74382	refs #4734 refactor: use loopback instead of	2023-06-19 11:55:07 +02:00
Alex Moreno	ee1b901dea	refs #5475 feat(account_changePassword): accessScope	2023-06-16 14:31:14 +02:00
Vicent Llopis	219ad75172	a	2023-06-16 14:30:33 +02:00
Vicent Llopis	ab68cb7165	refs #4734 fix: manejo errores	2023-06-16 14:27:29 +02:00
Vicent Llopis	90ce0d1c27	refs #4734 refactor: consulta con loopback	2023-06-16 14:24:47 +02:00
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