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

6129 Commits

Author SHA1 Message Date
Carlos Satorres e396cd0cac hotfix: routePrice null 2024-10-07 12:16:32 +02:00
Carlos Satorres f22809d609 Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master 
Reviewed-on: verdnatura/salix-front#808
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-07 07:54:07 +00:00
Carlos Satorres 27e6dd5bf1 Merge branch 'master' into 6898-hotfixSupplierAgency 2024-10-07 07:51:02 +00:00
Carlos Satorres 5d65d3e20c refs #6898 hotfix agency 2024-10-07 09:48:57 +02:00
Javier Segarra c9467b5286 Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master 
Reviewed-on: verdnatura/salix-front#799
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-05 09:02:46 +00:00
Javier Segarra 04b2a4d9ce perf: clean warnings 2024-10-05 00:31:41 +02:00
Javier Segarra c3c2528342 feat: #7356 improve NotesSummary 2024-10-05 00:31:32 +02:00
Jon Elias e4e60abe0e Merge branch 'master' into Hotfix-ZoneOrderFilters 2024-10-04 12:25:49 +00:00
Jon Elias 3a21f6aadb fix: order catalog 2024-10-04 14:22:00 +02:00
Jon Elias 195747b5a0 feat: added click and transfer tickets and deleted useless code 2024-10-04 12:34:37 +02:00
Carlos Satorres 45c8f6f4c5 Merge pull request 'refs #7355 fix searchbar' (!797) from hotfix-AccountSearchbar into master 
Reviewed-on: verdnatura/salix-front#797
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 10:09:53 +00:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter 2024-10-04 09:58:23 +02:00
Carlos Satorres 530ed4b716 refs #7355 fix searchbar 2024-10-04 08:48:36 +02:00
Javi Gallego df64814c57 fix: hotfix refund invoice 2024-10-03 08:31:13 +02:00
Alex Moreno 58a94599a9 Merge pull request '8062-testToMaster_2' (!792) from 8062-testToMaster_2 into master 
Reviewed-on: verdnatura/salix-front#792
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-10-03 05:48:02 +00:00
Alex Moreno 8de5602564 chore: refs #8062 add changelog 2024-10-02 15:31:09 +02:00
Alex Moreno 9b90487b6a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-01 11:47:43 +02:00
Alex Moreno 2e9a8d9205 fix(WorkerList): add type email 2024-10-01 11:47:31 +02:00
Alex Moreno 90853396ba Merge pull request 'fix #6898 SupplierFiscalData show fields' (!778) from hotfix_supplierFiscalData into master 
Reviewed-on: verdnatura/salix-front#778
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 13:16:11 +00:00
Javier Segarra 03450a86fb fix: SupplierFiscalData show data printing 2024-09-30 13:13:35 +00:00
Javier Segarra 4d4554a6ca fix(lilium): #6898 SupplierFiscalData show fields 2024-09-30 15:11:22 +02:00
Alex Moreno 732bb0943c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-30 15:03:11 +02:00
Alex Moreno 35179695c3 Merge pull request 'fix: solve conflicts from master to test' (!777) from mergeConflicts into test 
Reviewed-on: verdnatura/salix-front#777
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 13:02:14 +00:00
Javier Segarra 2302e22f11 fix: solve conflicts from master to test 2024-09-30 15:00:05 +02:00
Javier Segarra 48b7b879f2 Merge pull request 'Imrpove VnLocation to show less fields' (!738) from fix_8018 into master 
Reviewed-on: verdnatura/salix-front#738
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 11:14:30 +00:00
Javier Segarra 2812e6f456 Merge branch 'master' into fix_8018 2024-09-30 11:13:20 +00:00
Javier Segarra 36838f930c Merge pull request 'fix: onDataSaved VnTable' (!772) from fix_vnTable_onDataSaved into master 
Reviewed-on: verdnatura/salix-front#772
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-30 05:20:22 +00:00
Pablo Natek e5eb1d7663 Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test 
Reviewed-on: verdnatura/salix-front#771
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-30 05:18:36 +00:00
Pablo Natek f005674db6 Merge branch 'test' into 7404-remove-from-test 2024-09-30 05:17:08 +00:00
Javier Segarra 8356be1ec0 fix: onDataSaved VnTable 
Habia un problema al usar this en entorno no local
 2024-09-27 18:10:43 +00:00
Javier Segarra 5097cc8b81 Merge pull request 'fix: #6943 show nickname salesPerson' (!766) from warmfix_customerModule into test 
Reviewed-on: verdnatura/salix-front#766
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-27 11:37:03 +00:00
Pablo Natek 336f2ba89e fix: refs #7404 remove from test 2024-09-27 12:41:00 +02:00
Pablo Natek 193670fdcf fix: refs #7404 revert commit prevent production access 2024-09-27 12:39:30 +02:00
Jon Elias 45c0d0ae3f Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master 
Reviewed-on: verdnatura/salix-front#770
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-27 08:08:45 +00:00
Jorge Penadés b541ce4e56 fix: split params 2024-09-27 09:59:18 +02:00
Javier Segarra 2990d32705 fix: grafana url 2024-09-27 07:56:50 +00:00
Jon Elias 2be969339e Merge branch 'master' into Hotfix-ChangeTicketState 2024-09-27 07:26:16 +00:00
Jon Elias 6b0a0f71ce fix: fixed change state function 2024-09-27 08:24:58 +02:00
Javier Segarra 807827c97c Merge branch 'test' into warmfix_customerModule 2024-09-26 16:25:27 +00:00
Javier Segarra d5253149ed Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test 
Reviewed-on: verdnatura/salix-front#768
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-26 16:21:48 +00:00
Jorge Penadés 353116a7a0 fix: split params 2024-09-26 15:49:12 +02:00
Javier Segarra bbf3b6d4b7 fix: #6943 show nickname salesPerson 2024-09-26 12:29:03 +00:00
Alex Moreno f00db79d47 fix(VnTable): header background-color 2024-09-26 14:14:27 +02:00
Jorge Penadés 2057189b8e Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master 
Reviewed-on: verdnatura/salix-front#764
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-09-26 11:03:36 +00:00
Jorge Penadés c5766aa1b3 chore: refs #7524 remove old filter 2024-09-26 12:38:03 +02:00
Javier Segarra 0b47623011 Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master 
Reviewed-on: verdnatura/salix-front#755
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-25 21:15:35 +00:00
Javier Segarra a8c96278de Merge branch 'master' into hotfix_itemFixedPrice 2024-09-25 21:04:13 +00:00
Alex Moreno 5f4df6eb96 Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test 
Reviewed-on: verdnatura/salix-front#759
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-09-25 11:27:25 +00:00
Alex Moreno bcada72f04 fix: refs #7155 use chip-locale 2024-09-25 13:24:22 +02:00
Alex Moreno 6bd2835c59 chore: refs #7155 typo 2024-09-25 13:18:26 +02:00