Commit Graph

11670 Commits

Author SHA1 Message Date
Vicent Llopis fae267f539 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data 2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz 19df1fe382 Merge pull request '3625-feat(ticket_log): add routeFk log' (#897) from 3625-ticket_log_routeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #897
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-03-21 12:04:43 +00:00
Carlos Jimenez Ruiz 728a5de311 Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 11:56:44 +00:00
Vicent Llopis 920bff30c8 modify filter sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 12:02:17 +01:00
Vicent Llopis aba7136f56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm 2022-03-21 11:47:33 +01:00
Alex Moreno 8eebe1abbb feat(monito_clients): smart-table and filter by date
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 11:32:26 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 10:02:56 +01:00
Alex Moreno a2b06e7248 feat(print_claim-pickup-order): add claimConfig
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 13:22:39 +01:00
Vicent Llopis f501d20c65 update sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 12:41:15 +01:00
Joan Sanchez 00c53a7709 3668 - Deprecated field "isOfficial"
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 11:06:16 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 10:30:30 +01:00
Alex Moreno 5e8f7a5f6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 15:11:37 +01:00
Vicent Llopis 894f95cb1f update consulte sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 15:05:13 +01:00
Vicent Llopis c660786e45 refactor chaneg name
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 14:52:06 +01:00
Vicent Llopis bc65beaa76 add frontTest 2022-03-17 14:51:49 +01:00
Vicent Llopis a32f7b5ef1 add new row
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 14:27:55 +01:00
Vicent Llopis 644c24fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 11:55:07 +01:00
Vicent Llopis 470616d041 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3684-agencyTerm_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:54:35 +01:00
Vicent Llopis 21198820fc refactor translate
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:54:19 +01:00
Vicent Llopis c3fe2dc52b update filter test 2022-03-17 09:54:08 +01:00
Vicent Llopis 14eacec0ff included test 2022-03-17 09:53:50 +01:00
Alex Moreno 7bd74d6b3b feat(smart-table): add defaultSearch option
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:14:01 +01:00
Alex Moreno e8b4896e98 feat(item_fixed-price): add search, and defaultSerach 2022-03-17 09:13:09 +01:00
Vicent Llopis afa7345d22 delete old db changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:00:13 +01:00
Vicent Llopis 7e8c15e413 modify test updatePortfolio 2022-03-17 09:00:01 +01:00
Vicent Llopis a9b6dcacfe included sms test
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 08:13:18 +01:00
Vicent Llopis 16be66286e excluded test 2022-03-17 08:13:08 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Alex Moreno b4e5631cc7 feat(item_fixed-price): implement smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-16 14:58:07 +01:00
Vicent Llopis 1094bbe92b correction panel-search
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 14:42:19 +01:00
Joan Sanchez 9439757158 Added again
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 14:27:16 +01:00
Joan Sanchez 1e275eb4e3 Invoice folder 2022-03-16 14:26:56 +01:00
Joan Sanchez e5bbff80d4 Added storage on gitignore
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 14:24:51 +01:00
Joan Sanchez dc21408b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 14:24:20 +01:00
Joan Sanchez 22002c2ee9 Added storage pdf folder 2022-03-16 14:24:18 +01:00
Vicent Llopis 26f77ca07e add panel-search
gitea/salix/pipeline/head This commit looks good Details
2022-03-16 13:02:48 +01:00
Alex Moreno 7a45b6014a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-16 07:45:09 +01:00
Carlos Jimenez Ruiz 2d4f182fe6 Merge pull request '3690-fix(worker): fix calendar e2e' (#896) from 3690-worker_calendar_fixe2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #896
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-03-15 14:34:27 +00:00
Carlos Jimenez Ruiz 969ddb3e37 Merge branch 'dev' into 3690-worker_calendar_fixe2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 14:22:12 +00:00
Alex Moreno e0924ea373 refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz 17c95a654e Merge pull request '3604-route_agencyTerm' (#893) from 3604-route_agencyTerm into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #893
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-03-15 14:18:24 +00:00
Carlos Jimenez Ruiz 3098fc36fb Merge branch 'dev' into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 14:14:16 +00:00
Alex Moreno 499cfb2797 Merge branch '3690-worker_calendar_fixe2e' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 15:12:01 +01:00
Alex Moreno 39b3e35725 change description 2022-03-15 15:11:58 +01:00
Vicent Llopis 2f53733151 refactor translates
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 15:05:09 +01:00
Vicent Llopis 1ecc76067a code to correct insert in model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-15 14:50:09 +01:00
Alex Moreno c7d8ebebff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e 2022-03-15 14:49:22 +01:00
Carlos Jimenez Ruiz 9ea3c1832e Merge branch 'dev' into 3690-worker_calendar_fixe2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 13:31:43 +00:00
Carlos Jimenez Ruiz a9f4386ad6 Merge pull request '3689-refactor(ticket): change role productionBoss to deliveryBoss' (#894) from 3689-deliveryBoss into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #894
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-03-15 13:31:16 +00:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:51:33 +01:00