12075 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	bc7f2d8193	Responsive	2021-05-18 11:58:32 +02:00
Joan Sanchez	bb67277c68	#2913, #2914 - Changes to sales monitors	2021-05-18 11:58:32 +02:00
Carlos Jimenez Ruiz	a5f4936e60	Merge pull request '#2913, #2914 - Changes to sales monitors' (#624) from 2913-monitor_changes into dev ... Reviewed-on: #624 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-18 08:29:29 +00:00
Joan Sanchez	ce96e92389	Updated z-index	2021-05-18 10:20:15 +02:00
Joan Sanchez	400bf7b4f2	Changes	2021-05-18 10:05:13 +02:00
Joan Sanchez	5d278f416f	Removed transaction block	2021-05-18 10:04:01 +02:00
Joan Sanchez	bf250b77ef	Responsive	2021-05-18 09:12:47 +02:00
Joan Sanchez	10387ee40b	#2913, #2914 - Changes to sales monitors	2021-05-18 08:41:36 +02:00
Joan Sanchez	ea1ff3e5fa	Merge pull request '2896-route_tickets_refactor + transactions + unitest + e2e' (#623) from 2896-route_tickets_refactor into dev ... Reviewed-on: #623 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-17 10:32:42 +00:00
Carlos Jimenez Ruiz	5843140cf5	minor refactor for code usage instead of description	2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz	54d75e0e54	e2e amends for salesPerson	2021-05-17 11:08:00 +02:00
Carlos Jimenez Ruiz	f0fbb13af8	fixtures to english changes + e2e amends	2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz	bdcd05ee14	removed commented code and the keep file	2021-05-17 10:30:39 +02:00
Carlos Jimenez Ruiz	e848b94859	removed LEFT from join	2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz	3a25dbc3b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-17 09:05:15 +02:00
Joan Sanchez	085a5a104b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-17 08:39:55 +02:00
Joan Sanchez	b67c95e5f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-17 07:38:04 +02:00
Joan Sanchez	378175224c	HOTFIX: Buyer ACL	2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz	b902a4dd4a	front unit test fix	2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz	97e9dc57bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz	799a3c6c36	e2e paths updated to endpoints refactors	2021-05-14 19:22:04 +02:00
Carlos Jimenez Ruiz	d83d3b6765	documented the missing argument	2021-05-14 19:21:31 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Carlos Jimenez Ruiz	61fb997717	removed transaction from procedure to use backend's	2021-05-14 19:17:37 +02:00
Joan Sanchez	e45af1c60a	Updated unit test	2021-05-14 13:56:04 +02:00
Joan Sanchez	c0f2590b61	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-14 12:56:10 +02:00
Joan Sanchez	e39758ee16	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-14 12:46:54 +02:00
Joan Sanchez	a70b29f9bf	#2916 - HOTFIX: Grouping selection limit	2021-05-14 12:44:23 +02:00
Joan Sanchez	54dd545525	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-14 11:42:13 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	c4357ea577	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-13 12:27:01 +02:00
Joan Sanchez	e6f7ef41b0	Hotfix: Catalog items without ink	2021-05-13 12:21:12 +02:00
Joan Sanchez	ac02f8b309	Ticket request hotfix	2021-05-13 12:18:21 +02:00
Joan Sanchez	24981912e4	2907 - Proper claim rate percentage	2021-05-13 12:13:15 +02:00
Carlos Jimenez Ruiz	c8174fd132	Merge pull request '2905- Restore ticket with shipped and landed' (#621) from 2905-restore_ticket_date into dev ... Reviewed-on: #621 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-13 08:29:14 +00:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz	95666ccc1d	Merge branch 'dev' into 2905-restore_ticket_date	2021-05-13 07:44:01 +00:00
Carlos Jimenez Ruiz	e9ac0c1a74	Merge pull request '2907 - Proper claim rate percentage' (#622) from 2907-claim_rate_percentage into dev ... Reviewed-on: #622 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-13 07:43:34 +00:00
Joan Sanchez	4a1d286a95	2907 - Proper claim rate percentage	2021-05-13 09:17:49 +02:00
Joan Sanchez	af49a66911	Unit test fix	2021-05-13 08:57:49 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	fc00e759c2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 15:11:18 +02:00
Joan Sanchez	8af66a7ca5	HOTFIX: Sort by column	2021-05-12 15:11:07 +02:00
Joan Sanchez	c4537b0562	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 14:47:16 +02:00
Joan Sanchez	7e4b540af1	Updated company address	2021-05-12 14:47:00 +02:00
Joan Sanchez	d9a57cf9da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 14:22:47 +02:00
Joan Sanchez	b3cbf9374c	Hotfix: Catalog items without ink	2021-05-12 14:22:29 +02:00
Joan Sanchez	6a3cb7f724	Added new version	2021-05-12 14:17:28 +02:00
Joan Sanchez	16bcbad26c	Merge pull request '2863 - Added monitor module' (#618) from 2863-monitor_module into dev ... Reviewed-on: #618 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-12 12:09:31 +00:00
Joan Sanchez	9363726d67	Updated unit test	2021-05-12 13:37:01 +02:00