1527 Commits

Author	SHA1	Message	Date
Alex Moreno	e523b12536	fix: refs #7792 enable null	2024-09-18 09:50:55 +02:00
Alex Moreno	829ecba2ef	refactor: refs #7792 revert TwoFactorType	2024-09-18 08:30:05 +02:00
Guillermo Bonet	871d5457d0	refactor: refs #7882 Requested changes	2024-09-18 07:14:52 +02:00
Javier Segarra	96159224a4	Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf	2024-09-17 16:48:09 +02:00
Javi Gallego	06d06d7b1a	Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ... Reviewed-on: #2970 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 13:09:18 +00:00
Javi Gallego	e4a74ba0e9	feat: refs #3505 testBack closure	2024-09-16 13:24:33 +02:00
Pablo Natek	8f4f2d2d15	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 09:06:04 +02:00
Guillermo Bonet	9d9e0996f6	Merge branch 'dev' into 7882-quadMinds	2024-09-10 08:12:15 +02:00
Guillermo Bonet	ef4ea588ca	feat: refs #7882 Added volume and timeWindow	2024-09-10 07:43:11 +02:00
Javier Segarra	03d4427bcd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:16:15 +00:00
Alex Moreno	0949112b13	Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-09-09 12:42:13 +02:00
Alex Moreno	71eb44d083	refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey	2024-09-09 09:58:20 +02:00
Javier Segarra	59cce5d349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-08 12:31:39 +02:00
Pablo Natek	e20ef7c699	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-03 07:50:41 +02:00
Guillermo Bonet	b40ecf9e19	feat: refs #7882 Improved sendOrders and added more config params	2024-09-02 11:48:32 +02:00
Javi Gallego	e2f1fea6be	fix: refs #7277 error test	2024-08-30 17:04:45 +02:00
Guillermo Bonet	8165830934	feat: refs #7882 Now supports coords, address and long address	2024-08-30 12:30:40 +02:00
Guillermo Bonet	a25e619036	fix: refs #7882 Added send orders method	2024-08-29 14:48:21 +02:00
Guillermo Bonet	e4477ca109	fix: refs #7882 Stable version	2024-08-29 13:21:59 +02:00
Guillermo Bonet	4d820f1003	Merge branch 'test' into dev	2024-08-27 10:08:04 +02:00
Guillermo Bonet	2dc095e828	fix: refs #7811 Renew token crash	2024-08-27 10:07:09 +02:00
Guillermo Bonet	d2a61cf18d	Merge branch 'test' into dev	2024-08-27 07:24:38 +02:00
Guillermo Bonet	83f3a05721	fix: refs #7811 Tests	2024-08-27 07:24:10 +02:00
Guillermo Bonet	e9870be76f	Merge branch 'test' into dev	2024-08-26 12:14:38 +02:00
Guillermo Bonet	b6c0ff01bf	fix: refs #7811 Renew token crash	2024-08-26 12:04:03 +02:00
Guillermo Bonet	0610cbc32e	feat: refs #7882 Added model and method	2024-08-23 13:12:11 +02:00
Jorge Penadés	2aaad4316b	Merge branch 'dev' into 7524-limitSelect	2024-08-16 06:54:35 +00:00
Guillermo Bonet	8d35e95731	Merge branch 'test' into dev	2024-08-14 12:48:52 +02:00
Guillermo Bonet	5e0bf4c739	Merge branch 'master' into test	2024-08-14 12:48:22 +02:00
Guillermo Bonet	b268bf5eb7	feat: refs #7811 Added autorestart param pm2	2024-08-14 12:47:44 +02:00
Alex Moreno	ef1b4ef0a4	feat(update-user): refs #7848 add twoFactor	2024-08-13 12:30:37 +02:00
Alex Moreno	22ee4f1853	refactor: refs #7848 adapt to lilium	2024-08-13 12:30:12 +02:00
Jorge Penadés	3adb73cddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-12 15:38:40 +02:00
Alex Moreno	dd6aa6b1dd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 11:52:06 +02:00
Alex Moreno	c8f1b7c5ff	hotFix(validateCode): username comparation	2024-08-08 11:51:46 +02:00
Sergio De la torre	09d93caddb	Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev ... Reviewed-on: #2814 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 08:26:11 +00:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Alex Moreno	8580fa0849	hotFix(sendTwoFactor): fix code digits	2024-08-08 10:07:03 +02:00
Sergio De la torre	22c3a632e2	feat workerActivity refs #6078	2024-08-07 10:48:12 +02:00
Sergio De la torre	849989afa8	feat workerActivity refs #6078	2024-08-07 08:19:44 +02:00
Sergio De la torre	f9e9181637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6078_workerAct	2024-08-07 08:15:27 +02:00
Sergio De la torre	163faf983e	feat workerActivity refs #6078	2024-08-06 16:34:46 +02:00
Jorge Penadés	c31e33535d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-06 15:23:59 +02:00
Pablo Natek	f148635c68	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-08-05 15:41:41 +02:00
Pablo Natek	961fafb33e	feat: refs #7404 stockBought add and calculate	2024-08-05 15:32:36 +02:00
Alex Moreno	fd00bfd175	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-31 08:11:21 +02:00
Alex Moreno	eb135fc7f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-31 08:11:03 +02:00
Alex Moreno	707b45f9a6	Merge pull request '7679-postCode_town_addRequireds' (!2804) from 7679-postCode_town_addRequireds into master ... Reviewed-on: #2804 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-31 05:43:50 +00:00
Sergio De la torre	3c62046277	feat workerActivity refs #6078	2024-07-31 06:43:19 +02:00
Sergio De la torre	eec7790a02	Merge pull request 'test' (!2815) from test into dev ... Reviewed-on: #2815 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:13:13 +00:00
Sergio De la torre	57b87d527a	Merge pull request 'master' (!2813) from master into test ... Reviewed-on: #2813 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:07:18 +00:00
Sergio De la torre	59df0b3886	feat workerActivity refs #6078	2024-07-30 17:46:21 +02:00
Sergio De la torre	d97aba8e10	hotFix getTickets refs #6861	2024-07-30 17:28:55 +02:00
Guillermo Bonet	057174ae6a	Merge branch 'test' into dev	2024-07-30 13:53:58 +02:00
Guillermo Bonet	80ad1f30af	fix: refs #7811 Variables pm2	2024-07-30 13:50:47 +02:00
Sergio De la torre	eaa366ff39	feat workerActivity refs #6078	2024-07-30 12:36:02 +02:00
Alex Moreno	b17b5a1b21	test: fix postcode filter back test	2024-07-30 10:15:09 +02:00
Alex Moreno	2ac8760061	test: fix postcode filter back test	2024-07-30 10:13:32 +02:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +02:00
Alex Moreno	dbe0f4497c	fix(postcode_filter): add limit	2024-07-30 08:59:03 +02:00
Alex Moreno	434dfe4ae4	fix: refs #7679 postcode filter	2024-07-29 15:03:40 +02:00
Jorge Penadés	254cced550	chore: refs #6989 add config model	2024-07-29 13:40:30 +02:00
Alex Moreno	5264d6c973	feat(postcode_town): refs #7679 add requireds	2024-07-29 10:35:01 +02:00
Guillermo Bonet	95b61ae86a	Merge branch 'test' into dev	2024-07-25 13:29:42 +02:00
Guillermo Bonet	9e18a208b2	fix: refs #7662 get value for proc with select for updates	2024-07-25 13:26:45 +02:00
Pablo Natek	81120df4e4	feat: refs #6403 default mobile	2024-07-25 09:57:56 +02:00
Alex Moreno	808c09643f	remove console.log	2024-07-24 12:05:26 +02:00
Alex Moreno	ebac416034	remove console.log	2024-07-24 12:03:47 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00
Pablo Natek	bdfaf02c95	fix: refs #6403 fix delivery observation	2024-07-23 13:36:52 +02:00
Pablo Natek	80b338228e	fix: refs #6403 take observation from ticket	2024-07-23 12:29:08 +02:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Alex Moreno	eb413af275	hotFix: collection assign	2024-07-23 10:48:12 +02:00
Guillermo Bonet	bc49600e21	Merge branch 'test' into dev	2024-07-23 10:24:47 +02:00
Guillermo Bonet	fa10376bea	fix: refs #7662 assign	2024-07-23 10:21:09 +02:00
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Alex Moreno	b8244b48e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:08:47 +02:00
Guillermo Bonet	69a8b8ef49	fix: refs #7511 Minor change	2024-07-19 08:34:25 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Javier Segarra	304405a8a3	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-18 15:21:12 +02:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Pablo Natek	409daaf584	feat: refs #6403 add address mobile	2024-07-18 10:13:21 +02:00
Alex Moreno	ae2ddcb8c7	add console.log	2024-07-17 12:20:58 +02:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Alex Moreno	563c70c65d	fix(cancelShipment): fix	2024-07-17 11:18:12 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02:00
Pablo Natek	d2f022ab64	Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix	2024-07-16 11:44:54 +00:00
Pablo Natek	9e007bfb8a	fix: refs #6403 fix mrw cancel shipment return type	2024-07-16 13:43:36 +02:00
Pablo Natek	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Javier Segarra	c5cb4d84f1	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-16 09:23:30 +02:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Pablo Natek	08ba1acc3c	fix: refs #6403 fix delivery observation	2024-07-15 13:35:24 +02:00
Sergio De la torre	cb107215b6	feat itemShelvingSale refs #6861	2024-07-12 13:14:00 +02:00
Pablo Natek	64bddd4f63	feat: refs #6403 add dynamic clientType	2024-07-10 10:41:52 +02:00
Guillermo Bonet	d660043df2	feat: refs #7511 Fix tests	2024-07-10 07:48:42 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Javier Segarra	1be04babe4	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-09 12:18:55 +02:00