Carlos Satorres
|
9e653b8c2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs
|
2024-11-13 14:05:57 +01: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 |
Jorge Penadés
|
7dba1a1846
|
Merge pull request 'feat: refs #6818 add icon' (!924) from 6818-addIcon into dev
Reviewed-on: verdnatura/salix-front#924
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-13 11:01:40 +00:00 |
Jorge Penadés
|
9291c4dd6a
|
feat: refs #6818 add icon
|
2024-11-13 11:50:08 +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 |
Jorge Penadés
|
d474fb924f
|
Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev
Reviewed-on: verdnatura/salix-front#904
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-13 08:25:27 +00:00 |
Jorge Penadés
|
96e9de519f
|
Merge branch 'dev' into 6818-saySimpleIntegration
|
2024-11-13 08:22:44 +00:00 |
Pablo Natek
|
5c59ae8217
|
fix: refs #7404 some filter issues
|
2024-11-13 09:12:51 +01:00 |
Alex Moreno
|
1f8ead608c
|
Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev
Reviewed-on: verdnatura/salix-front#918
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-13 06:48:55 +00:00 |
Alex Moreno
|
2ae9d68fec
|
Merge branch 'dev' into warmFix_order_equalSalix
|
2024-11-13 06:21:59 +00:00 |
Alex Moreno
|
8269037faa
|
chore: perf
|
2024-11-13 07:21:42 +01:00 |
Guillermo Bonet
|
8db3ab4d47
|
Merge branch 'dev' into 7950-cmrModelUnify
|
2024-11-13 06:13:23 +00:00 |
Jorge Penadés
|
83be57a0c4
|
chore: refs #6818 drop useless code & comment
|
2024-11-12 15:01:17 +01:00 |
Jorge Penadés
|
e29cd38ae9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration
|
2024-11-12 15:00:18 +01:00 |
Alex Moreno
|
fc28639556
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-11-12 14:40:42 +01:00 |
Alex Moreno
|
3f15c3cce0
|
feat(VnSelect): order data equal salix
|
2024-11-12 14:35:55 +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
|
86b8f9bf54
|
Merge pull request 'feat: refs #6919 sync entry data' (!913) from 6919-reactiveDescriptor into dev
Reviewed-on: verdnatura/salix-front#913
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-12 12:37:39 +00:00 |
Jorge Penadés
|
90f04cc010
|
Merge branch 'dev' into 6919-reactiveDescriptor
|
2024-11-12 12:36:48 +00:00 |
Jorge Penadés
|
18f544f8dc
|
fix: refs #7354 redirect to ticket
|
2024-11-12 13:23:28 +01:00 |
Javier Segarra
|
830c3658d4
|
Merge pull request 'fix/OrderCatalog' (!893) from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev
Reviewed-on: verdnatura/salix-front#893
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-12 12:01:43 +00: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
|
a7d53fcbe6
|
Merge branch 'dev' into fix/OrderCatalog
|
2024-11-12 11:30:36 +00: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 |
Jorge Penadés
|
b4d7653661
|
refactor: refs #6919 export filter
|
2024-11-12 11:15:34 +01:00 |
Jorge Penadés
|
efd66ea02a
|
feat: refs #6919 sync entry data
|
2024-11-12 11:08:45 +01: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 |
Jorge Penadés
|
81b35aa75b
|
chore: refs #6818 add spaces
|
2024-11-12 10:11:26 +01:00 |
Jorge Penadés
|
700701f055
|
refactor: refs #6818 channel logic
|
2024-11-12 10:10:26 +01:00 |
Jorge Penadés
|
c775ba8592
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration
|
2024-11-12 09:45:05 +01:00 |
Jorge Penadés
|
cc12250109
|
Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev
Reviewed-on: verdnatura/salix-front#910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-12 08:35:42 +00:00 |