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

8720 Commits

Author SHA1 Message Date
Alex Moreno 5d6c14f4d7 fix(fixedPrice): hotFix subtoolbar 2025-01-28 08:01:01 +01:00
Alex Moreno afee23b99d Merge pull request '8452-testToMaster' (!1292) from 8452-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1292
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-28 06:44:16 +00:00
Alex Moreno a0a7ef6734 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8452-testToMaster 2025-01-28 07:17:43 +01:00
Alex Moreno 8b916016c6 Merge pull request 'warmifx: Customer_filters' (!1131) from warmifx_customer_filters into test 
Reviewed-on: verdnatura/salix-front#1131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-28 06:17:30 +00:00
Javier Segarra e923ebcc72 Merge branch 'test' into warmifx_customer_filters 2025-01-27 18:05:16 +00:00
Alex Moreno d3e6462aed build: refs #8452 add change log 2025-01-27 15:24:08 +01:00
Alex Moreno b0420ee2b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-27 14:37:57 +01:00
Javier Segarra ba3f6a79e6 style: customerList 2025-01-27 14:31:54 +01:00
Javier Segarra b266c44d34 fix: sage params 2025-01-27 14:30:59 +01:00
Javier Segarra 8cbb97af29 Merge branch 'test' into warmifx_customer_filters 2025-01-27 14:08:59 +01:00
Javier Segarra 0916afbe37 fix: changel i18n 2025-01-27 14:04:37 +01:00
Javier Segarra 9dd216269a fix: vnSelectWorker fix template 2025-01-27 14:03:38 +01:00
Javier Segarra d1ba6e580f fix: params 2025-01-27 13:52:44 +01:00
Javier Segarra 13cd59c6bb fix: socialName filter 2025-01-27 13:52:37 +01:00
Alex Moreno 1322dad63d fix(VnCardBeta): add userFilter 2025-01-27 08:29:42 +01:00
Alex Moreno 198db0df49 fix(VnCardBeta): add userFilter 2025-01-27 08:23:09 +01:00
Javier Segarra c556a8b82d Merge pull request 'fix: use right endpoint for CustomerList' (!1283) from hotfix_customerExtendedList into master 
Reviewed-on: verdnatura/salix-front#1283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-24 14:41:20 +00:00
Javier Segarra fb5b347bb6 fix: use right endpoint for CustomerList 2025-01-24 15:38:47 +01:00
Alex Moreno f7b1d7bd37 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-24 11:47:13 +01:00
Alex Moreno 658747d479 fix: empty store.order 2025-01-24 11:45:03 +01:00
Alex Moreno e6279ff261 build: merge master in test 2025-01-24 08:38:24 +01:00
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
Jon Elias 3b0d0afddb Merge pull request 'Warmfix[WorkerDescriptor]: link to DepartmentDescriptor' (!1269) from Warmfix-WorkerDescriptorLink into test 
Reviewed-on: verdnatura/salix-front#1269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-22 10:03:34 +00:00
Jon Elias bb2c3fef51 fix: department descriptor link 2025-01-22 09:36:56 +01: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
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test 
Reviewed-on: verdnatura/salix-front#1254
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-21 10:44:45 +00:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie 2025-01-21 10:58:46 +01: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
Jon Elias 96d1ef7f68 fix: refs #8448 e2e 2025-01-21 10:48:04 +01: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
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev 
Reviewed-on: verdnatura/salix-front#1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:50:57 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-21 06:49:28 +00:00
Javi Gallego 590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev 
Reviewed-on: verdnatura/salix-front#1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:48:30 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales 2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 3cb21d7117 fix: use entryFilter 2025-01-21 07:34:48 +01:00