Commit Graph

791 Commits

Author SHA1 Message Date
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Vicent Llopis c33cab7b10 fix: test back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 09:01:08 +02:00
Vicent Llopis e7261573d7 delete focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:41:00 +02:00
Alex Moreno 508decaf0b try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 08:22:36 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:45:46 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:47:37 +02:00
Alex Moreno 8985a678d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-18 09:49:06 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:01:21 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Vicent Llopis 787d10aac6 fix: select one result only
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:43:08 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:30:37 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Alex Moreno 99271f275f remove unnecessary isEditable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:26:38 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 843f67919c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:56:03 +02:00
Alex Moreno 3ac8e1d3bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 09:57:21 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-10 07:49:08 +02:00
Alex Moreno 94a51db3d5 hotFix(ticket_request): autocomplete buyer
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:56:12 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez dd9b517883 Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1061
2022-10-06 11:30:49 +00:00
Vicent Llopis c8d270499b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:50:11 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:48:31 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Alex Moreno 5f39249edb fix(ticket): canEdit use aclFunc
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 15:02:00 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Joan Sanchez 1598b6c703 Back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:39:42 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Vicent Llopis 5c76437498 refator: delete unnecessary transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 08:19:09 +02:00
Vicent Llopis f510e26141 refactor: translation
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:55:30 +02:00
Vicent Llopis 197bbf392b refator: updates translations
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:50:37 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Joan Sanchez d7ab95fcc8 closure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:00:12 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Vicent Llopis a486b1593b fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 13:55:09 +02:00
Vicent Llopis 95e5b1a970 fix: code for search-function 2022-09-22 13:54:58 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 08:32:18 +02:00
Vicent Llopis fae1516b33 refactor: correct bleeding
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:55:43 +02:00
Vicent Llopis 65e15ada69 refator: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:53:02 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +02:00
Alex Moreno c06d2970ae test(boxing): getVideoList
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 13:58:39 +02:00
Alex Moreno 8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 15:08:28 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
2022-09-05 12:06:14 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 14:57:39 +02:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 12:55:11 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 08:59:06 +02:00
Vicent Llopis ec852b898c fix: check if services exists
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:44:19 +02:00
Vicent Llopis 00e48f5257 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 10:59:31 +02:00
Vicent Llopis 84ffe3f594 feat: delete from ticketCollection and sectorCollection when a ticket is deleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 09:58:15 +02:00
Vicent Llopis 363c5f349a fix: solved bug to create temporary table
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 10:04:12 +02:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:28:39 +02:00
Alex Moreno 4e3380cf65 hotFix(ticket_expedition): delete e.checked in filter
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 15:28:11 +02:00