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

8605 Commits

Author SHA1 Message Date
Jorge Penadés ff14d81f51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal 2025-01-20 13:21:32 +01:00
Jorge Penadés 2f40b77f0b Merge pull request '#8198 keep section filter' (!1210) from 8198-keepSectionFilter into dev 
Reviewed-on: verdnatura/salix-front#1210
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 09:42:31 +00:00
Jorge Penadés 7795fd1524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-20 10:30:33 +01:00
PAU ROVIRA ROSALENY c43a8d0a38 Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev 
Reviewed-on: verdnatura/salix-front#1184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-20 06:01:32 +00:00
PAU ROVIRA ROSALENY c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 13:54:22 +00:00
PAU ROVIRA ROSALENY dd88598072 Merge branch 'dev' into 8395-invoiceInVatTotal 2025-01-17 13:23:18 +00:00
PAU ROVIRA ROSALENY 57804f9f2d feat: refs #8395 added total column in invoiceInVat 2025-01-17 14:08:36 +01:00
Jon Elias 9d35dc08dd Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev 
Reviewed-on: verdnatura/salix-front#1236
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-17 12:21:32 +00:00
PAU ROVIRA ROSALENY 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY 32909a96bd feat: refs #8258 added uppercase validation on supplier create 2025-01-17 13:19:12 +01:00
Jon Elias 63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale 2025-01-17 12:09:37 +00:00
Jon Elias e1a395b015 refactor: redirect using params 2025-01-17 13:07:30 +01:00
Jose Antonio Tubau dac99dc132 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1144
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-17 11:49:15 +00:00
Jose Antonio Tubau 872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-17 08:21:17 +00:00
Jose Antonio Tubau c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components 2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY 11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 07:40:49 +00:00
PAU ROVIRA ROSALENY 6b3c510057 Merge pull request 'fix: #8243 fixed SkeletonSummary' (!1230) from 8243-arreglarSkeletonSummary into dev 
Reviewed-on: verdnatura/salix-front#1230
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-01-17 07:34:42 +00:00
Jon Elias 972b377e13 fix: redirect when confirming lines 2025-01-17 07:35:23 +01:00
PAU ROVIRA ROSALENY 98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-17 06:16:36 +00:00
Jon Elias b00e654fdd Merge pull request 'Fix: Redirect to TicketSale' (!1233) from Fix-RedirectToTicketSale into dev 
Reviewed-on: verdnatura/salix-front#1233
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-17 05:01:42 +00:00
Jorge Penadés fb530d8408 chore: refs #8198 rollback 2025-01-16 16:29:28 +01:00
Jorge Penadés b5ae3a1901 chore: refs #8198 rollback 2025-01-16 16:27:18 +01:00
Jon Elias eed895b21c fix: redirect to TicketSale from OrderLines 2025-01-16 13:25:00 +01:00
Jorge Penadés 31795ae40b test: refs #8198 skip tests 2025-01-16 12:51:35 +01:00
PAU ROVIRA ROSALENY e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-16 11:41:04 +00:00
PAU ROVIRA ROSALENY 4b3c78dd65 fix: refs #8243 fixed SkeletonSummary 2025-01-16 12:40:28 +01:00
Jorge Penadés 39adfb3693 fix: refs #8198 update query param 2025-01-16 10:43:40 +01:00
Jorge Penadés 64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-16 10:40:50 +01:00
Guillermo Bonet 9b1554b123 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-16 09:34:14 +01:00
Guillermo Bonet 86169d980c feat: refs #7882 Added coords to create a address 2025-01-16 09:34:12 +01:00
PAU ROVIRA ROSALENY 71daac1c9d Merge pull request 'feat: #7077 created test for VnInputTime' (!1163) from 7077-testVnInputTime into dev 
Reviewed-on: verdnatura/salix-front#1163
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 08:24:02 +00:00
PAU ROVIRA ROSALENY 8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:18:40 +00:00
PAU ROVIRA ROSALENY f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-16 07:18:07 +01:00
PAU ROVIRA ROSALENY 82e6cc0790 refactor: refs #7077 removed some comments 2025-01-16 07:18:05 +01:00
PAU ROVIRA ROSALENY 4b9453380a Merge pull request 'feat: #7087 created CardSummary test' (!1197) from 7087-testCardSummary into dev 
Reviewed-on: verdnatura/salix-front#1197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 06:16:45 +00:00
PAU ROVIRA ROSALENY a0f7905983 Merge branch 'dev' into 7087-testCardSummary 2025-01-16 06:15:51 +00:00
PAU ROVIRA ROSALENY ce7e529776 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:15:36 +00:00
Jose Antonio Tubau 80413eef3e refactor: refs #8316 moved localizations to local locale 2025-01-15 15:19:47 +01:00
PAU ROVIRA ROSALENY 0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-15 13:42:01 +00:00
Alex Moreno c6d7008ed5 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1149) from 8316-orderCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1149
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 11:41:35 +00:00
Alex Moreno a95f6f56bd fix: refs #8316 userFilter 2025-01-15 12:17:06 +01:00
Alex Moreno 3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-15 11:11:49 +00:00
Alex Moreno a153dd8860 fix: refs #8316 use section-searchbar 2025-01-15 12:11:10 +01:00
Alex Moreno 3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:06:17 +01:00
Alex Moreno 56e0965499 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 12:05:38 +01:00
Alex Moreno a15d052589 Merge pull request '8197-fix_searchbar_teleport' (!1204) from 8197-fix_searchbar_teleport into test 
Reviewed-on: verdnatura/salix-front#1204
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-15 11:05:33 +00:00
Alex Moreno 7661f9e633 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-15 11:04:39 +00:00
Alex Moreno 9765066493 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:03:02 +01:00
Jon Elias 6724818ebe Merge pull request '#8247: Fixed acls and added lost options' (!1159) from 8247-EnableAccount into dev 
Reviewed-on: verdnatura/salix-front#1159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 10:53:10 +00:00
Jon Elias c193ce33f6 Merge branch 'dev' into 8247-EnableAccount 2025-01-15 10:51:33 +00:00