Commit Graph

2091 Commits

Author SHA1 Message Date
Joan Sanchez 9b085d13e1 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 17:32:52 +02:00
Joan Sanchez 2bb17f4a00 Requested changes
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 17:15:54 +02:00
Joan Sanchez e51341102b Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 14:30:43 +02:00
Joan Sanchez 62d27e45e2 Updated unit tests
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 14:01:34 +02:00
Juan Ferrer b94c97d322 Hotfix: Clone option added to vnItemDescriptor
gitea/salix/pipeline/head This commit looks good Details
2020-05-13 17:51:27 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Juan Ferrer 07cbac7fcd Merge fixes
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 13:23:06 +02:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good Details
2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Juan Ferrer e3b7f81c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2026-itemDescriptorPopoverRelocate 2020-04-09 16:24:19 +02:00
Javi Gallego ab9e640b44 Merge branch 'dev' into #2174-ticket.weekly-añadir-campo-agencyModeFk
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 13:15:17 +02:00
Javi Gallego 397872ee19 mejoradas las descripciones de los test 2020-04-08 13:15:07 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 12:33:36 +02:00
Juan Ferrer 4336a303c0 Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate 2020-04-07 13:03:57 +02:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good Details
2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Juan Ferrer eb586c510e E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-04-01 16:05:43 +02:00
Juan Ferrer 5d1e0ee682 E2E fixes: client billing data, invoiceOut descriptor
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 15:15:16 +02:00
Juan Ferrer d6fda676f6 E2E fixes: Client balance
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:19:01 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-30 17:30:03 +02:00
Javi Gallego 324261dc74 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-30 12:22:09 +02:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:16:47 +01:00
Javi Gallego 0f977a632f test front arreglados por el cambio de hora
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:01:09 +01:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:45:10 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:10:20 +01:00
Joan Sanchez 598ebe96d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:06:35 +01:00
Joan Sanchez ef960f6e0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2206-zone_delivery_days
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:55:10 +01:00
Joan Sanchez 6a66f47cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:19:47 +01:00
Joan Sanchez 64718b5977 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:01:03 +01:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures Details
2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 12:00:07 +01:00
Joan Sanchez 92ffccc9a2 2206 - Refactor popover table
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 09:07:17 +01:00
Juan Ferrer 0bd09492d1 #2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 20:44:59 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:14:13 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Carlos Jimenez Ruiz f06c7d3d47 front test
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz 9b4546edad minor refactor plus path fix after merge
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 14:18:51 +01:00
Joan Sanchez 2b7ff6fec0 Removed state vars
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:08:45 +01:00
Joan Sanchez 90b437c7ad Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:06:13 +01:00
Joan Sanchez c8b6c3f7f3 Fixed conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 13:44:51 +01:00
Joan Sanchez 5b5d7787ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-25 09:25:26 +01:00
Joan Sanchez 61c85cfb9e Updated tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 09:20:26 +01:00
Bernat Exposito 77e8bbc2ce Merge branch '2182_worker_log' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 07:53:23 +00:00
Bernat Exposito Domenech dcdae825d2 fixex pull request
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 08:43:49 +01:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Juan Ferrer 2ec1a5d450 Merge branch 'e2eFixes' of https://gitea.verdnatura.es/verdnatura/salix into e2eFixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:27:55 +01:00
Juan Ferrer 8eb6590285 E2E fixes 2020-03-24 17:27:21 +01:00
Carlos Jimenez Ruiz 12c2b577e6 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:01:11 +01:00
Joan Sanchez 2ed9cbd402 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-24 16:02:58 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Joan Sanchez 9bae89a672 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 16:03:27 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez b998ed200c Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 09:01:14 +01:00
Joan Sanchez 40df1018e4 Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 15:47:38 +01:00
Joan Sanchez 74b78fee84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:13:10 +01:00
Joan Sanchez 3d23583e0b Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 12:55:22 +01:00
Joan Sanchez 934e057a67 Fixed watcher changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 09:41:23 +01:00
Joan Sanchez f25c8bb644 Ticket refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 08:35:59 +01:00
Joan Sanchez 3cb98eaf5f Route refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:24:55 +01:00
Joan Sanchez 526a92fd32 Order refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:18:02 +01:00
Joan Sanchez 88fe9a006e Item refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:43:46 +01:00
Juan Ferrer b4a5a88943 E2E fixed
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:01:25 +01:00
Joan Sanchez 381f2a08ef Client refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 11:17:50 +01:00
Juan Ferrer 176e38c144 Merge fixes 2020-03-16 18:54:22 +01:00
Juan Ferrer 27eaa328e5 Merge 2020-03-16 18:33:49 +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
Bernat Exposito Domenech 285d930b8e showReport fix
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 12:32:26 +01:00
Joan Sanchez a601a615e2 Claim refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-16 11:58:14 +01:00
Bernat Exposito Domenech f6ca9eee01 ticketlog in componentUpdate
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech 6fabada18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-16 08:54:54 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Joan Sanchez 16cdc419ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 17:23:48 +01:00
Joan Sanchez 7987603d7b Updated filter
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 17:22:59 +01:00
Joan Sanchez dbe7dcd0f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 15:08:59 +01:00
Joan Sanchez 36ad778a59 Removed default filter
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 15:02:51 +01:00
Joan Sanchez 2d24417078 Added translation
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:40:00 +01:00
Joan Sanchez 55ff624394 2191 - Added showEmpty filter 2020-03-13 14:39:51 +01:00
Joan Sanchez 920d2c66b0 Added translation
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:25:34 +01:00
Joan Sanchez 227760d712 2191 - Added showEmpty filter
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:09:22 +01:00
Bernat Exposito Domenech f9abaa409a fix calendar-holiday model
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech fdd1c73485 refactor componentUpdate 2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech dae89489ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-13 12:23:06 +01:00
Joan Sanchez d234647112 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 11:03:34 +01:00
Joan Sanchez db89e3f5d4 Updated unit test 2020-03-13 11:03:24 +01:00
Joan Sanchez d9176728b0 Add line on change item 2020-03-13 11:03:16 +01:00
Joan Sanchez 269bd8e69a 2181 - Ticket sale fix item search 2020-03-13 11:03:05 +01:00
Bernat Exposito 1877a2ff1f Merge branch '2181-ticket_sale_fixes' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:23:36 +00:00
Joan Sanchez 2d755c9094 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:47:41 +01:00
Joan Sanchez f8c69306f4 Updated unit test 2020-03-13 08:44:01 +01:00
Joan Sanchez d51356f11b Add line on change item
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:20:30 +01:00
Bernat Exposito Domenech 3ab80e1479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-12 12:04:35 +01:00
Bernat Exposito Domenech 6798f9709c update view holiday
gitea/salix/pipeline/head This commit looks good Details
2020-03-12 10:59:41 +01:00
Joan Sanchez b9a482fc37 2181 - Ticket sale fix item search
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 15:56:02 +01:00
Joan Sanchez aba24292cf Module translations
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:36:56 +01:00
Bernat Exposito Domenech 67151f8427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:23:34 +01:00
Bernat Exposito b3cb2f7c25 Merge branch '2165-travel_index_buttonClon' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:22:14 +00:00
Joan Sanchez 1c8541376b Fixed removed letter
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:54:28 +01:00
Bernat Exposito Domenech d0b0c9d060 pull request changes 2020-03-11 12:03:55 +01:00
Joan Sanchez 8fe6c651e3 Updated translations
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-11 12:02:12 +01:00
Bernat Exposito Domenech e92030ec6e test
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 09:17:14 +01:00
Joan Sanchez 668c337fb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms 2020-03-11 08:46:22 +01:00
Joan Sanchez 581e2fcd1f Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 08:45:54 +01:00
Bernat Exposito Domenech d35634551b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon 2020-03-11 08:45:11 +01:00
Joan Sanchez 2c39d8d390 Changed icon
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 08:05:38 +01:00
Joan Sanchez 7496bc923e Updated fonts & changed icons
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-11 08:02:58 +01:00
Joan Sanchez 3736dcf792 Added ticket sms options
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 15:01:33 +01:00
Joan Sanchez 0cd4e2ad9e Added autocomplete property
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 14:28:50 +01:00
Bernat Exposito Domenech 4a5d97996e travel.index clonar 2020-03-10 14:09:26 +01:00
Joan Sanchez 6d437d0e2e Allow empty agency on ticket creation
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 11:46:58 +01:00
Joan Sanchez d616b8a535 Merge branch '1969_e2e_diferentes_resoluciones' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 07:01:30 +00:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz ebc0889011 Merge branch '2171-show_payment_button' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 15:51:39 +00:00
Carlos Jimenez Ruiz e111b9a2b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones 2020-03-09 15:01:36 +01:00
Joan Sanchez 209251bf8b 2173 - descriptor_quicklink
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 14:11:43 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 11:50:23 +01:00
Carlos Jimenez Ruiz 2a0e437e1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones 2020-03-09 09:19:22 +01:00
Joan Sanchez 64f74b4f33 Merge branch '2111-route_drag_drop' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit has test failures Details
2020-03-08 12:45:44 +00:00
Juan Ferrer c6b2db9a79 Savepoint 2020-03-07 13:52:02 +01:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 13:06:01 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech da6b3bc5c8 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 12:01:42 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:38 +00:00
Joan Sanchez c329a4380c Merge branch '2037_getWorkedHours_db_test' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:06 +00:00
Carlos Jimenez Ruiz 5f0ace8f29 removed unused code
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:21:42 +01:00
Carlos Jimenez Ruiz 0dce5c733b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2082_entry_buy
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 09:57:17 +01:00
Carlos Jimenez Ruiz 11bd861224 section bases 2020-03-06 09:57:05 +01:00
Bernat Exposito Domenech 1951e8bcf9 fix setter client
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 08:50:55 +01:00
Bernat Exposito Domenech 666ccbf370 ticket.basicData address
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 08:38:03 +01:00
Joan Sanchez fddc8e7ed1 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-05 14:49:41 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +01:00
Carlos Jimenez Ruiz 0f3ceea653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 15:13:03 +01:00
Joan Sanchez f168734b8c Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 13:54:17 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-04 12:15:41 +00:00
Joan Sanchez 5da1c41476 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 12:51:29 +01:00
Joan Sanchez 24becf7872 Updated var names
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 11:17:35 +01:00
Joan Sanchez df3fbf291b Changed format
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:32:18 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Bernat Exposito Domenech e40575cc1f fix model entry log
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 08:58:57 +01:00
Bernat Exposito Domenech ced8c6e963 traductions
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 07:49:21 +01:00
Bernat Exposito Domenech 6b44715bf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log
gitea/salix/pipeline/head This commit has test failures Details
2020-03-04 07:41:28 +01:00
Carlos Jimenez Ruiz 0f7ed5bbfa get worked hours unit test 2020-03-03 15:14:28 +01:00
Joan Sanchez 15bedc5f12 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-03 15:03:54 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Bernat Exposito Domenech 686382a0e6 entryLog section 2020-03-02 11:57:09 +01:00
Joan Sanchez 7e694c3e80 2073 - Filter by pending tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech 72b7300bf5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log 2020-03-02 10:41:32 +01:00
Bernat Exposito Domenech 1d98c44c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 09:51:05 +01:00
Bernat Exposito Domenech 42b151c849 fix isEditable spec
gitea/salix/pipeline/head This commit has test failures Details
2020-03-02 09:43:22 +01:00
Joan Sanchez 04917f980f Updated E2E
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech bd46f6a302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:28:43 +01:00
Bernat Exposito Domenech 0d23a3894f entry log 2020-03-02 09:28:08 +01:00
Bernat Exposito Domenech 2accd8fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log 2020-03-02 08:51:00 +01:00
Bernat Exposito Domenech 63cd436d3c fix request changes 2020-03-02 08:30:33 +01:00
Joan Sanchez 5ccc79df8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 08:07:14 +01:00
Joan Sanchez 03e952c83e Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 07:57:33 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures Details
2020-02-28 14:18:55 +01:00
Joan Sanchez a2001636d2 Some changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 09:21:00 +01:00
Joan Sanchez dfacb02cdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2151-edit_thermograph 2020-02-28 09:08:01 +01:00
Joan Sanchez 25a1c0d2de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 08:34:42 +01:00
Joan Sanchez a8eea3d8f6 Changed primary key 2020-02-28 08:19:37 +01:00
Joan Sanchez 5169273ccc Added edit section 2020-02-28 08:19:20 +01:00
Joan Sanchez 220f36d795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 07:34:26 +01:00
Joan Sanchez 442541d0f8 Renamed rgb column 2020-02-28 07:24:36 +01:00
Joan Sanchez 12aa5da355 Changed fields order
gitea/salix/pipeline/head This commit looks good Details
2020-02-28 07:17:19 +01:00
Bernat Exposito 9d513878a1 Merge branch '2150-travel_filter_by_ref' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 12:57:44 +00:00
Joan Sanchez 94ebb7fbd2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:48:09 +01:00
Joan Sanchez 6dcfc34056 Fix - Find duplicated client
gitea/salix/master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:33:40 +01:00
Joan Sanchez ccd28114ca Updated unit tests
gitea/salix/2150-travel_filter_by_ref This commit looks good Details
2020-02-27 12:39:58 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good Details
2020-02-27 12:31:38 +01:00
Joan Sanchez c920f0bc91 Requested changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-27 11:21:11 +01:00
Joan Sanchez 893b634d33 Get phone from address and client 2020-02-27 11:18:59 +01:00
Joan Sanchez 70210e87c9 Advanced filter by ref
gitea/salix/2150-travel_filter_by_ref This commit looks good Details
2020-02-27 09:03:36 +01:00
Joan Sanchez a86c7c9b8a updated unit tests
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-27 08:08:31 +01:00
Joan Sanchez 21ace6ef4e Merge branch '2131_jest_spyOn' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-27 06:56:43 +00:00
Joan Sanchez 21be73b734 2127 - Disable preview on sepa core sample 2020-02-27 07:40:43 +01:00
Carlos Jimenez Ruiz c9f37d5fcd Merge branch '2127-sample_disable_preview' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-27 06:27:12 +00:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 15:02:47 +01:00
Joan Sanchez 1d326a52c8 updated unit tests
gitea/salix/2127-sample_disable_preview This commit looks good Details
2020-02-26 14:45:47 +01:00
Joan Sanchez d66c53dbf2 2127 - Disable preview on sepa core sample
gitea/salix/2127-sample_disable_preview There was a failure building this commit Details
2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz aedd551371 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
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 37ff99d838 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-26 13:19:32 +01:00
Joan Sanchez e15ef3386e Translation changes
gitea/salix/test This commit looks good Details
2020-02-26 13:18:29 +01:00
Joan Sanchez d401fa8d13 Changed variable name
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 13:06:35 +01:00
Joan Sanchez ce84d26fae Some changes
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 12:24:48 +01:00
Joan Sanchez e09325b3fa Changed test description
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:43:41 +01:00
Joan Sanchez 442c3ba87c unit tests
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:05:29 +01:00
Joan Sanchez 4add07898f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2138-zone_event_m3 2020-02-26 11:00:40 +01:00
Bernat Exposito Domenech 9cad13f166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:24:21 +01:00
Joan Sanchez 9849c60651 Added popover
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 07:02:03 +01:00
Bernat Exposito Domenech 85db094f1d componentUpdate 2020-02-25 12:36:33 +01:00
Carlos Jimenez Ruiz 0bf0ed78ee Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 10:49:40 +00:00
Bernat Exposito Domenech bbba294b79 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 11:44:46 +01:00
Bernat Exposito Domenech 2fdd275085 log in ticketUpdate 2020-02-25 11:43:50 +01:00
Bernat Exposito Domenech b37e8da410 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 10:39:21 +01:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech e7cdc58fad translates
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 07:51:16 +01:00
Bernat Exposito 7c1a13cca8 Merge branch '2134-item_request_load_error' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 13:38:17 +00:00
Joan Sanchez ad1e08ec70 2134 - Irem request load error
gitea/salix/2134-item_request_load_error This commit looks good Details
2020-02-24 14:29:48 +01:00
Joan Sanchez 415316d7d0 2081 - Fix ticket search by order id
gitea/salix/2081-fix_ticket_search_by_order This commit looks good Details
2020-02-24 13:28:59 +01:00
Bernat Exposito Domenech 832089de79 entry descriptor, add more options to view entry report 2020-02-24 12:20:53 +01:00
Joan Sanchez d0c2f88a77 2126 - Search by client name
gitea/salix/2126-ticket_weekly_search_by_name This commit looks good Details
2020-02-24 12:08:53 +01:00
Joan Sanchez 3643709a80 Added datalist auto completion
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech 0a4adedcdb client descriptor translates 2020-02-24 09:47:26 +01:00
Joan Sanchez 75d7125426 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 09:41:23 +01:00
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Joan Sanchez 7b57d79f50 Create client geo auto fill
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-21 12:39:41 +01:00
Bernat Exposito Domenech 773963e7ab update entry filter 2020-02-21 10:03:08 +01:00
Bernat Exposito 97716e0ede Merge branch '2130-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-21 08:50:33 +00:00
Joan Sanchez 2dbde24a99 Requested changes
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 09:00:13 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-21 08:50:50 +01:00
Joan Sanchez bf4e0d09c5 Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 08:37:37 +01:00
Javi Gallego a8137c8a6b zoneClosure 3
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-20 15:15:50 +01:00
Joan Sanchez 2f089681df Don't throw error if no salesPerson is assigned 2020-02-20 12:52:05 +01:00
Joan Sanchez 54bc1bc281 Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 10:10:18 +00:00
Bernat Exposito Domenech cec1f7b90f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor There was a failure building this commit Details
2020-02-20 09:48:12 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 09:31:44 +01:00
Joan Sanchez 9e435e9553 Some changes
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 12:34:33 +01:00
Joan Sanchez c9fd48b0cd 2112 - Catalog improvements
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 11:57:39 +01:00
Carlos Jimenez Ruiz 081c742dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request 2020-02-19 11:48:01 +01:00
Joan Sanchez 346d20b066 Merge branch '2124-route_basic_data' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 12:07:29 +00:00
Bernat Exposito Domenech bfb8c5e138 route.basicData validations
gitea/salix/2124-route_basic_data This commit looks good Details
2020-02-18 12:51:29 +01:00
Joan Sanchez ba06a59ac8 Merge branch '2110-client_sample_validation' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 10:53:44 +00:00