6119 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Jon Elias	7874db1647	fix: zone delivery postcodes filter and order catalog type filter	2024-10-04 09:58:23 +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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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: #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
Alex Moreno	9a11f94922	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2	2024-09-25 13:17:34 +02:00
Alex Moreno	f04beb8f90	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-25 12:52:58 +02:00
Jorge Penadés	0dec6edc68	Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master ... Reviewed-on: #757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:48:16 +00:00
Jorge Penadés	aab428494e	fix: refs #6898 add role	2024-09-25 12:40:22 +02:00
Javier Segarra	357f3ba308	Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test ... Reviewed-on: #756 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:26:14 +00:00
Jorge Penadés	d2996f0838	fix: refs #6943 prevent null	2024-09-25 12:23:41 +02:00
Javier Segarra	53d5d123c2	feat: i18n	2024-09-25 11:36:44 +02:00
Javier Segarra	fb180f0198	fix: apply order	2024-09-25 11:31:05 +02:00
Javier Segarra	77ad96a58b	fix: itemfixedPrice inputs	2024-09-25 11:30:18 +02:00
Alex Moreno	991ad21c77	fix: refs #7155 remove userParams in watcher	2024-09-24 13:16:34 +02:00