741 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
marshal	3ca564f073	simplify build script and add tinymce dependency	2026-06-16 14:26:47 +03:00
marshal	811225c05d	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority	2026-06-16 13:50:54 +03:00
marshal	23272f972a	Merge pull request #171 from Tria-plc/freight_feature/priority ... Freight feature/priority	2026-06-16 13:34:18 +03:00
Marshal	3afccbd660	fix priority ui	2026-06-16 10:24:22 +00:00
ghost2023	b6ece994fc	Merge branch 'freight/feat/booking-schedule' into freight/develop	2026-06-16 12:39:56 +03:00
Marshal	0778021d86	implement priority	2026-06-16 09:26:57 +00:00
Nathnael	7044dcfb43	payment ui for booking	2026-06-16 09:20:31 +00:00
marshal	00d1263f6d	fix seed issue	2026-06-16 12:15:48 +03:00
Marshal	7151bce288	changes	2026-06-16 08:56:52 +00:00
Nathnael	570c5ee125	feat: setted up the renewal contract	2026-06-16 08:51:23 +00:00
Nathnael	05da2ce27a	feat: ui status updates	2026-06-16 08:29:40 +00:00
yaschalew10	0cac604510	Merge pull request #167 from Tria-plc/freight_feature/payments ... Freight feature/payments	2026-06-16 11:13:03 +03:00
marshal	dc5929e7ae	changes	2026-06-16 11:11:32 +03:00
marshal	a0dbb4ca6f	backoffice cleen up	2026-06-16 11:04:36 +03:00
Abubeker Yasin	8520c3add3	fix: ( payment ) remove /100	2026-06-16 11:02:07 +03:00
yaschalew10	36b9545be2	Merge pull request #166 from Tria-plc/freight/feature/user_management ... Freight/feature/user management	2026-06-16 10:54:45 +03:00
Abubeker Yasin	e5877e5339	fix: ( telebirr ) fix query status	2026-06-16 10:52:36 +03:00
Nathnael	adba481f23	feat: setted up the schedule in the booking	2026-06-16 07:18:59 +00:00
natib21	deae339887	fix	2026-06-16 07:17:21 +00:00
natib21	9157e144ad	fix	2026-06-16 07:03:10 +00:00
natib21	ab99c96d62	fix	2026-06-16 07:01:25 +00:00
natib21	e7e3d61975	fix	2026-06-16 06:45:14 +00:00
natib21	8362bd94c5	fix	2026-06-16 06:39:59 +00:00
natib21	0198b545c9	fix	2026-06-16 06:35:51 +00:00
natib21	2b5db67bcd	fix	2026-06-16 06:33:43 +00:00
yaschalew10	ba4ebee59d	Merge pull request #165 from Tria-plc/freight/feature/user_management ... Freight/feature/user management	2026-06-16 09:20:08 +03:00
natib21	a1244609ce	auth	2026-06-16 06:17:36 +00:00
natib21	d55cc78bd9	auth	2026-06-16 06:14:44 +00:00
Abubeker Yasin	ca9a67837c	feat: ( payment ) implement d-money payment	2026-06-16 08:49:41 +03:00
marshal	1f0a642c03	Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments	2026-06-15 16:16:33 +03:00
Marshal	87c6e12fbd	fix allocate bookigns	2026-06-15 13:15:22 +00:00
marshal	9ee8262df8	Merge branch 'freight_feature/payments' of github.com:Tria-plc/edr-platform into freight_feature/payments	2026-06-15 15:02:25 +03:00
Marshal	28ad9363d1	tracking ui	2026-06-15 12:01:44 +00:00
marshal	0aed9824ae	cac payemnt integration and cbe rate exchange webscrabing	2026-06-15 14:54:20 +03:00
Abubeker Yasin	96ec2923c2	fix: ( telebirr ) redirect_url	2026-06-15 14:35:14 +03:00
Eyob T.	70f0f0394b	Merge pull request #163 from Tria-plc/fix/security_patch ... Security patch	2026-06-15 14:12:39 +03:00
Eyob T.	20d6b1b6d8	Security patch	2026-06-15 14:11:39 +03:00
Abubeker Yasin	73eeee175f	Update payments.service.ts	2026-06-15 11:26:51 +03:00
yaschalew10	da7ab97782	Merge pull request #161 from Tria-plc/freight_feature/payments ... Freight feature/payments	2026-06-15 11:15:26 +03:00
marshal	e3c66bfa5e	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments	2026-06-15 11:14:48 +03:00
marshal	fe1bed8c4b	payment integration	2026-06-15 11:09:58 +03:00
ghost2023	d1347892db	feat(bookings): Implement unified hierarchical bulk cargo type selection via cargoTypePath	2026-06-15 09:57:00 +03:00
ghost2023	3e2e07bb5f	feat(bookings): Implement data-driven service type selection and configuration	2026-06-15 09:57:00 +03:00
ghost2023	44aef8c1b3	feat: add more fields to the reference service array	2026-06-15 09:56:59 +03:00
ghost2023	9aecbb6508	feat(booking): Implement train schedule selection and update booking data structures	2026-06-15 09:56:59 +03:00
ghost2023	407cf3ed1f	fixes	2026-06-15 09:52:17 +03:00
ghost2023	6058b870a1	feat(train-scheduling): implement API and types for bookable schedules	2026-06-15 09:52:17 +03:00
ghost2023	28f9d58e0a	style: fix	2026-06-15 09:52:16 +03:00
ghost2023	e075252639	fix: the direction for the yard	2026-06-15 09:52:16 +03:00
Abubeker Yasin	4ab987e8fe	Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq" ... This reverts commit 3b961f17f5.	2026-06-14 21:44:36 +03:00