Commit Graph

1360 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00
Carlos Jimenez Ruiz 84606de1da e2e path for claim notes + refactor
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 17:25:35 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:03:24 +02:00
Alex Moreno 212c351064 fix(item_create): fixtures and test
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 13:17:22 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:17:45 +02:00
Alex Moreno 4155b45785 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:22:43 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:07:53 +02:00
Joan Sanchez 2381a5d09a Updated e2e tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 12:40:11 +02:00
Alex Moreno 20f886e933 change email and text info in email field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 13:58:47 +02:00
Alex Moreno 8d9d64b49d feat(client_web-access): add email field
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz 9e70b8c5fd web access user changed to a non-worker
gitea/salix/pipeline/head This commit is unstable Details
2022-06-17 09:28:54 +02:00
Carlos Jimenez Ruiz 1e504b6b9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor 2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz 869c9caf98 corrected a typo 2022-06-16 14:53:35 +02:00
Carlos Jimenez Ruiz 5dd91a0be9 excluded web access e2e path for another task to fix it.
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 12:08:58 +02:00
Alex Moreno f74c7a6999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 15:13:04 +02:00
Joan Sanchez 0bc48dc27b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 09:39:53 +02:00
Alex Moreno 2b10abbe24 typo
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 10:08:40 +02:00
Alex Moreno ff264ab930 hotFix(client): fiscal-data edit by salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 09:45:08 +02:00
Alex Moreno 1b061852d2 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 08:27:26 +02:00
Alex Moreno 3650567caf test(account): e2e for ldap and samba
gitea/salix/pipeline/head This commit looks good Details
2022-05-19 15:02:39 +02:00
Alex Moreno 68c94ec3c1 typo
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 15:02:06 +02:00
Alex Moreno 34bcdf1bd3 test(account): acl, connections and accounts secctions
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 14:01:30 +02:00
Carlos Jimenez Ruiz 4647d6e54e e2e path for activate/deactivate user on account/descriptor
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 15:38:24 +02:00
Alex Moreno 89baf63646 feat(account): add e2e acl
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 15:19:54 +02:00
Alex Moreno 8bcdf96aad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter 2022-05-16 14:15:37 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz 7bafc48d68 removed CI references for e2e
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 18:29:20 +02:00
Carlos Jimenez Ruiz 39413c145d e2e test battery moved out of gulp to npm script
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 17:09:41 +02:00
Alex Moreno ec49dd67be refactor(client_defaulter)
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 14:18:16 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz a47c0dbaea Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz 0e65f382f9 Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:36:35 +00:00
Alex Moreno 5919c42df2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 11:42:35 +02:00
Alex Moreno 5bad0592a5 change errors
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:48:51 +02:00
Vicent Llopis f08a384a7c fix: e2e test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:49:37 +02:00
Vicent Llopis 4a6873a0fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:37 +02:00
Alex Moreno 62f7b80ed4 quit $
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:55:43 +02:00
Alex Moreno 36addcdb6c fix name tests
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 13:05:20 +02:00
Alex Moreno b7931278be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive 2022-04-13 13:03:07 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Joan Sanchez c2271b6071 Merge branch 'dev' into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:00:28 +00:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Vicent Llopis 4872407723 fix test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 11:57:56 +02:00
Alex Moreno 4a714a4b6f feat(client): add privileges to administrative role
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:56:03 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +00:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Joan Sanchez d2ecbe898e Merge branch 'dev' into 3863-client_name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:03:23 +00:00
Alex Moreno 238a9fd5da feat(client.defaulter&claim): change socialName to name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 08:52:21 +02:00
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
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
Vicent Llopis eba3ac40a5 refactor: delete item.compression
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 11:48:12 +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 8e27ab612d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 15:08:48 +02:00
Vicent Llopis 63a857a616 fix: updated test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 14:33:22 +02:00
Vicent Llopis 6c43ea716e fix: update test failed
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 09:10:42 +02:00
Alex Moreno dc03a66c6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 12:01:50 +01:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Alex Moreno 9a1c0a07fd Merge branch 'dev' into 3680-claim_basic-data_packages
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 08:42:52 +00: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
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 39b3e35725 change description 2022-03-15 15:11:58 +01: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
Alex Moreno 0fd556dd2a fix(worker): fix calendar e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-11 13:23:02 +01:00
Vicent Llopis aa5ff474ec solved test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-11 12:21:39 +01:00
Alex Moreno 5efb678a53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:32:18 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 09:17:19 +00:00
Alex Moreno 62286c2f9a refactor(defaulter): simple route
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 10:34:17 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Alex Moreno a5614e5d5d change client.name for client.socialName
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:52:45 +01:00
Alex Moreno 4e89c66e2c refactor(client_defaulter): add column date
gitea/salix/pipeline/head This commit looks good Details
2022-02-22 08:58:22 +01:00
Alex Moreno 91b6dcee05 fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 14:33:16 +01:00
Joan Sanchez a4186ce577 Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:45:06 +01:00
Joan Sanchez a8900b06b7 Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 10:57:39 +00:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:03:47 +00:00
Alex Moreno 368498d763 refactor(defaulter): array request 2022-02-01 08:49:56 +01:00
Alex Moreno 746cbede4b feat(client_defaulter): move tool-bar up , add column author
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 08:17:15 +01:00
Joan Sanchez 78507240ee Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 13:14:14 +00:00
Joan Sanchez db54d92b69 Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 14:11:26 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 09:15:41 +01:00
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Alex Moreno 8e75a28f7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 12:46:59 +01:00
Alex Moreno f67a4355db refactor(ticket_sale): split e2e, change name backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 15:09:29 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 14:27:30 +01:00
Alex Moreno 6d9afd5f4c feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 11:40:48 +01:00
Alex Moreno 9ddf11c6bc test(ticket): update to advanceable
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:49:16 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:20:23 +01:00
Carlos Jimenez Ruiz 7dbf03ed72 front unit test and e2e for change state
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 10:45:19 +01:00
Alex Moreno 1e6355cdde fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:11:33 +01:00
Alex Moreno e609994efa 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-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 20:58:58 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:45:40 +01:00