253 Commits

Author	SHA1	Message	Date
Joan Sanchez	f5a6521f20	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-06 14:34:23 +02:00
Alex Moreno	37b8bcbb9e	remove relation	2022-04-06 12:38:49 +02:00
Alex Moreno	dd9a38d1bf	feat(client_search-panel): filter by province	2022-04-06 12:29:00 +02:00
Alex Moreno	ade5e9256d	feat(client_search-panel): add zone and province	2022-04-05 15:21:20 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Alex Moreno	05be19de2d	fix(zone_delivery-days): agencyModeName and defaulter pagination	2022-03-22 10:03: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	1ecc76067a	code to correct insert in model	2022-03-15 14:50:09 +01:00
Vicent Llopis	ec41123772	button for insert rows	2022-03-15 09:36:48 +01:00
Alex Moreno	f774b1f784	typo	2022-03-15 09:13:35 +01:00
Alex Moreno	0359e05def	description	2022-03-07 11:22:16 +01:00
Alex Moreno	56bdb85af5	translations	2022-03-07 10:28:55 +01:00
Alex Moreno	a136d8b03d	accept array in params	2022-03-07 10:10:45 +01:00
Alex Moreno	b421038bbe	typo	2022-03-07 08:11:21 +01:00
Alex Moreno	dedbccae19	description	2022-03-07 08:07:34 +01:00
Alex Moreno	2c853a7885	test(zone): getZoneClosing() front and back	2022-03-07 08:02:59 +01:00
Alex Moreno	a658969afa	feat(zone_delivery-days): get real closing hour	2022-03-04 12:24:01 +01:00
Alex Moreno	a434d9268b	fix(zone_upcoming-deliveries): fix backgroundcolor	2022-03-04 11:48:18 +01:00
Carlos Jimenez Ruiz	9ba13f90d3	#3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route	2022-02-23 16:12:29 +01:00
Carlos Jimenez Ruiz	8676a1df90	updated method description	2021-11-18 11:28:11 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
Alex Moreno	a35d36b84f	fix(zone): calendar event	2021-11-17 13:15:59 +01:00
Alex Moreno	0aa0358b50	refactor(events): name of variable	2021-11-09 10:21:28 +01:00
Alex Moreno	9ab51fc21f	feat(eventsFiltered): add backTest & refactor zone	2021-11-09 08:39:20 +01:00
Alex Moreno	6e2f7d9e0d	feat(events): get range date of calendar	2021-11-08 11:30:00 +01:00
Alex Moreno	3324f4acd2	fix(zone): back remoteMethod	2021-11-04 07:56:12 +01:00
Alex Moreno	b2dd9e6076	feat(zone): filter calendar	2021-11-02 07:55:35 +01:00
Carlos Jimenez Ruiz	683f01ddd8	refactor(zone): removed deprecated column m3Max	2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz	14a72b32bd	refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max	2021-10-21 11:37:09 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz	8e05301792	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-07 09:58:32 +02:00
Joan Sanchez	bb4a32293d	Changed zone_getShippedWarehouse() to zone_getShipped()	2021-10-04 14:45:39 +02:00
Carlos Jimenez Ruiz	a61a7f7d49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 09:37:27 +02:00
Joan Sanchez	b3a34489b0	fix(calendar): Event colors were not showing properly ... Refs: 3166	2021-10-04 09:30:55 +02:00
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +02:00
Carlos Jimenez Ruiz	ec9c061051	fix(getUpcomingDeliveries) fixtures were broken due to db structure changes	2021-09-01 12:37:46 +02:00
Joan Sanchez	0de6af5633	fix(searchbar): wasn't applying a search by postcode on page refresh ... Refs: #3072	2021-08-31 11:41:42 +02:00
Joan Sanchez	4dc107bc58	Removed console.log()	2021-08-30 14:51:02 +02:00
Joan Sanchez	3247f35b90	3075 - Show closure hour from an event	2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz	dd3473b93d	small refactors correcting constants and adding transactions	2021-07-12 12:50:15 +02:00
Carlos Jimenez Ruiz	d20b717c1b	tested controller modifications accordingly	2021-07-01 16:19:59 +02:00
Carlos Jimenez Ruiz	8cf2b241cd	route delivery days now gets params from url	2021-07-01 12:08:48 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	0421fd8828	back end unit tests for zone endpoints	2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz	82cb9ed749	zone module endpoints now have transactions	2021-06-18 15:05:03 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz	83d6581349	indentation correction	2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz	fb418edc7b	backend modifications for route tickets	2021-03-15 11:32:17 +01:00
Carlos Jimenez Ruiz	17c784e06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:52:42 +01:00
Joan Sanchez	f66a5ecfdc	2748 - Added module keybinds	2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz	42e7fa7047	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-21 10:25:39 +01:00
Joan Sanchez	3a2db713e0	Removed unused $httpBackend	2021-01-20 07:38:09 +01:00
Javi Gallego	043a74b548	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-19 10:20:45 +01:00
Jorge Padawan	1a4c631c70	Fix for good practique code	2021-01-12 11:00:42 +01:00
Jorge Padawan	509de4fa0a	Fix for good practique code	2021-01-12 10:11:37 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Javi Gallego	0d5540b639	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-29 17:00:45 +01:00
Joan Sanchez	2886e02328	Enabled loggable for locations	2020-12-29 08:50:12 +01:00
Joan Sanchez	f4ff31a294	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log	2020-12-29 08:09:49 +01:00
Javi Gallego	87adbbfa3c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-18 08:21:36 +01:00
Carlos Jimenez Ruiz	57a6df762a	zone module refactors	2020-12-16 11:22:13 +01:00
Javi Gallego	2bb9125eee	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-16 08:34:54 +01:00
Javi Gallego	963db11686	funcionalidad	2020-12-16 08:33:08 +01:00
Bernat Exposito	6eeecc553b	zoneLog calendar	2020-12-02 12:49:50 +01:00
Bernat Exposito	6605e5ae4c	zoneLog	2020-12-02 12:05:47 +01:00
Carlos Jimenez Ruiz	fbb2fc3bdd	Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev ... Reviewed-on: #464 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-24 09:33:44 +00:00
Bernat Exposito	6a7568eb29	Merge branch 'dev' into 2493-route_ticket_drag_and_drop	2020-11-24 07:36:52 +00: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
Bernat Exposito	f64a566447	route.ticket drag and drop validation	2020-11-20 12:12:06 +01:00
Carlos Jimenez Ruiz	7f899cc4e9	index navigation through anchors	2020-11-12 16:03:23 +01:00
Joan Sanchez	3d86e59890	#2540 - Added entry descriptor popover to referenced places	2020-10-27 12:02:49 +01:00
Joan Sanchez	c61c25fb91	2525 - Ticket basic data validate zone	2020-10-20 10:19:12 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Joan Sanchez	a8589d6945	Autocomplete warehouse on agency selection	2020-09-23 14:13:44 +02:00
Joan Sanchez	c49614b8cf	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 09:23:09 +00:00
Joan Sanchez	5ec5979a3e	Updated tests	2020-09-23 11:21:25 +02:00
Joan Sanchez	ae3d00bad1	Added new method	2020-09-22 07:38:20 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz	ed905341b3	removed autoload for where/searchF	2020-09-21 11:17:40 +02:00
Joan Sanchez	fa344f4ff6	2449 - Autocompletion	2020-09-19 13:02:00 +02:00
Carlos Jimenez Ruiz	ea077e8d4a	added auto-load to some combos	2020-09-17 20:12:52 +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	f0818acf32	2387 - Fixed error when deleting a zone	2020-08-19 13:04:12 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Carlos Jimenez Ruiz	e2481366a2	removed on response if just accept	2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz	c62801e741	modules component to vnComponent working	2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz	4ca004f833	angular.mock.injet shorten to inject	2020-07-23 16:46:16 +02:00
Bernat Exposito Domenech	122dacffb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech	c42c6c19d6	changes in order index	2020-07-02 07:46:55 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Bernat Exposito Domenech	e7a866553c	fix test	2020-06-30 09:15:08 +02:00
Bernat Exposito Domenech	d77297941f	fix date in a front test	2020-06-30 09:08:08 +02:00
Carlos Jimenez Ruiz	31b1599f2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2335-zone_descriptor	2020-06-23 13:49:15 +02:00
Bernat Exposito Domenech	e96df49622	refactor delete zone	2020-06-23 07:38:36 +02:00
Joan Sanchez	3cb783740f	Added unit tests	2020-06-22 10:01:55 +02:00
Joan Sanchez	fa73911452	Added tests	2020-06-18 12:43:33 +02:00
Joan Sanchez	63ed592312	902 - Added unit tests	2020-06-17 11:51:57 +02:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	cda6e37620	Removed console.log	2020-06-08 13:07:34 +02:00
Javi Gallego	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech	81757fb9b5	fix test 2302	2020-06-04 14:24:12 +02:00
Bernat Exposito Domenech	3bfee6d0fd	fix zone descriptor	2020-06-02 10:17:46 +02:00
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Carlos Jimenez Ruiz	55c4ccdb29	Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech	4133021e5c	fix translate on plural	2020-05-20 08:52:20 +02:00
Juan Ferrer	ad1c677280	Test focus removed & fixes	2020-05-19 12:50:43 +02:00
Juan Ferrer	c998097ba1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 12:30:00 +02:00
Bernat Exposito Domenech	d289c17530	searchbar translates	2020-05-19 10:27:22 +02:00
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Juan Ferrer	07cbac7fcd	Merge fixes	2020-05-08 19:56:39 +02:00
Juan Ferrer	7a1bb7e68d	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00
Juan Ferrer	b14d2f9455	Small fixes in vnOrderCatalog and vnZoneEvents	2020-05-08 13:23:06 +02:00
Juan Ferrer	6c14743017	Last fixes & tests passed	2020-05-06 14:38:09 +02:00
Juan Ferrer	6a8e1bf6b5	#1882 Boileplate code removed, declarative quicklinks	2020-04-30 12:48:52 +02:00
Juan Ferrer	5826099601	#1882 First step, front tests passed	2020-04-25 11:50:04 +02:00
Javi Gallego	dbb2257430	test de zone_getLanded y zone_getFromGeo	2020-04-20 13:49:33 +02:00
Juan Ferrer	559cc5eb8c	SCSS em to px: Second step	2020-04-02 14:52:02 +02:00
Javi Gallego	729daf8b34	Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia	2020-03-27 12:16:47 +01:00
Javi Gallego	0a8272a730	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita	2020-03-26 17:52:41 +01:00
Javi Gallego	d53cedd5d4	preparado para PR	2020-03-26 17:41:40 +01:00
Joan Sanchez	92ffccc9a2	2206 - Refactor popover table	2020-03-26 09:07:17 +01:00
Javi Gallego	a30a4bf961	quitado el campo provincia	2020-03-24 17:32:30 +01:00
Joan Sanchez	9b933e7d88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-20 12:00:53 +01:00
Joan Sanchez	b998ed200c	Fixes	2020-03-20 09:01:14 +01:00
Joan Sanchez	3d23583e0b	Fixes	2020-03-18 14:08:04 +01:00
Joan Sanchez	a9c622377e	Refactor	2020-03-18 12:55:22 +01:00
Juan Ferrer	176e38c144	Merge fixes	2020-03-16 18:54:22 +01:00
Juan Ferrer	56a21edeca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult	2020-03-16 18:33:39 +01:00
Juan Ferrer	8629bc25cd	Back & Front tests passed	2020-03-16 18:08:44 +01:00
Juan Ferrer	9d1bc8eb54	First functional version (No tests)	2020-03-13 20:33:12 +01:00
Joan Sanchez	2c39d8d390	Changed icon	2020-03-11 08:05:38 +01:00
Joan Sanchez	7496bc923e	Updated fonts & changed icons	2020-03-11 08:02:58 +01:00
Juan Ferrer	c6b2db9a79	Savepoint	2020-03-07 13:52:02 +01:00
Carlos Jimenez Ruiz	aedd551371	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn	2020-02-26 13:24:41 +01:00
Carlos Jimenez Ruiz	794b20fc83	#2131 jest.spyOn	2020-02-26 13:22:52 +01:00
Joan Sanchez	d401fa8d13	Changed variable name	2020-02-26 13:06:35 +01:00
Joan Sanchez	ce84d26fae	Some changes	2020-02-26 12:24:48 +01:00
Joan Sanchez	e09325b3fa	Changed test description	2020-02-26 11:43:41 +01:00