Commit Graph

568 Commits

Author SHA1 Message Date
Joan Sanchez 43a48994e0 Image path fix 2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Bernat Exposito Domenech ebcbd5068f add restrictions in ticket descriptor 2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz b44942c7d7 open delivery notes on ticket index 2020-06-16 12:36:34 +02:00
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Bernat Exposito 70d5c641ad Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:16:55 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services 2020-06-12 14:28:29 +02:00
Joan Sanchez 36ec930878 Updated test 2020-06-12 12:01:53 +02:00
Joan Sanchez 3d388ad226 Updated unit test 2020-06-12 11:39:33 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume 2020-06-12 11:26:32 +02:00
Joan Sanchez 48034b234f 2325 - Search address 2020-06-12 10:53:33 +02:00
Joan Sanchez 4b262dc3cc Disabled contextmenu option 2020-06-09 13:18:29 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes 2020-06-09 12:16:40 +02:00
Joan Sanchez 7d53f274de Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:08:56 +00: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 05b5c452a9 Removed attribute 2020-06-08 13:17:18 +02:00
Joan Sanchez ab1e8fb622 2176 First working version 2020-06-08 12:14:27 +02:00
Bernat Exposito Domenech e24c5b00e9 fix descriptors 2020-06-08 11:05:17 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu 2020-06-08 08:19:18 +02:00
Javi Gallego 762c39eb23 :: para watcher 2020-06-08 07:52:30 +02:00
Bernat Exposito Domenech 56c9b08101 fix show.descriptor 2020-06-08 07:52:23 +02:00
Javi Gallego b40be5cca9 2035 2020-06-05 10:01:21 +02:00
Joan Sanchez 21bb4a778c Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 08:11:44 +00:00
Joan Sanchez 1926f90f4b Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 07:47:50 +00:00
Joan Sanchez 3f1109aee3 Test changes 2020-05-29 12:10:04 +02:00
Joan Sanchez 90ae1562dd Added filters 2020-05-29 11:10:58 +02:00
Bernat Exposito Domenech f28f88a100 ticket summary invoiceOut popover 2020-05-27 12:29:01 +02:00
Carlos Jimenez Ruiz 98157fc45a Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-27 07:10:27 +00:00
Bernat Exposito Domenech 60d50afb2e fix traduction 2020-05-26 12:20:06 +02:00
Javi Gallego 5188f80da5 Merge branch 'dev' into 2234-getVisibleAvailable 2020-05-26 10:47:48 +02:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split 2020-05-26 10:43:53 +02:00
Javi Gallego d8871c0bce cr 2020-05-26 10:37:52 +02:00
Carlos Jimenez Ruiz d02655d4d3 Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-25 12:58:08 +00:00
Joan Sanchez 73a6148a77 2273 - Fixed transfer sales 2020-05-25 14:45:26 +02:00
Joan Sanchez d60f8721f1 1490 - Don't update with empty value 2020-05-25 13:49:24 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to 2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor 2020-05-22 15:20:55 +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 c998097ba1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 12:30:00 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Bernat Exposito Domenech d289c17530 searchbar translates 2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Bernat Exposito Domenech 369d8d59d8 fix error 2020-05-18 14:58:06 +02:00
Bernat Exposito Domenech c205c173f8 invoiceOut descriptor popover in ticket summary 2020-05-18 10:28:33 +02:00
Javi Gallego 3815edfbea falta CR 2020-05-15 12:17:34 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll 2020-05-06 18:42:50 +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 b536c8291a #1882 Popover::show() boilerplate code removed 2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed 2020-04-25 11:50:04 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones 2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo 2020-04-20 13:49:33 +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 2020-04-08 12:33:36 +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 dfb9d32c2a Client & ticket E2E fixes 2020-03-30 17:30:03 +02:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary 2020-03-27 11:45:10 +01:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary 2020-03-27 11:10:20 +01:00
Joan Sanchez 6a66f47cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout 2020-03-27 10:19:47 +01:00
Carlos Jimenez Ruiz f06c7d3d47 front test 2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz 9b4546edad minor refactor plus path fix after merge 2020-03-25 14:18:51 +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 3d23583e0b Fixes 2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor 2020-03-18 12:55:22 +01:00
Joan Sanchez 934e057a67 Fixed watcher changes 2020-03-18 09:41:23 +01:00
Joan Sanchez f25c8bb644 Ticket refactor 2020-03-18 08:35:59 +01:00
Juan Ferrer b4a5a88943 E2E fixed 2020-03-17 14:01:25 +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 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Bernat Exposito Domenech fdd1c73485 refactor componentUpdate 2020-03-13 12:26:15 +01:00
Joan Sanchez 2d755c9094 Updated unit test 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 2020-03-13 08:20:30 +01:00
Joan Sanchez b9a482fc37 2181 - Ticket sale fix item search 2020-03-11 15:56:02 +01:00
Joan Sanchez 1c8541376b Fixed removed letter 2020-03-11 12:54:28 +01:00
Joan Sanchez 8fe6c651e3 Updated translations 2020-03-11 12:02:12 +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 2020-03-11 08:45:54 +01:00
Joan Sanchez 3736dcf792 Added ticket sms options 2020-03-10 15:01:33 +01:00
Joan Sanchez 0cd4e2ad9e Added autocomplete property 2020-03-10 14:28:50 +01:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search 2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz ebc0889011 Merge branch '2171-show_payment_button' of verdnatura/salix into dev 2020-03-09 15:51:39 +00:00
Joan Sanchez 209251bf8b 2173 - descriptor_quicklink 2020-03-09 14:11:43 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets 2020-03-09 11:50:23 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev 2020-03-06 10:34:38 +00:00
Bernat Exposito Domenech 1951e8bcf9 fix setter client 2020-03-06 08:50:55 +01:00
Bernat Exposito Domenech 666ccbf370 ticket.basicData address 2020-03-06 08:38:03 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print 2020-03-05 13:56:45 +01:00
Joan Sanchez 7e694c3e80 2073 - Filter by pending tickets 2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech 1d98c44c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:51:05 +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
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section 2020-02-28 14:18:55 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable 2020-02-27 12:31:38 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis 2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn 2020-02-26 15:02:47 +01:00