Commit Graph

245 Commits

Author SHA1 Message Date
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
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