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

7722 Commits

Author SHA1 Message Date
Jorge Penadés 4e61ede392 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-09 16:44:17 +01:00
Alex Moreno 629531cce4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-09 14:32:42 +01:00
Alex Moreno cd4b2a92dc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-09 14:17:41 +01:00
Jorge Penadés 74e2eb3df1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-09 13:49:41 +01:00
Jon Elias 91afc3ddab Merge pull request '#7283: Fix Item module' (!1042) from Fix-Items-Module into dev 
Reviewed-on: verdnatura/salix-front#1042
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-09 12:29:54 +00:00
Jon Elias d4682248fd Merge branch 'Fix-Items-Module' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-Items-Module 2024-12-09 13:24:36 +01:00
Jon Elias 1de74dec8e fix: fix conflicts 2024-12-09 13:24:34 +01:00
Jon Elias bf68eab480 Merge pull request '#8194 created VnSelectWorker component' (!977) from 8194-VnSelectWorker into dev 
Reviewed-on: verdnatura/salix-front#977
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-09 12:04:18 +00:00
Jon Elias 853bb9e5aa Merge branch 'dev' into 8194-VnSelectWorker 2024-12-09 12:02:16 +00:00
Jon Elias e4837b45be Merge branch 'dev' into Fix-Items-Module 2024-12-09 12:01:07 +00:00
Jorge Penadés 9342cd0408 Merge pull request 'Mixin performance' (!875) from performance_mixins into dev 
Reviewed-on: verdnatura/salix-front#875
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 11:38:51 +00:00
Jorge Penadés f16c45b01a Merge branch 'dev' into performance_mixins 2024-12-09 11:37:52 +00:00
Jon Elias 92b05db9d2 refactor: deleted useless hidden tag 2024-12-09 11:27:30 +01:00
Jorge Penadés 1a954459eb Merge pull request 'feat: refs #7409 add dialog with validations' (!1056) from 7409-hotfix-addValidations into master 
Reviewed-on: verdnatura/salix-front#1056
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 10:01:18 +00:00
Jorge Penadés a4fb2a4819 feat: refs #7409 add dialog with validations 2024-12-09 10:39:51 +01:00
Jorge Penadés fe037ce511 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-hotfix-addValidations 2024-12-09 09:55:48 +01:00
Jorge Penadés f1cc4a01ad feat: refs #7409 add dialog with validations 2024-12-09 09:55:06 +01:00
Javier Segarra ce72388d5e Merge pull request 'HOTFIX: OrderCatalog scroll To Item' (!1026) from hotfix_scrollToItem into master 
Reviewed-on: verdnatura/salix-front#1026
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-09 08:44:07 +00:00
Javier Segarra f049337f95 Merge branch 'master' into hotfix_scrollToItem 2024-12-09 08:42:47 +00:00
Javier Segarra 2e4225f0a9 Merge pull request 'HOTFIX: open Itemdiary from Ticket' (!1054) from hotfix_itemDiary_redirect into master 
Reviewed-on: verdnatura/salix-front#1054
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 08:42:32 +00:00
Javier Segarra fb7f982356 Merge pull request 'warmFix: fix own test' (!1041) from fix_js_e2e_test into test 
Reviewed-on: verdnatura/salix-front#1041
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-09 08:42:21 +00:00
Javier Segarra dc294c78fc Merge branch 'master' into hotfix_itemDiary_redirect 2024-12-09 07:53:52 +00:00
Javier Segarra 4eb491d793 perf: i18n missing 2024-12-09 08:53:23 +01:00
Javier Segarra 933a1958a2 perf: remove unnecessary logic 2024-12-09 08:51:26 +01:00
Jon Elias b26d07f605 Merge branch 'Fix-Items-Module' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-Items-Module 2024-12-09 08:49:27 +01:00
Jon Elias f5f77a50bc refactor: added again search emit 2024-12-09 08:49:26 +01:00
Javier Segarra edef54dae1 Merge branch 'master' into hotfix_scrollToItem 2024-12-09 07:45:18 +00:00
Jon Elias 338058c1a4 Merge branch 'dev' into Fix-Items-Module 2024-12-09 07:22:17 +00:00
Jon Elias 0c88db5931 refactor: deleted onUnmounted code 2024-12-09 08:20:35 +01:00
Javier Segarra 69e3d3159f Merge pull request 'ItemFixedPrice' (!791) from hotfix_itemFixedPrice into master 
Reviewed-on: verdnatura/salix-front#791
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-09 07:05:53 +00:00
Javier Segarra e0bc14e3f7 Merge branch 'master' into hotfix_itemFixedPrice 2024-12-09 07:05:18 +00:00
Alex Moreno 8a1812dbb0 Merge pull request 'fix(TicketSaleMoreActions): hotFix isClaimable' (!1055) from hotFix_ticketSale_isClaimable into master 
Reviewed-on: verdnatura/salix-front#1055
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-09 07:00:59 +00:00
Alex Moreno 88863a215a fix(TicketSaleMoreActions): hotFix isClaimable 2024-12-09 07:56:50 +01:00
Javier Segarra 96223801d2 fix: open Itemdiary from Ticket 2024-12-06 14:59:47 +01:00
Jorge Penadés fb1928db7e feat: refs #7936 simplify optionLabel wip 2024-12-05 16:41:32 +01:00
Jorge Penadés fdd947fbbb feat: refs #7936 improve optionLabel logic in InvoiceInVat component for better handling of numeric values 2024-12-05 15:59:56 +01:00
Jorge Penadés bd12c3bc66 feat: refs #7936 update option labels in InvoiceIn components for better clarity 2024-12-05 15:55:40 +01:00
Javier Segarra 11ef388f92 Merge branch 'fix_js_e2e_test' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_js_e2e_test 2024-12-05 14:55:56 +01:00
Javier Segarra 4c01cf9603 perf: remove timeout 2024-12-05 14:55:51 +01:00
Jon Elias fea161d5c2 perf: refs #8194 select worker component 2024-12-05 14:19:58 +01:00
Jon Elias 96920dd540 refactor: refs #8194 modified select worker template 2024-12-05 14:13:31 +01:00
Jon Elias cf522684d6 refactor: refs #8194 deleted unnecessary label 2024-12-05 14:00:45 +01:00
Jon Elias 6c05347219 refactor: refs #8194 modified select worker to allow no one filter from monitor ticket 2024-12-05 13:45:18 +01:00
Jon Elias accf61517a refactor: refs #8194 requested changes 2024-12-05 13:31:39 +01:00
Jorge Penadés 6a7cf5e8e8 feat: refs #7936 add unit tests 2024-12-05 12:34:29 +01:00
Jon Elias c7115f4781 refactor: refs #8194 moved translation to the correct place 2024-12-05 11:14:15 +01:00
Jon Elias 2d2187090c Merge branch 'dev' of https: refs #8194//gitea.verdnatura.es/verdnatura/salix-front into 8194-VnSelectWorker 2024-12-05 11:04:02 +01:00
Jon Elias 1e1032b3da refactor: refs #8194 structure changes in component and related files 2024-12-05 11:00:40 +01:00
Javier Segarra b068515f55 perf: test command fillInForm 2024-12-05 09:43:45 +00:00
Jorge Penadés d916b47f4c feat: refs #7936 enhance getTotal fn & add unit tests 2024-12-05 10:40:50 +01:00