17377 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	dc93328bcf	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-19 18:24:04 +02:00
Pablo Natek	07fa011035	fix(updateClaim): el spec daba error refs #5979	2023-10-19 18:24:03 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	d3a7b4ecb9	remove: console.log from updateClaim refs #5979	2023-10-19 08:41:26 +02:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	a84f6fe1da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-18 12:05:04 +02:00
Alex Moreno	002329b0a1	refs 6199 add quantityLessThanMin translation	2023-10-18 12:04:37 +02:00
Carlos Andrés	92e76a6d44	Merge pull request 'refs #6199 fix(sale_hook): fix quantity case' (!1797) from 6119-better_sale_hook into test ... Reviewed-on: #1797 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-17 13:34:26 +00:00
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Alex Moreno	dbb2372cd3	Merge pull request 'hotFix: workerTimeControl' (!1796) from hotFix_workeTimeControl_sendMail into master ... Reviewed-on: #1796 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-10-17 07:03:02 +00:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	afe4c676fc	fix(url): la ulr termina con / no es necesario añadir el texto	2023-10-16 18:38:33 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Alex Moreno	a6437f8024	Merge pull request '6199---Cantidad-mínima-back' (!1790) from 6199---Cantidad-mínima-back into test ... Reviewed-on: #1790 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-10-16 10:26:37 +00:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Alex Moreno	ce64d5f0c4	Merge pull request 'hotFix: delete getCurrentWorkerMana' (!1791) from hotFix_delete_getCurrentWorkerMana into master ... Reviewed-on: #1791 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-16 07:06:02 +00:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Alex Moreno	f00a4e63a6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back	2023-10-13 13:08:54 +02:00
Alex Moreno	2250fca6bb	Merge pull request 'refs #6199 Added minQuantity in item' (!1786) from 6199-minQuantity into test ... Reviewed-on: #1786 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-13 11:06:49 +00:00
Guillermo Bonet	e1c1d1a556	refs #6199 Fixed tests	2023-10-13 12:33:39 +02:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Alex Moreno	fa90132934	refs #6199 fix(orderCatalogView): html and css	2023-10-13 10:23:48 +02:00
Guillermo Bonet	7367656a35	refs #6199 Requested changes	2023-10-13 09:02:40 +02:00
Carlos Satorres	0007843394	Merge pull request 'refs #6293 traducción' (!1787) from 6293-hotfixRounding into master ... Reviewed-on: #1787 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-11 10:26:39 +00:00
Carlos Satorres	0023561acb	refs #6293 traducción	2023-10-11 12:04:12 +02:00
Guillermo Bonet	6b1dded222	refs #6199 Requested change, position of input	2023-10-11 08:28:52 +02:00
Guillermo Bonet	d41233efaf	refs #6199 Requested change, name of color	2023-10-11 07:59:05 +02:00
Guillermo Bonet	2b41bf7eb1	refs #6199 Requested changes	2023-10-11 07:39:41 +02:00
Guillermo Bonet	d2ce920f13	refs #6199 Added minQuantity in catalog and more	2023-10-10 13:49:11 +02:00
Carlos Satorres	93db2663a8	Merge pull request 'hotfix length sales' (!1785) from 4764-hotfixServices into master ... Reviewed-on: #1785 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-10 10:33:00 +00:00
Guillermo Bonet	03afea3b8e	refs #6199 Added minQuantity in item	2023-10-10 10:51:02 +02:00
Carlos Satorres	1adfa33a9a	hotfix length sales	2023-10-06 14:52:30 +02:00
Carlos Satorres	dea3bb7a98	Merge pull request 'refs #6282 left join' (!1784) from 6282-hotfixFreeLancer into master ... Reviewed-on: #1784 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-06 05:43:02 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Carlos Satorres	b8321c12c3	Merge pull request 'hotfix-change minus' (!1782) from hotfix-refundTicket into master ... Reviewed-on: #1782 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-06 05:02:51 +00:00
Carlos Satorres	62c7dc9db5	hotfix-change minus	2023-10-06 06:16:42 +02:00
Pablo Natek	e3d23c5c42	Merge pull request 'refs #4764 hotfix' (!1780) from 4764-ticketRefundhotFix into master ... Reviewed-on: #1780 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-05 13:46:29 +00:00
Pablo Natek	674fefeab5	refs #4764 ticket	2023-10-05 15:43:02 +02:00
Pablo Natek	2c2fa97631	refs #4764 ticketRefound	2023-10-05 15:35:59 +02:00
Pablo Natek	f52a6cb0c7	refs #4764 fixReport	2023-10-05 15:04:39 +02:00
Pablo Natek	f40185c2d4	refs #4764 hotfix	2023-10-05 14:24:52 +02:00
Alex Moreno	8d7eda5af3	refs #5673 fix: add development translation	2023-10-05 09:12:54 +02:00
Alex Moreno	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00