Bernat Exposito Domenech
|
60d50afb2e
|
fix traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 12:20:06 +02:00 |
 Javi Gallego
|
5188f80da5
|
Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:47:48 +02:00 |
|
Bernat Exposito Domenech
|
e7fc70a4b4
|
add column in ticket split
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:43:53 +02:00 |
|
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:08:09 +02:00 |
 Carlos Jimenez Ruiz
|
d02655d4d3
|
Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-25 12:58:08 +00:00 |
|
Joan Sanchez
|
73a6148a77
|
2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 14:45:26 +02:00 |
|
Joan Sanchez
|
d60f8721f1
|
1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-25 07:25:21 +02:00 |
|
Joan Sanchez
|
e9e7ae08f2
|
Locale refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-22 15:20:55 +02:00 |
|
Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
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
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
|
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
gitea/salix/pipeline/head This commit looks good
Details
|
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 |
|
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
|
Bernat Exposito Domenech
|
2681060878
|
update mehod ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:59:58 +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
gitea/salix/pipeline/head This commit has test failures
Details
|
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
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 |
|
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
|
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
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
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
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
|
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
|
d4ca58edad
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 09:10:30 +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
|
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 |
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
|
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
|
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 |
|
Juan Ferrer
|
b4a5a88943
|
E2E fixed
gitea/salix/pipeline/head This commit looks good
Details
|
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 |
|
Bernat Exposito Domenech
|
f6ca9eee01
|
ticketlog in componentUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-16 09:13:44 +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 |
|
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
|
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 |
|
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
|
1c8541376b
|
Fixed removed letter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-11 12:54:28 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
63cd436d3c
|
fix request changes
|
2020-03-02 08:30:33 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Bernat Exposito Domenech
|
85db094f1d
|
componentUpdate
|
2020-02-25 12:36:33 +01:00 |
|
Bernat Exposito Domenech
|
2fdd275085
|
log in ticketUpdate
|
2020-02-25 11:43:50 +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 |
|
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 |