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

7716 Commits

Author SHA1 Message Date
Carlos Andrés b20803e6b9 Actualizar src/pages/Travel/Card/TravelBasicData.vue 2024-11-26 12:31:23 +00:00
Carlos Satorres 75986bf7a8 Merge pull request 'fix: hotfix travel' (!1003) from hotfix-7366travel into master 
Reviewed-on: verdnatura/salix-front#1003
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-11-26 12:17:06 +00:00
Carlos Satorres c5f2be688c fix: fix true 2024-11-26 13:12:53 +01:00
Carlos Satorres 4008f50781 fix: remove 2024-11-26 13:08:28 +01:00
Carlos Satorres 728055352d fix: fix raidDays 2024-11-26 13:06:55 +01:00
Carlos Satorres ad8d5b5e9a fix: hotfix travel 2024-11-26 13:00:38 +01:00
Javier Segarra ac1153b14c feat: add Options style in AddressList from OrderCreate 2024-11-26 12:26:18 +01:00
Javier Segarra 0e9fe82d3d Merge branch 'master' into hotfix_addressSelect_optionFormat 2024-11-26 12:23:39 +01:00
Javier Segarra 63536ea0f5 feat: add Options style in AddressList from OrderCreate 2024-11-26 12:17:33 +01:00
Jorge Penadés 9c5125a4d2 Merge pull request '#8232 change default scopeDays' (!1000) from 8232-changeDefaultScopeDays into master 
Reviewed-on: verdnatura/salix-front#1000
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-26 09:44:18 +00:00
Jorge Penadés 15c1898044 feat: refs #8232 hide only if it is null 2024-11-26 10:42:14 +01:00
Jorge Penadés a33f801543 refactor: refs #8232 use composable 2024-11-26 10:19:54 +01:00
Jorge Penadés 84adc40c18 feat: refs #8232 change default scopeDays 2024-11-26 10:16:53 +01:00
Alex Moreno 7feea110a6 fix(CustomerSummary): fixed CustomerSummaryTable max width 2024-11-26 09:29:09 +01:00
Alex Moreno 2076072eeb fix(TicketSale): set old quantity when error 2024-11-26 09:21:51 +01:00
Alex Moreno 8fbf7fed43 fix(TicketSale): throw error when it should 2024-11-26 09:05:46 +01:00
Alex Moreno 1e4cda6c6a fix(OrderCatalogFilter): remove limit 2024-11-26 07:39:37 +01:00
Alex Moreno 1ce1f1f8e0 Merge pull request '8231_testToMaster_2448' (!997) from 8231_testToMaster_2448 into master 
Reviewed-on: verdnatura/salix-front#997
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-11-26 06:28:29 +00:00
Javier Segarra c3510aea60 feat: add Options Style in AddressList from TicketCrete 2024-11-26 00:18:42 +01:00
Javier Segarra e28d026ca9 test: perf clientList descriptor action 2024-11-25 23:53:14 +01:00
Javier Segarra 4e5754ccb5 test: perf clientList descriptor action 2024-11-25 23:49:24 +01:00
Javier Segarra 6c6144864f revert: remove customer test 2024-11-25 23:21:32 +01:00
Javier Segarra c0d427ecb9 Revert "test: rename client by customer" 
This reverts commit 30a2da027b.
 2024-11-25 23:20:15 +01:00
Javier Segarra 1cbe134e27 Merge pull request '#8163 add VnInput insert functionality and e2e test' (!987) from wbuezas/salix-front-mindshore-fork2:8163-VnInputFunctionality into dev 
Reviewed-on: verdnatura/salix-front#987
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-25 21:36:09 +00:00
Javier Segarra a45c40f796 fix: refs #8163 minor problem when keypress 2024-11-25 22:34:56 +01:00
Javier Segarra 7650997c24 perf: refs #8163 #8061 createNewPostCodeForm 2024-11-25 17:54:38 +01:00
Javier Segarra f6e97efe78 fix: refs #8163 #8061 createNewPostCodeForm 2024-11-25 17:33:59 +01:00
Javier Segarra 7e924bc791 Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448 2024-11-25 14:59:29 +01:00
Javier Segarra 2ead484026 test: refs #8231 fix VnLocation 2024-11-25 14:59:26 +01:00
Alex Moreno 594fc60eec chore: refs #8231 add changelog 2024-11-25 14:49:10 +01:00
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