Commit Graph

11739 Commits

Author SHA1 Message Date
Joan Sanchez 8414f94cf6 Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #926
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:49:39 +00:00
Joan Sanchez a11bcd3669 Merge branch 'dev' into 3832-client_balance_create
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:48:46 +00:00
Joan Sanchez 639930c649 Merge pull request '3043-feat(client_search-panel): filter by province' (#929) from 3043-client_search-panel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #929
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:48:22 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:31:16 +00:00
Joan Sanchez 688e1dae97 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 15:15:45 +02:00
Joan Sanchez c33eb12c86 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 15:15:33 +02:00
Alex Moreno 574729b7c5 test(client_unpaid): add front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 15:05:10 +02:00
Joan Sanchez 763d4f2677 Rollback
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 13:20:09 +02:00
Joan Sanchez 7186e84687 Send response
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 13:09:50 +02:00
Joan Sanchez 479e345ef0 Param name rollback
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 13:08:53 +02:00
Joan Sanchez fa1fb37795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-04-07 12:24:41 +02:00
Joan Sanchez 0d6446e696 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 12:24:24 +02:00
Joan Sanchez fb6eafb6fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 12:21:23 +02:00
Joan Sanchez 523c05997b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2022-04-07 12:19:55 +02:00
Joan Sanchez cf881e3db9 Merge pull request '3857-fix(claim_search-panel): filter' (#932) from 3857-claim_search-panel into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #932
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-07 10:13:56 +00:00
Alex Moreno c312eff12e fix(claim_search-panel): filter
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 12:09:11 +02:00
Joan Sanchez fa58280e4e Rocket fix
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 11:54:08 +02:00
Alex Moreno b8a954caec feat(client): section unpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz e98374b8dd Merge pull request '3848-item.compression' (#928) from 3848-item.compression into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #928
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-07 09:01:07 +00:00
Carlos Jimenez Ruiz d83e77fada Merge branch 'dev' into 3848-item.compression
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:56:58 +00:00
Carlos Jimenez Ruiz f69041b350 Merge pull request '3467-travelThermograph' (#917) from 3467-travelThermograph into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #917
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-07 08:53:03 +00:00
Carlos Jimenez Ruiz a72b1cd591 Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:36:39 +00:00
Joan Sanchez 67c53d7611 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 10:31:18 +02:00
Joan Sanchez 0a4b7bd000 Added new version folder 2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz 6216d6fa9b Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:29:26 +00:00
Carlos Jimenez Ruiz 4a59ef2bd5 Merge pull request '3686-client_create' (#910) from 3686-client_create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #910
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-04-07 08:28:50 +00:00
Carlos Jimenez Ruiz 47ef80b1c3 Merge branch 'dev' into 3686-client_create
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:25:06 +00:00
Joan Sanchez 86ffedf28d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 09:12:40 +02:00
Joan Sanchez 287aa0c3c6 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:53:03 +02:00
Joan Sanchez 0e75555bcd Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:51:07 +02:00
Vicent Llopis 4350ea0af5 refactor: changed default date to tomorrow
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:32:31 +02:00
Alex Moreno e44de0246d extract ids to variable
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:58:17 +02:00
Alex Moreno bcbe264f0a refactor(client_updateAddress): refactor ctx variable
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:55:59 +02:00
Alex Moreno afc03fc60e feat(client_address): add LogifloraIsAllowed
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:48:22 +02:00
Joan Sanchez f5a6521f20 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:34:23 +02:00
Joan Sanchez 3ed116d614 Always return a value instead of a promise
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:06:53 +02:00
Joan Sanchez cd098235bb fix(sms): send response when de recipient is the same as the emisor
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 13:44:11 +02:00
Alex Moreno 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:43:12 +02:00
Alex Moreno 37b8bcbb9e remove relation
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:38:49 +02:00
Alex Moreno dd9a38d1bf feat(client_search-panel): filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:29:00 +02:00
Vicent Llopis eba3ac40a5 refactor: delete item.compression
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 11:48:12 +02:00
Alex Moreno ade5e9256d feat(client_search-panel): add zone and province
gitea/salix/pipeline/head This commit looks good Details
2022-04-05 15:21:20 +02:00
Joan Sanchez 4be3f9c00f Open client summary
gitea/salix/pipeline/head This commit looks good Details
2022-04-05 09:58:15 +02:00
Joan Sanchez 7a8dbdfb16 Updated SQL files 2022-04-05 09:56:39 +02:00
Vicent Llopis a8f4192b4c feat: update salix fonts
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 14:15:55 +02:00
Vicent Llopis c5efc17fe9 refactr: update test
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:56:36 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:26:53 +02:00
Vicent Llopis fdf285dd5f fix(worker_timeControl): corrected db procedure
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 10:31:28 +02:00
Vicent Llopis 86b24ecd1d feat(client): add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-01 12:13:24 +02:00
Vicent Llopis d4136cde0b fix: excluded backTest 2022-04-01 11:22:38 +02:00