292 Commits

Author	SHA1	Message	Date
Alexandre Riera	9c18391c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded	2023-06-16 13:21:11 +02:00
Carlos Satorres	0eca606de0	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-06-16 07:29:30 +00:00
Alex Moreno	a206f64e3c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:27:04 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Juan Ferrer	32a0955c1d	refs #5667 Zone translations fixed	2023-06-08 12:48:14 +02:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Alexandre Riera	6e4d7e8b01	refs #5749 added id	2023-06-06 10:31:08 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	2ef922e80c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-18 08:10:10 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Alex Moreno	7704256079	master to test	2023-05-11 08:00:49 +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
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Alex Moreno	bde81e685f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-19 07:55:46 +02:00
Alex Moreno	db19f153fb	refs #5488 removes 'role =='	2023-04-18 15:03:23 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +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	08254e28bb	refs #5380 mod label max m3	2023-03-09 14:24:00 +01:00
Carlos Satorres	6d7874d3ab	refs #5380 JSON modificado HTML arreglado	2023-03-08 13:12:21 +01:00
Carlos Satorres	3d1f640e08	refs #5380 m3Max add and mod itemMaxSize	2023-03-08 09:19:57 +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
Vicent Llopis	c32a627fe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-02-03 13:23:42 +01:00
Vicent Llopis	f7969c616c	fix: tiene el cuenta zonEvent.type	2023-01-27 08:59:28 +01:00
Joan Sanchez	3456438485	Model fix	2023-01-24 09:20:02 +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
Vicent Llopis	5d19da48e2	refactor: actualizada consulta sql	2023-01-20 08:16:02 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Vicent Llopis	484b8d42e1	fix: corregido sql	2023-01-10 13:31:20 +01:00
Vicent Llopis	ccce6af021	fix: add translations	2022-11-23 07:57:27 +01:00
Joan Sanchez	990a1b3c67	250 nodes	2022-10-10 10:33:08 +02:00
Joan Sanchez	31d1b84bb9	Unfold when there's less than 100 nodes to show	2022-10-10 10:25:59 +02:00
Joan Sanchez	9f9581c722	Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev ... Reviewed-on: #1048 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:12:41 +00:00
Vicent Llopis	a6a5a84add	fix: incorrect name of function	2022-09-13 14:42:15 +02:00
Vicent Llopis	cc6ba8712c	feat: log when a day is excluded	2022-09-13 12:15:28 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Carlos Jimenez Ruiz	f3766edbb7	Merge branch 'dev' into 1781-zoneHoliday	2022-07-22 13:56:19 +00:00
Vicent Llopis	9bd3daf71c	feat: add translate	2022-07-22 13:36:44 +02:00
Vicent Llopis	4076f2908e	refactor: change type of params in endpoints	2022-07-22 13:35:18 +02:00
Carlos Jimenez Ruiz	7437da92a5	Merge branch 'dev' into 4294-zone_getEventsFiltered	2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Vicent Llopis	dd46a974cc	fix: backTest	2022-07-12 11:57:01 +02:00
Alex Moreno	051a849a21	fix(zone): fix getEventsFiltered	2022-07-12 08:10:29 +02:00
Vicent Llopis	1eb6ee69cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-07-12 08:09:02 +02:00
Vicent Llopis	e4b04fadbc	fix: set editMode = 'include' by default	2022-07-12 08:00:17 +02:00
Vicent Llopis	2b5550bc6e	feat: add testFront	2022-07-12 07:57:28 +02:00
Vicent Llopis	4b65b531fd	feat: add backTest	2022-07-08 10:09:03 +02:00
Vicent Llopis	eb586643ca	refactor: change name of endpoint	2022-07-08 09:47:11 +02:00
Vicent Llopis	94872f8493	fix: show geos checked onSearch	2022-07-07 13:37:36 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Vicent Llopis	44e95a00c3	refactor: delete duplicated code	2022-06-17 08:54:40 +02:00
Vicent Llopis	1bd4b02a62	refactor: code	2022-06-17 08:18:23 +02:00
Vicent Llopis	c26b09ead3	refactor: create endpoint	2022-06-13 14:33:22 +02:00
Vicent Llopis	dd65f4a468	refator: rewrite conditionals	2022-06-13 13:17:56 +02:00
Vicent Llopis	8d4c735744	refactor: delete duplicated code	2022-06-13 12:26:40 +02:00
Vicent Llopis	06f181e913	feat: add frontTest for calendar	2022-06-10 08:29:10 +02:00
Vicent Llopis	f6ab9d8a31	feat: updated backTest	2022-06-10 08:15:54 +02:00
Vicent Llopis	a9badfc1ba	feat: add backTest	2022-06-09 14:59:17 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Vicent Llopis	5e01ea58e3	fix: backTest	2022-06-02 13:41:51 +02:00
Vicent Llopis	3da9a775bd	feat: add frontTest	2022-06-02 13:36:57 +02:00
Vicent Llopis	8dcd430178	fix: events frontTest	2022-06-02 13:11:26 +02:00
Vicent Llopis	f7be419bbe	refator: updated fixtures	2022-06-02 11:52:53 +02:00
Vicent Llopis	b5fa360960	feat: edit excluded selecetion with specificLocations	2022-06-02 10:40:02 +02:00
Vicent Llopis	1235affe2d	fix: show correct css	2022-06-01 13:47:46 +02:00
Vicent Llopis	c7471fdac4	refator: variable names changed	2022-05-31 12:21:04 +02:00
Vicent Llopis	da1e188983	fix: put requests	2022-05-27 13:54:35 +02:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Vicent Llopis	6359c9e5bf	feat: add fixtures	2022-05-26 15:08:23 +02:00
Vicent Llopis	456f167513	feat: fix editExclusion mode	2022-05-26 11:09:03 +02:00
Vicent Llopis	bbdaa7de39	feat: add editExclusion mode	2022-05-26 08:33:45 +02:00
Vicent Llopis	a907354cc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-05-25 09:03:52 +02:00
Vicent Llopis	69e12e0dd8	refactor: 'bonus' can be a negative value	2022-05-20 09:21:33 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Vicent Llopis	ab13c16948	feat: add dialog	2022-05-16 07:17:29 +02:00
Vicent Llopis	06e9a22f40	added search	2022-05-12 15:02:07 +02:00
Vicent Llopis	b96d9ea4c2	feat(zone.events): add dialog	2022-05-12 13:53:13 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	05b0a5342f	feat(zone.events): new dialog when choose 'exclude'	2022-05-11 14:53:52 +02:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Alex Moreno	165af44d85	fix(zone_delivery-days): await zone.Events.show()	2022-04-26 09:49:18 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Joan Sanchez	381b37b1ff	Merge branch 'dev' into 3043-client_search-panel	2022-04-08 06:31:16 +00:00
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