wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
11,557 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

11557 Commits

Author SHA1 Message Date
Alex Moreno 96dc556985 Merge branch 'dev' of https: refs #6994//gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-06 13:34:54 +01:00
Jon Elias a0e79104a8 Merge pull request '#8600: Added and modified E2E' (!1447) from 8600-CreateZoneE2E into dev 
Reviewed-on: verdnatura/salix-front#1447
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-06 11:16:38 +00:00
Jon Elias 81ab122ce6 Merge branch 'dev' into 8600-CreateZoneE2E 2025-03-06 11:06:51 +00:00
Jon Elias c38fedb408 fix: refs #8600 e2e 2025-03-06 11:56:15 +01:00
Alex Moreno aa5692abd3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-06 11:50:54 +01:00
Alex Moreno fa23974098 fix: add --init flag to Cypress Docker container for improved stability 2025-03-06 11:50:38 +01:00
Alex Moreno 6cfcc2f81b fix: add --init flag to Docker container for Cypress tests 2025-03-06 11:50:11 +01:00
Jon Elias 6930cb63d9 Merge branch '8600-CreateZoneE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E 2025-03-06 11:40:46 +01:00
Jon Elias 04b2cfe541 Merge branch 'dev' of https: refs #8600//gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E 2025-03-06 11:40:45 +01:00
Alex Moreno 91e25acd55 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-06 11:33:17 +01:00
Alex Moreno 267d74046a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-06 11:32:46 +01:00
Jorge Penadés eee7402519 Merge pull request 'fix: refs #8316 add rectificative handling in invoiceIn route' (!1565) from 8316-hotfix-checkRectificative into master 
Reviewed-on: verdnatura/salix-front#1565
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-06 09:45:10 +00:00
Jorge Penadés 3679cbd253 fix: refs #8316 add rectificative handling in invoiceIn route 2025-03-06 10:16:27 +01:00
Jon Elias d450786ff2 Merge pull request '#8074: Modify spinner size' (!1521) from 8074-AddLoaderInPaginate into dev 
Reviewed-on: verdnatura/salix-front#1521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-06 09:02:28 +00:00
Jon Elias fce8ae4508 Merge branch 'dev' into 8074-AddLoaderInPaginate 2025-03-06 08:51:15 +00:00
Alex Moreno 376993b978 Merge pull request 'ci: refs #6695 feat jenkins parallel e2e' (!1473) from 6695-jenkins_e2e_parallel into dev 
Reviewed-on: verdnatura/salix-front#1473
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-03-06 08:35:44 +00:00
Alex Moreno a462d705f5 fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies 2025-03-06 09:21:58 +01:00
Alex Moreno 489e7850ab fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection 2025-03-06 09:13:08 +01:00
Javier Segarra 6a182d5403 fix: remove deprecated condition to check 2025-03-06 08:39:27 +01:00
Alex Moreno e5b524e8a0 fix(cypressParallel.sh): refs #6695 simplify test execution output format 2025-03-06 08:23:36 +01:00
Alex Moreno 0595163f58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-jenkins_e2e_parallel 2025-03-06 08:23:06 +01:00
Alex Moreno a53f5db047 fix(cypressParallel.sh): refs #6695 improve test execution output for clarity 2025-03-06 08:23:04 +01:00
Alex Moreno e656eca30a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-06 08:09:21 +01:00
Alex Moreno ddcdda1dd5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-06 08:08:23 +01:00
Alex Moreno b3f8a42885 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6695-jenkins_e2e_parallel 2025-03-06 07:32:47 +01:00
Alex Moreno 5c37990881 ci(Jenkinsfile): move docker build command above login step for better clarity 2025-03-06 07:30:07 +01:00
Javier Segarra 561a895d04 Merge pull request 'fix: add agencyModeFk to selectedClient' (!1560) from hotfix_fixGetAgenciesTicketList into master 
Reviewed-on: verdnatura/salix-front#1560
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-06 00:30:21 +00:00
Javier Segarra 8145805231 feat: handle clear customer 2025-03-06 01:28:54 +01:00
Javier Segarra 499dfa50e2 Merge branch 'master' into hotfix_fixGetAgenciesTicketList 2025-03-06 01:15:47 +01:00
Javier Segarra 44f11fddf1 test: fix test 2025-03-06 01:15:31 +01:00
Javier Segarra 6527efd378 Merge pull request 'fix: newWorker' (!1538) from hotfix-newWorker into master 
Reviewed-on: verdnatura/salix-front#1538
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-05 21:48:16 +00:00
Javier Segarra 0237a2364d feat: revert changes and fix test 2025-03-05 22:47:17 +01:00
Javier Segarra eae791eab3 Merge branch 'master' into hotfix-newWorker 2025-03-05 21:46:17 +00:00
Javier Segarra 2c33205cdc fix: jsegarra ticketList proposal 2025-03-05 22:41:38 +01:00
Javier Segarra 85716cac19 fix: jsegarra proposal 2025-03-05 22:16:50 +01:00
Jose Antonio Tubau 3695b76fbd fix: update client structure in getAgencies test 2025-03-05 21:51:15 +01:00
Jose Antonio Tubau a812fc1720 fix: add agencyModeFk to selectedClient 2025-03-05 21:45:50 +01:00
Javier Segarra 6d59dc93a2 feat: add search URL to TicketTracking component 2025-03-05 17:13:06 +01:00
Juan Ferrer be34b7ca9d ci(Jenkinsfile): refs #6695 Added -f to rm instead of || true 2025-03-05 16:01:57 +00:00
Alex Moreno 51c3adccf4 Merge branch 'dev' into 6695-jenkins_e2e_parallel 2025-03-05 14:08:08 +00:00
Alex Moreno b3d76a60dc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-05 15:06:25 +01:00
Alex Moreno cdc0b8dddb test: remove unnecessary domContentLoad call in orderList.spec.js 2025-03-05 15:06:21 +01:00
Alex Moreno ba467034d2 fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method 2025-03-05 15:05:19 +01:00
Alex Moreno 161f85a175 Merge branch 'dev' into 6695-jenkins_e2e_parallel 2025-03-05 13:53:02 +00:00
Alex Moreno 81f0c747a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-05 14:49:51 +01:00
Alex Moreno a11b4a8da1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-05 14:49:42 +01:00
Alex Moreno 16d550085f test: better itemBarcode test 2025-03-05 14:49:34 +01:00
Javier Segarra b139f11323 Merge pull request 'HOTFIX: update skip calculation to consider filter limit' (!1559) from hotfix_paginate_limit_filter into master 
Reviewed-on: verdnatura/salix-front#1559
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-05 13:19:33 +00:00
Alex Moreno 4755d12976 Merge branch 'master' into hotfix_paginate_limit_filter 2025-03-05 13:17:19 +00:00
Alex Moreno b9e6d92326 fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload 2025-03-05 14:07:09 +01:00