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

7594 Commits

Author SHA1 Message Date
Javier Segarra 1974fd4663 Merge branch 'dev' into 8163-VnInputFunctionality 2024-11-25 14:27:44 +01:00
Javier Segarra 4735d98afc test: refs #8163 #8163 rename tests 2024-11-25 14:26:59 +01:00
Jorge Penadés 8688f2a3aa Merge pull request 'fix: refs #7229 set url' (!990) from 7229-fixUrl into dev 
Reviewed-on: verdnatura/salix-front#990
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 13:16:28 +00:00
Jorge Penadés 5bdf9bc57e Merge branch 'dev' into 7229-fixUrl 2024-11-25 13:15:29 +00:00
Javier Segarra 28c9aceb80 Merge pull request 'Randomize functions and example' (!994) from cypress_randomizeValue into dev 
Reviewed-on: verdnatura/salix-front#994
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-25 13:07:55 +00:00
Alex Moreno 209266d843 Merge branch 'dev' into 7229-fixUrl 2024-11-25 13:07:15 +00:00
Javier Segarra 4821c43d0d Merge branch 'dev' into cypress_randomizeValue 2024-11-25 13:06:07 +00:00
Carlos Satorres 2c492e88d5 Merge pull request 'refs #7529 create WorkerPIT' (!442) from 7529-workerPIT into dev 
Reviewed-on: verdnatura/salix-front#442
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 13:05:32 +00:00
Javier Segarra 582a3b333a Merge branch 'dev' into cypress_randomizeValue 2024-11-25 14:01:27 +01:00
Carlos Satorres dfcaf4e692 fix: refs #7529 fix e2e 2024-11-25 13:53:22 +01:00
Carlos Satorres 2bc2217406 fix: refs #7529 fix workerPit e2e 2024-11-25 13:49:01 +01:00
Jorge Penadés 34062d3fc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7229-fixUrl 2024-11-25 13:37:34 +01:00
Carlos Satorres 5dd508c559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-25 13:31:02 +01:00
Javier Segarra 60590f6c97 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 12:28:23 +00:00
William Buezas 62cd952e84 feat: refs #8163 resolve conflictss 2024-11-25 09:22:21 -03:00
William Buezas 0e55f7abdc test: order catalog tests 2024-11-25 09:18:11 -03:00
Javier Segarra ec96f6bea7 Merge pull request 'fix: #8061 Handle new CP' (!948) from 8061_newCP into dev 
Reviewed-on: verdnatura/salix-front#948
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 12:17:13 +00:00
Alex Moreno ee2450c82f Merge branch 'dev' into 8061_newCP 2024-11-25 12:16:18 +00:00
Alex Moreno 655a76ff62 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-25 13:03:11 +01:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-25 13:02:58 +01:00
Jon Elias 843c54fcc1 Merge pull request 'Hotfix: ZoneLocationsTree' (!995) from Fix-ZoneLocationsTree2 into master 
Reviewed-on: verdnatura/salix-front#995
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:56:30 +00:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons 2024-11-25 12:54:15 +01:00
Javier Segarra a99f64f66a Merge branch 'dev' into 8061_newCP 2024-11-25 11:20:20 +00:00
Jon Elias f3429297cf Merge branch 'master' into Fix-ZoneLocationsTree2 2024-11-25 11:20:17 +00:00
Javier Segarra 3e06ba3c18 perf: remove console 2024-11-25 11:20:07 +00:00
Javier Segarra 4bd14927de Merge branch 'dev' into cypress_randomizeValue 2024-11-25 11:19:30 +00:00
Javier Segarra b62935494a test: remove only 2024-11-25 11:19:21 +00:00
Jon Elias d191d88e81 refactor: modified button to prevent submit 2024-11-25 12:19:20 +01:00
Javier Segarra caca9aea71 Merge pull request 'Add reportFileName option' (!993) from cypress_reporterFileName into dev 
Reviewed-on: verdnatura/salix-front#993
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:18:43 +00:00
Javier Segarra 424dfc0a5c Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 11:18:18 +00:00
Jorge Penadés 6c30ea9e7a Merge pull request '#8207 hotfix-tableActions' (!991) from 8207-hotfix-tableActions into master 
Reviewed-on: verdnatura/salix-front#991
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:13:45 +00:00
Jorge Penadés e994ae72b6 fix: refs #8207 add filter to reset 2024-11-25 12:08:37 +01:00
Jorge Penadés a1284cefc2 refactor: refs #8207 add update fn 2024-11-25 12:01:28 +01:00
Jon Elias c558636799 refactor: requested changes 2024-11-25 11:12:11 +01:00
Jorge Penadés a3f56aaf24 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions 2024-11-25 10:27:00 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2 2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location 2024-11-25 09:21:20 +01:00
Javier Segarra c4f2ea032c feat: randomize functions and example 2024-11-24 17:01:54 +01:00
Javier Segarra b8ac82bc75 feat: add reportFileName option 2024-11-24 16:41:21 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated 2024-11-24 11:53:40 +01:00
Javier Segarra feb752f75c perf: refs #8061 solve conflicts and random posCode it 2024-11-24 09:31:43 +01:00
Javier Segarra fb4de9cda9 Merge branch 'dev' into 8061_newCP 2024-11-24 09:23:37 +01:00
Javier Segarra a45bf4c83b perf: remove comments 2024-11-24 08:49:03 +01:00
Javier Segarra 8d59cfa9c3 perf: use FetchData instead VnPAginate 2024-11-24 08:48:56 +01:00
Javier Segarra 7f87df1225 feat: refs #8163 use VnAccountNumber in VnAccountNumber 2024-11-23 16:49:32 +01:00
Javier Segarra 2fa8c3f88a feat: refs #8163 limit with maxLength 2024-11-23 15:59:29 +01:00
Javier Segarra 4fa5d47481 test: more e2e customer tests 2024-11-23 01:12:59 +01:00
Javier Segarra 30a2da027b test: rename client by customer 2024-11-23 00:51:45 +01:00
Javier Segarra 8a1a748c92 test: add data-cy 2024-11-23 00:51:33 +01:00
Javier Segarra 4233385267 Merge branch 'hotfix_8217_updateCustomerCredit' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_8217_updateCustomerCredit 2024-11-23 00:33:36 +01:00