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

8321 Commits

Author SHA1 Message Date
Alex Moreno d0176303da Merge pull request 'fix: order when is string' (!1279) from hotFix_fixOrderStringArray into master 
Reviewed-on: verdnatura/salix-front#1279
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-24 07:32:58 +00:00
Javier Segarra 2c6d3de784 Merge branch 'master' into hotFix_fixOrderStringArray 2025-01-24 07:25:46 +00:00
Javier Segarra c61e4d30f6 Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' (!1276) from hotfix_customerDescriptor_orderBtn into master 
Reviewed-on: verdnatura/salix-front#1276
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-24 07:24:59 +00:00
Alex Moreno 5b448e5bb3 fix: order when is string 2025-01-24 08:24:12 +01:00
Javier Segarra f0dc7b4a41 fix: import component 2025-01-24 08:19:53 +01:00
Javier Segarra d5ea4fb46d perf: eslint 2025-01-24 00:26:31 +01:00
Javier Segarra 00c90b29e9 fix: remove "Go to module index" i18n value 2025-01-24 00:24:19 +01:00
Javier Segarra f4adedb4f1 fix: replace GoToUser by NewOrder 2025-01-24 00:23:31 +01:00
Alex Moreno a58f31f7d8 fix: change name 2025-01-23 07:18:28 +01:00
Javier Segarra 3ef43531c3 Merge pull request 'style: perf max-width rule' (!1270) from hotfix_checbox_css into master 
Reviewed-on: verdnatura/salix-front#1270
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-22 13:09:48 +00:00
Javier Segarra 0658785a9a style: perf max-width rule 2025-01-22 13:03:23 +00:00
Javier Segarra 4e0967a26c Merge pull request 'HOTFIX: use clientFk to filter data' (!1258) from hotfix_customerConsumption_clientFk into master 
Reviewed-on: verdnatura/salix-front#1258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 11:45:10 +00:00
Javier Segarra 61e410aa1d fix: use clientFk to filter data 2025-01-21 11:16:38 +00:00
Jorge Penadés a0fc8a528c Merge pull request '#8087 hotfix-addFilterFields' (!1257) from 8087-hotfix-addFilterFields into master 
Reviewed-on: verdnatura/salix-front#1257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 09:52:21 +00:00
Jorge Penadés ae507167b7 feat: refs #8087 add additional filter fields to TravelCard component 2025-01-21 10:43:44 +01:00
Carlos Satorres 836f40867c Merge pull request 'fix: refs #6896 hotfix search' (!1255) from 6896-hotfixOrdersSearch into master 
Reviewed-on: verdnatura/salix-front#1255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 08:25:53 +00:00
Alex Moreno e9555a6017 Merge branch 'master' into 6896-hotfixOrdersSearch 2025-01-21 07:52:20 +00:00
Jorge Penadés e1b329db34 Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master 
Reviewed-on: verdnatura/salix-front#1247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-20 14:42:57 +00:00
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete 2025-01-20 15:41:55 +01:00
Carlos Satorres d8edd443c7 fix: refs #6896 hotfix search 2025-01-20 14:11:42 +01:00
Carlos Satorres a3fe097970 Merge pull request 'fix: refs #6898 hotfix filter' (!1252) from 6898-hotfixFiscalData into master 
Reviewed-on: verdnatura/salix-front#1252
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 12:52:41 +00:00
Carlos Satorres 77857e9d31 Merge branch 'master' into 6898-hotfixFiscalData 2025-01-20 12:47:27 +00:00
Carlos Satorres c7b24adc5a fix: refs #6898 hotfix filter 2025-01-20 13:39:56 +01:00
Javier Segarra 1f2746ac18 Merge pull request 'Remove space checkbox when is not hover' (!1002) from hotfix_checbox_css into master 
Reviewed-on: verdnatura/salix-front#1002
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-20 12:28:13 +00:00
Jorge Penadés bdae839e50 fix: refs #7936 toggle option 2025-01-20 12:56:40 +01:00
Javier Segarra c3203b18e7 Merge branch 'master' into hotfix_checbox_css 2025-01-20 11:17:58 +00:00
Carlos Satorres c333428389 Merge pull request 'fix: fix ticketSale quantity' (!1251) from hotfix-7356ticketSale into master 
Reviewed-on: verdnatura/salix-front#1251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-20 11:11:48 +00:00
Carlos Satorres a3cdb18535 fix: fix use-like 2025-01-20 12:04:59 +01:00
Jorge Penadés ae68f25c3c fix: refs #7936 rollback 2025-01-20 11:55:49 +01:00
Jorge Penadés ff95882e42 fix: refs #7936 rollback 2025-01-20 11:51:53 +01:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity 2025-01-20 11:26:57 +01:00
Jorge Penadés 8843318b66 fix: refs #7936 update select model-value WIP 2025-01-20 10:10:45 +01:00
Jon Elias b447df7217 Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master 
Reviewed-on: verdnatura/salix-front#1245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 07:07:30 +00:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale 2025-01-20 07:06:14 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order 2025-01-20 08:01:46 +01:00
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css 2025-01-17 12:33:37 +01:00
Javier Segarra 04bbf9e9d7 Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master 
Reviewed-on: verdnatura/salix-front#1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-17 09:05:46 +00:00
Javier Segarra 3ab3f146d4 feat: add acl in description button 2025-01-16 12:45:24 +01:00
Jorge Penadés b89293a9a3 Merge pull request 'fix: refs #7936 allow negative values' (!1226) from 7936-hotfix-allowNegative into master 
Reviewed-on: verdnatura/salix-front#1226
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-16 11:37:55 +00:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative 2025-01-16 11:06:49 +00:00
Pablo Natek cc7f16b635 Merge pull request 'fix: refs #8407 close date and time popups on keydown' (!1229) from 8407-fixVnInputDate into master 
Reviewed-on: verdnatura/salix-front#1229
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-16 11:01:35 +00:00
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown 2025-01-16 11:59:08 +01:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative 2025-01-16 09:53:13 +01:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values 2025-01-16 09:45:15 +01:00
Jorge Penadés 6ca732986d Merge pull request 'hotfix: #7323 catch mail err' (!1225) from hotfix-7323-catchMailErr into master 
Reviewed-on: verdnatura/salix-front#1225
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-16 08:38:06 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err 2025-01-15 16:10:33 +01:00
Jon Elias 1f76d572ce Merge pull request 'Hotfix[CustomerDescriptor]: Fixed icons in descriptor' (!1217) from Hotfix-CustomerDescriptorIcons into master 
Reviewed-on: verdnatura/salix-front#1217
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-15 08:23:56 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 08:22:56 +00:00
Pablo Natek 4183ad3fa0 Merge pull request 'fix: update SIM serial number binding in WorkerPda.vue' (!1221) from hotFixWorkerPda into master 
Reviewed-on: verdnatura/salix-front#1221
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 07:25:18 +00:00
Pablo Natek a7fd073886 fix: update SIM serial number binding in WorkerPda.vue 2025-01-15 08:23:44 +01:00