Commit Graph

11958 Commits

Author SHA1 Message Date
Alex Moreno 6426a629e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:26:54 +01:00
Alex Moreno 7a0221c17d test(supplier): add backTest to check changes in isPayMethodChecked
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 08:02:28 +01:00
Alex Moreno 9247bc98f1 feat(db): sql for supplier isPayMethodChecked 2021-12-20 08:01:13 +01:00
Alex Moreno bcc50b0618 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-20 07:33:52 +01:00
Carlos Jimenez Ruiz d2db3054a5 Merge branch 'dev' into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 14:15:41 +00:00
Carlos Jimenez Ruiz 7fbbe2fddd ctx was poluted by tests
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 15:14:31 +01:00
Joan Sanchez f74df7e765 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 13:21:49 +01:00
Joan Sanchez da59a556ca refactor(monitor): limited width to the client and zone columns
gitea/salix/pipeline/head This commit looks good Details
Refs: 3458
2021-12-17 13:09:00 +01:00
Alex Moreno 0ea1dea8b5 refactor sqls
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 12:52:37 +01:00
Joan Sanchez 4cb346c2a8 fix(monitor): changed order to prevent row duplication
gitea/salix/pipeline/head This commit looks good Details
Refs: 3458
2021-12-17 12:40:23 +01:00
Alex Moreno 850ea2ef39 getVisible sql
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 12:38:56 +01:00
Carlos Jimenez Ruiz d83995e64e filter worker id refactor
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 10:41:59 +01:00
Alex Moreno 7c17250919 trigger payment_beforeInsert sql
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 15:19:56 +01:00
Alex Moreno f4a07cab70 sql update supplier
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 12:21:47 +01:00
Alex Moreno 138f2110e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 12:15:47 +01:00
Carlos Jimenez Ruiz 5a448234d6 transtaction commits on several endpoints
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 10:56:10 +01:00
Alex Moreno 87f994aa77 test(ticket_basci-data_step-two): back and front
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 08:14:27 +01:00
Carlos Jimenez Ruiz 2bfc6a5987 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 15:29:28 +01:00
Carlos Jimenez Ruiz b4f1e66fed order module transactions 2021-12-15 15:29:22 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-15 15:24:45 +01:00
Alex Moreno 7b13c6a9cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 15:16:45 +01:00
Alex Moreno 3e91929d0d half test
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 15:16:21 +01:00
Alex Moreno e01d676bb1 feat(ticket_basic-data_step-two): show visible and option withoutNegatives
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 14:45:45 +01:00
Joan Sanchez 871277acb4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 09:44:24 +01:00
Joan Sanchez 2fb1c72887 fix(styles): style changes for better readability
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 09:03:44 +01:00
Alex Moreno be3e8ddd98 feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:59:53 +01:00
Alex Moreno 5960d40891 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:43:40 +01:00
Alex Moreno 9cfe6b5b7a feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:05:06 +01:00
Joan Sanchez 15b78787df Added version 10400-christmas
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 10:46:05 +01:00
Joan Sanchez b4b30f5243 Merge pull request '3415-export database' (#813) from export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #813
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-12-14 09:30:31 +00:00
Joan Sanchez b45263af30 Merge branch 'dev' into export_production
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 09:23:15 +00:00
Joan Sanchez 7a54484e97 Merge pull request 'fix: deleted repeated tickets' (#820) from 3428-item_diary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #820
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-12-14 09:22:47 +00:00
Vicent Llopis 97b7ebd717 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3428-item_diary
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 10:01:25 +01:00
Vicent Llopis 9de1d59d98 fix: deleted repeated tickets
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 09:56:38 +01:00
Javi Gallego af670ae3e9 fdescribe
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 09:51:12 +01:00
Javi Gallego a99174e42a Merge branch 'dev' into 2883-invoiceIn-Booking 2021-12-14 09:50:39 +01:00
Carlos Jimenez Ruiz 30e1be3167 Merge pull request 'fix(ticketIndex): excluded collectionFk property from date ranges' (#819) from 3431-ticket_collection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #819
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-12-14 08:50:30 +00:00
Joan Sanchez f2a8992410 fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good Details
Refs: 3431
2021-12-14 09:17:00 +01:00
Javi Gallego f669e7148c onAcceptToBook test ok
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 08:33:29 +01:00
Alex Moreno 6465a5c460 feat(supplier): payMethodChecked for financial
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 08:23:11 +01:00
Joan Sanchez 805cdd6418 3112 - addd cmr-authorization report
gitea/salix/pipeline/head This commit looks good Details
2021-12-13 08:23:44 +01:00
Carlos Jimenez Ruiz 6aa3101e42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions 2021-12-02 11:04:44 +01:00
Joan Sanchez f63426304f Removed font color
gitea/salix/pipeline/head This commit looks good Details
2021-12-02 09:20:45 +01:00
Javi Gallego b565d35a8b Merge pull request '3386-route_ticket_buscaman' (#816) from 3386-route_ticket_buscaman into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #816
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-12-01 15:02:32 +00:00
Carlos Jimenez Ruiz 2ebe6b5342 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 15:26:09 +01:00
Carlos Jimenez Ruiz 8285a8a8e9 refactor(route.tickets): updated error description 2021-12-01 15:26:01 +01:00
Carlos Jimenez Ruiz bc2b2f37e8 Merge pull request '3372-ticket_sale multi-check for recalculatePrice' (#811) from 3372-ticket_sale into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #811
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-12-01 12:55:52 +00:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Alex Moreno 75e32feb16 refactor ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 11:39:48 +01:00
Alex Moreno 77191b6182 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-12-01 11:29:10 +01:00