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

3012 Commits

Author SHA1 Message Date
Javier Segarra 74eec098ac Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-23 07:49:35 +02:00
Alex Moreno 20ec141237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-23 07:39:15 +02:00
Jon Elias 781e863aca Merge branch 'dev' into 7239-changeTranslations 2024-04-23 05:16:34 +00:00
Jon Elias 87ce1f0217 Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations 2024-04-23 07:15:41 +02:00
Jon Elias 4ddcbaeacd refactor: refs #7239 fixed errors 2024-04-23 07:15:39 +02:00
Pablo Natek 663c093a00 feat: refs #4988 agency e2e 2024-04-22 18:17:01 +02:00
Jorge Penadés 3abc504158 fix: unit test 2024-04-22 16:35:34 +02:00
William Buezas e11625e05f set columns default attrs to avoid repeating code 2024-04-22 11:30:16 -03:00
Javier Segarra 13a46be85b fix: tests 2024-04-22 15:18:15 +02:00
Alex Moreno 952d5bf543 fix(VnNotes): refs #6336 VnAvatar 2024-04-22 15:03:10 +02:00
Alex Moreno 72deeab2ef Merge branch 'dev' into warmFix_hasMoreData 2024-04-22 13:01:28 +00:00
Javier Segarra 036dcaadd2 Merge pull request 'bugfix/SupplierConsumptionDateRanges' (!312) from hyervoni/salix-front-mindshore:bugfix/SupplierConsumptionDateRanges into dev 
Reviewed-on: verdnatura/salix-front#312
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-22 12:48:00 +00:00
William Buezas c9767e7b1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges 2024-04-22 09:45:01 -03:00
William Buezas dce48b536d Change in newPrice assign 2024-04-22 09:42:28 -03:00
William Buezas 2105d7870b Refactor isBigger and isLower 2024-04-22 09:38:16 -03:00
Alex Moreno 9d381a5c82 Merge pull request 'fix(VnNotes): refs #6336 fix v-for key' (!310) from 6336_fix_vn_notes_key into dev 
Reviewed-on: verdnatura/salix-front#310
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-04-22 12:09:19 +00:00
William Buezas 1398a146ff Change restOfData to restOfItem 2024-04-22 09:07:48 -03:00
William Buezas 7dac6ba910 Remove unused imports 2024-04-22 09:02:35 -03:00
William Buezas 64fc02e33b Fix supplier consumption disabled buttons 2024-04-22 09:00:57 -03:00
William Buezas 78561c5f42 Item types 2024-04-22 08:34:38 -03:00
Jon Elias 2e493258fd Merge branch 'dev' into 7239-changeTranslations 2024-04-22 11:19:15 +00:00
Jon Elias dd74c7d507 refactor: refs #7239 changed translations 2024-04-22 13:17:22 +02:00
Jorge Penadés 1f391dc49b fix: skip 2024-04-22 13:17:05 +02:00
Jorge Penadés 80844e7869 fix: hasMoreData 2024-04-22 12:53:09 +02:00
Pablo Natek 43aadd4fc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-22 12:22:04 +02:00
Pablo Natek 6b4cb4ed12 feat: refs #4988 add agency section 2024-04-22 12:19:22 +02:00
Carlos Satorres d2ec47fe1c refs #6976 total Stems 2024-04-22 11:25:32 +02:00
Jon Elias 3b8761dc7c refactor: refs #6899 moved css to app.scss 2024-04-22 11:21:28 +02:00
Jon Elias ab61a68f28 refactor: refs #6899 moved css to app.scss 2024-04-22 11:20:25 +02:00
Alex Moreno 4a5285358c fix(VnNotes): refs #6336 restore index in key 2024-04-22 09:46:40 +02:00
Alex Moreno 918ce0dc86 fix(VnNotes): refs #6336 remove index in key 2024-04-22 09:38:38 +02:00
Jorge Penadés 9a3f714290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData 2024-04-22 08:57:26 +02:00
Alex Moreno 99af402281 fix(VnNotes): refs #6336 fix v-for key 2024-04-22 08:42:38 +02:00
Jon Elias 3c2f281e0a Merge branch 'dev' into 6899-endInvoiceOutMigration 2024-04-22 06:00:26 +00:00
Alex Moreno 3eb5041bf5 fix: refs #6590 remove unnecessary import 2024-04-22 07:50:34 +02:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-22 07:38:07 +02:00
Javier Segarra 2b24e18f75 FEAT: SETiNTERVAL WITH RENEWpERIOD 2024-04-22 07:37:35 +02:00
Javier Segarra c1f64b88b4 Merge pull request 'FIX Merge PR-CUSTOMER' (!309) from fix_Customer_merge into dev 
Reviewed-on: verdnatura/salix-front#309
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-22 05:04:51 +00:00
Javier Segarra edd1b66110 fix: merge toDateHourMin 2024-04-21 16:09:21 +02:00
Javier Segarra ea4f72abf9 Merge pull request 'PR-CUSTOMER' (!186) from hyervoni/salix-front-mindshore:PR-CUSTOMER into dev 
Reviewed-on: verdnatura/salix-front#186
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-19 15:55:52 +00:00
William Buezas d5832eaf41 improvement 2024-04-19 12:52:45 -03:00
William Buezas 9212e53905 resolve conflicts 2024-04-19 12:48:07 -03:00
William Buezas 3f5c711fa1 Improvements 2024-04-19 12:26:49 -03:00
Jorge Penadés 4f5c8ef0f6 fix: tests 2024-04-19 16:15:10 +02:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Alex Moreno ae2737673d fix: hasMoreData 2024-04-19 14:43:38 +02:00
Alex Moreno c638209f0e fix: hasMoreData 2024-04-19 14:39:20 +02:00
Jon Elias cfe03aeffa Merge branch 'dev' into 6899-endInvoiceOutMigration 2024-04-19 12:31:47 +00:00
Jorge Penadés 7a4f975cc9 fix: refs #6480 fix warning 2024-04-19 13:52:19 +02:00
Jorge Penadés bd539449a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-19 13:33:47 +02:00