wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
6,701 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

6701 Commits

Author SHA1 Message Date
Jon Elias 1fc2ae0689 Merge branch 'master' into Hotfix-TicketList 2024-11-15 10:53:53 +00:00
Jon Elias eb287696fa fix: fixed state column in ticket list 2024-11-15 11:49:46 +01:00
Javier Segarra c57ff7b3c9 Merge pull request 'HOTFIX: Customer Risk color' (!942) from hotFix_customerRisk_icon into master 
Reviewed-on: verdnatura/salix-front#942
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 10:32:35 +00:00
Javier Segarra d3f538e37c perf: previous commit 2024-11-15 10:27:37 +00:00
Javier Segarra d52a0fdc7f fix: customer Risk icon color 2024-11-15 10:23:57 +00:00
Javier Segarra 0a239e8c43 Merge pull request 'HOTFIX: customerFilter sales person input' (!939) from hotfix_customer_salesPerson_Filter into master 
Reviewed-on: verdnatura/salix-front#939
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-14 15:26:44 +00:00
Javier Segarra ca0d70933e Merge branch 'master' into hotfix_customer_salesPerson_Filter 2024-11-14 15:26:00 +00:00
Javier Segarra 64c884693d Merge pull request 'HOTFIX #8192 Filter termopragh' (!934) from hotfix_termograph_filter into master 
Reviewed-on: verdnatura/salix-front#934
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-14 15:21:20 +00:00
Javier Segarra cb1c050343 fix: customerFilter sales person input 2024-11-14 16:18:22 +01:00
Javier Segarra e6ba0c7c30 Merge branch 'master' into hotfix_termograph_filter 2024-11-14 14:56:30 +00:00
Alex Moreno 045a828bf9 fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:59:04 +01:00
Alex Moreno a929dec2ab fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:42:46 +01:00
Javier Segarra c4cad9b7bb Merge branch 'master' into hotfix_termograph_filter 2024-11-14 12:27:57 +00:00
Javier Segarra 84414df487 Merge branch 'hotfix_termograph_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_termograph_filter 2024-11-14 13:27:41 +01:00
Javier Segarra aa5eb005fd feat: #8192 remove expr-builder proposal 2024-11-14 13:27:38 +01:00
Alex Moreno 925ff859cc fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 13:01:56 +01:00
Javier Segarra 259f0e30af Merge branch 'master' into hotfix_termograph_filter 2024-11-14 11:59:33 +00:00
Javier Segarra faf307bc16 fix: #8192 find by thermographFk instead id 2024-11-14 12:59:18 +01:00
Alex Moreno 218d041000 fix(ZoneCard): fix ZoneLocations redirections 2024-11-14 12:58:41 +01:00
Alex Moreno 55b4c07e80 fix(ZoneCard): fix ZoneLocations searchbar 2024-11-14 12:33:44 +01:00
Alex Moreno c65f15d0f0 fix(Zone): if route is null 2024-11-14 12:18:39 +01:00
Jon Elias eecf8beb7a Merge pull request 'Hotfix: allow decimal numbers when creating a purchase request' (!927) from Hotfix-CreateRequest into master 
Reviewed-on: verdnatura/salix-front#927
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 13:18:48 +00:00
Jon Elias bcb777d4bc Merge branch 'master' into Hotfix-CreateRequest 2024-11-13 13:18:00 +00:00
Javier Segarra 9afbcd5cea Merge pull request 'fix: customer last tickets' (!926) from fixCustomerSumarryLastTickets into master 
Reviewed-on: verdnatura/salix-front#926
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-13 12:56:24 +00:00
Pablo Natek ddfea42c62 fix: add click stop on descriptorProxis 2024-11-13 13:51:37 +01:00
Jon Elias 75c33dabf1 Merge branch 'master' into Hotfix-CreateRequest 2024-11-13 12:41:40 +00:00
Jon Elias 244c23be1d fix: allow decimal numbers when creating a purchase request 2024-11-13 13:40:19 +01:00
Pablo Natek 1c5a02fe52 fix: customer last tickets 2024-11-13 13:17:15 +01:00
Pablo Natek 8d296daf1e Merge pull request 'fix: refs #7404 some filter issues' (!921) from 7404-fixFilterIsssues into master 
Reviewed-on: verdnatura/salix-front#921
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 11:25:31 +00:00
Pablo Natek bccfb161e6 Merge branch 'master' into 7404-fixFilterIsssues 2024-11-13 11:24:25 +00:00
Jorge Penadés 76187f00a1 Merge pull request 'feat: add city name' (!925) from 7354-hotfix-showCity into master 
Reviewed-on: verdnatura/salix-front#925
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 11:23:17 +00:00
Jorge Penadés b68868e103 feat: add city name 2024-11-13 12:11:15 +01:00
Pablo Natek f93532d5b7 Merge pull request 'hotfixZoneFilter' (!922) from hotfixZoneFilter into master 
Reviewed-on: verdnatura/salix-front#922
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-13 09:22:15 +00:00
Pablo Natek 178753ddcc fix: add scope fields on filter 2024-11-13 10:11:14 +01:00
Pablo Natek 8eb76cd0fc fix: url name 2024-11-13 10:00:04 +01:00
Pablo Natek 81927c5af5 fix: zoneFilter 2024-11-13 09:58:41 +01:00
Pablo Natek 5c59ae8217 fix: refs #7404 some filter issues 2024-11-13 09:12:51 +01:00
Jorge Penadés 679107d7ea Merge pull request 'fix: refs #7354 redirect to ticket' (!917) from 7354-hotfix-redirectToTicket into master 
Reviewed-on: verdnatura/salix-front#917
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 12:47:35 +00:00
Jorge Penadés 18f544f8dc fix: refs #7354 redirect to ticket 2024-11-12 13:23:28 +01:00
Jorge Penadés 1554333e07 Merge pull request 'fix: refs #7354 zip filter' (!916) from 7354-hotfix-zipFilter into master 
Reviewed-on: verdnatura/salix-front#916
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-12 11:53:41 +00:00
Jorge Penadés db8340bde5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354-hotfix-zipFilter 2024-11-12 12:51:09 +01:00
Alex Moreno 26af102804 fix(CreateThermographForm): remove limit 2024-11-12 12:47:30 +01:00
Jorge Penadés 2afddeb063 fix: refs #7354 zip filter 2024-11-12 12:41:10 +01:00
Javier Segarra a76d63ff00 Merge pull request 'HOTFIX: Send SMS using mobile instead phone' (!914) from hotFix-customer_sms into master 
Reviewed-on: verdnatura/salix-front#914
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-12 11:13:32 +00:00
Javier Segarra 2139b7e8e8 Merge branch 'master' into hotFix-customer_sms 2024-11-12 11:12:46 +00:00
Carlos Satorres d8ae6c056e Merge pull request 'fix: fix termo' (!915) from hotfix-termog into master 
Reviewed-on: verdnatura/salix-front#915
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-12 11:09:41 +00:00
Carlos Satorres fefa61ea5c fix: fix termo 2024-11-12 12:07:02 +01:00
Javier Segarra 6355993c14 fix: mobile is more relevant than phone 2024-11-12 11:00:05 +00:00
Alex Moreno 95b6e72e6c Merge pull request 'HOTFIX(CustomerBalance): getClientRisk' (!912) from hotFix_customer_balance into master 
Reviewed-on: verdnatura/salix-front#912
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-12 09:27:54 +00:00
Alex Moreno 700fb7481b fix(CustomerBalance): getClientRisk 2024-11-12 10:15:31 +01:00