1597 Commits

Author	SHA1	Message	Date
Joan Sanchez	8f0b566935	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 07:25:07 +00:00
Pau	a43e642ff7	Add transferclient	2022-10-25 09:23:46 +02:00
Vicent Llopis	f968b19d1e	fix: testFront	2022-10-21 09:08:17 +02:00
Vicent Llopis	c33cab7b10	fix: test back	2022-10-21 09:01:08 +02:00
Vicent Llopis	2d0cb60b50	feat: check if uses mana	2022-10-21 08:55:05 +02:00
Vicent Llopis	e7261573d7	delete focus	2022-10-21 08:01:22 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Vicent Llopis	5da29fe381	refactor: unify duplicated code	2022-10-21 08:00:24 +02:00
Vicent Llopis	6891190c72	refactor: create endpoint to unify code	2022-10-20 15:05:46 +02:00
Vicent Llopis	29093d7d30	feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas	2022-10-20 14:25:55 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	bcc9acac0a	fix: tBack	2022-10-20 08:41:00 +02:00
Vicent Llopis	51cad75298	fix: testFront	2022-10-20 08:17:15 +02:00
Alex Moreno	508decaf0b	try	2022-10-19 08:22:36 +02:00
Pau	8b07180890	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-18 11:56:56 +00:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Vicent Llopis	ae3e3c3c49	fix: id model duplicated	2022-10-18 12:37:06 +02:00
Alex Moreno	a5ceee07e9	use loopback	2022-10-18 11:50:16 +02:00
Vicent Llopis	5fce93abd5	refactor: change variables name	2022-10-18 11:47:37 +02:00
Vicent Llopis	423454d19e	feat: add date-picker	2022-10-18 11:47:22 +02:00
Alex Moreno	8985a678d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-18 09:49:06 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Vicent Llopis	f85c2e9700	refactor: delete code repeated	2022-10-17 14:01:21 +02:00
Joan Sanchez	cfdcf91be2	Merge branch 'dev' into 3505-closure_refund	2022-10-17 08:15:16 +00:00
Vicent Llopis	787d10aac6	fix: select one result only	2022-10-17 08:29:09 +02:00
Vicent Llopis	cdce628038	refactor: delete line break	2022-10-17 08:11:50 +02:00
Vicent Llopis	06ecceb478	refactor: lines to long	2022-10-17 08:02:19 +02:00
Vicent Llopis	a11ef73dfb	refactor: code repetead	2022-10-17 08:01:55 +02:00
Vicent Llopis	a036578832	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-14 14:43:08 +02:00
Vicent Llopis	40075e7e21	fix: testFront	2022-10-14 14:38:47 +02:00
Vicent Llopis	86b7e9cabe	fix: only can exists 'mana' or 'manaClaim' discount. Never both	2022-10-14 14:30:37 +02:00
Vicent Llopis	2455a11c26	feat: changeMultipleDiscount uses the same popover than changeDiscount	2022-10-14 14:29:21 +02:00
Joan Sanchez	390ee60e59	Get first element in array	2022-10-14 07:26:34 +02:00
Joan Sanchez	67097970ed	Incoterms required param	2022-10-13 10:44:20 +02:00
Joan Sanchez	e81c39d8dc	Send delivery note to refund tickets	2022-10-13 09:30:31 +02:00
Vicent Llopis	1f21fdeb65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-10 13:30:27 +02:00
Alex Moreno	99271f275f	remove unnecessary isEditable	2022-10-10 13:26:38 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Vicent Llopis	843f67919c	feat: add backTest	2022-10-10 12:56:03 +02:00
Alex Moreno	3ac8e1d3bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-10 09:57:21 +02:00
Joan Sanchez	4ecbb59ac0	Closure hours	2022-10-10 07:49:08 +02:00
Vicent Llopis	bb26fa6502	feat: add tFront	2022-10-07 13:49:42 +02:00
Alex Moreno	94a51db3d5	hotFix(ticket_request): autocomplete buyer	2022-10-07 10:56:12 +02:00
Vicent Llopis	deb8a00dfb	feat: add backRoutes	2022-10-07 10:47:54 +02:00
Vicent Llopis	1894492a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-07 09:26:51 +02:00
Alex Moreno	e7bafb1386	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-07 07:47:46 +02:00
Alex Moreno	c29625f079	fix: funcionalityAcl	2022-10-06 15:04:27 +02:00
Joan Sanchez	dd9b517883	Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev ... Reviewed-on: #1061	2022-10-06 11:30:49 +00:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Vicent Llopis	d427c3a6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-06 11:48:31 +02:00
Vicent Llopis	37601934f5	feat: first option to delete and update	2022-10-06 11:40:46 +02:00
Vicent Llopis	a3a432c753	fix: delete one or more expeditions	2022-10-06 10:18:19 +02:00
Vicent Llopis	26d04ce2d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-06 10:08:29 +02:00
Alex Moreno	9d482f7dfd	test(ticket): fix tests and add funcionalityAcl	2022-10-05 15:13:36 +02:00
Alex Moreno	8b636497a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-05 13:47:25 +02:00
Alex Moreno	5f39249edb	fix(ticket): canEdit use aclFunc	2022-10-04 15:02:00 +02:00
Alex Moreno	fe8ae164eb	refactor(ticket): isEditable, canEdit	2022-10-04 13:22:11 +02:00
Joan Sanchez	1598b6c703	Back unit tests	2022-10-04 09:39:42 +02:00
Pau	3caf89bddb	refactor: Replaced isBox with freightItemFk	2022-10-04 09:27:31 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Vicent Llopis	5c76437498	refator: delete unnecessary transaction	2022-10-04 08:19:09 +02:00
Vicent Llopis	f510e26141	refactor: translation	2022-10-04 07:55:30 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Vicent Llopis	11484edd10	feat: create new ticket	2022-10-03 15:18:07 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Alex Moreno	eec1d6df4a	add translation	2022-09-30 09:06:43 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	5aec280adb	Closure migration	2022-09-29 09:07:18 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Joan Sanchez	d7ab95fcc8	closure	2022-09-27 15:00:12 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Vicent Llopis	c4649352a9	feat: add totalChecked	2022-09-23 08:50:11 +02:00
Vicent Llopis	2a64fde57c	feat: add option "move expedition"	2022-09-22 14:58:38 +02:00
Vicent Llopis	a486b1593b	fix: backTest	2022-09-22 13:55:09 +02:00
Vicent Llopis	95e5b1a970	fix: code for search-function	2022-09-22 13:54:58 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Vicent Llopis	0fb7487191	feat: add getItemTypeWorker endpoint	2022-09-22 08:32:18 +02:00
Vicent Llopis	fae1516b33	refactor: correct bleeding	2022-09-21 14:55:43 +02:00
Vicent Llopis	65e15ada69	refator: delete line break	2022-09-21 14:53:02 +02:00
Joan Sanchez	5a43bdb6c9	Delivery note	2022-09-21 13:18:32 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	55d6dacebb	test(ticket_listPackaging):enable back test	2022-09-19 10:11:44 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Alex Moreno	c06d2970ae	test(boxing): getVideoList	2022-09-07 13:58:39 +02:00
Alex Moreno	8dd02ab6ee	quit console.logs	2022-09-06 15:08:28 +02:00
Alex Moreno	43df1e7e10	refactor(boxing): refactor getVideo	2022-09-05 12:06:14 +02:00
Alex Moreno	4a058faaf8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-05 08:12:07 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	062806b3f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-08-05 13:19:43 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Alex Moreno	b4b6d61460	feat(ticket_boxing): fix getVideo	2022-08-03 14:57:39 +02:00
Alex Moreno	8a08b6f399	feat(ticket_boxing): return video stream	2022-08-02 15:15:05 +02:00
Alex Moreno	7d4dd7bb52	feat(boxing): return stream video	2022-08-01 15:03:17 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Carlos Jimenez Ruiz	57a2cd46ce	ticket filter pending uses isNotValidated now	2022-06-29 12:55:11 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Vicent Llopis	00e48f5257	feat: add backTest	2022-06-16 10:59:31 +02:00
Vicent Llopis	84ffe3f594	feat: delete from ticketCollection and sectorCollection when a ticket is deleted	2022-06-16 09:58:15 +02:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	605ab2ec62	refactor: delete sms.detinationFk	2022-05-17 12:37:54 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Joan Sanchez	f8db3c31df	Proper test result	2022-05-13 10:02:34 +02:00
Joan Sanchez	6b18432f87	Force test to fail	2022-05-13 09:53:47 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Joan Sanchez	d39147689d	Merge branch 'dev' into 3771-ticket.expedition	2022-05-11 12:47:33 +00:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Vicent Llopis	93e3ea103a	added frontTest	2022-05-04 12:05:46 +02:00
Vicent Llopis	9862960c99	comment frontTest	2022-05-04 12:00:39 +02:00
Vicent Llopis	38f5541ef4	execute jenkins test	2022-05-04 11:27:03 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Vicent Llopis	32ec755a35	fix: check if value.length	2022-04-28 08:26:38 +02:00
Vicent Llopis	1766222c12	refactor: updated backTest	2022-04-26 13:25:12 +02:00
Vicent Llopis	7abceb8564	refactor: add frontTest	2022-04-26 13:08:06 +02:00
Vicent Llopis	6d35200607	updated front test	2022-04-25 10:10:59 +02:00
Vicent Llopis	789365799e	refactor: changed name	2022-04-25 08:45:50 +02:00
Vicent Llopis	2b9c656d21	feat(invoiceOut): add refund option	2022-04-22 11:46:28 +02:00
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Vicent Llopis	d1bd2f9c77	refactor: refund	2022-04-21 14:59:41 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00