Commit Graph

799 Commits

Author SHA1 Message Date
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz 663b5fb9aa descriptor can now have 4 quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 13:28:49 +02:00
Joan Sanchez 23664dd3c5 Refresh total on sale changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz c801d8a969 Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 78ee6f1aff Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 12:53:56 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Joan Sanchez defe7e7a17 Added front unit tests 2020-07-01 11:57:01 +02:00
Carlos Jimenez Ruiz 1dfd0c26ef Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz b451b400bf e2e toolkit 2020-06-30 11:15:20 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Joan Sanchez a0f625d019 Changed methods order, minor fixes 2020-06-30 10:01:30 +02:00
Joan Sanchez c9d94ca814 Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 09:37:09 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Joan Sanchez 789769ad7d Destroy edit prop fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 09:38:42 +02:00
Javi Gallego 87de2bd2fb Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 07:37:27 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-25 17:12:53 +02:00
Joan Sanchez a8377950f5 Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz 9d88b9359a removed unused column
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz 984e8fd794 added total price of services
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 14:53:41 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Bernat Exposito Domenech ee2a4771ff delete coment code
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech 6a021b5767 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor 2020-06-23 10:00:50 +02:00
Joan Sanchez 356c1a7b45 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-06-22 11:54:50 +02:00
Joan Sanchez 4ad3334de6 Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:49:44 +02:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz 3c2a392cb8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Joan Sanchez 765d3c7553 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:57 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz edea60dd94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Bernat Exposito Domenech ebcbd5068f add restrictions in ticket descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz fb37e156d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 09:22:09 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:16:55 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 36ec930878 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 12:01:53 +02:00
Joan Sanchez 3d388ad226 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:39:33 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:26:32 +02:00
Joan Sanchez 48034b234f 2325 - Search address
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 10:53:33 +02:00
Carlos Jimenez Ruiz 538ae75b89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway 2020-06-10 16:24:17 +02:00
Joan Sanchez 5edfc59d97 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 13:57:32 +02:00