175 Commits

Author	SHA1	Message	Date
Stephanos A.	7a00955588	Revert "fix: add lockfile corruption handling to CI/CD and Dockerfiles"	2026-06-16 21:58:26 +03:00
Eyob T.	eb7db6db21	Merge pull request #187 from Tria-plc/alpha ... fix: add lockfile corruption handling to CI/CD and Dockerfiles	2026-06-16 21:48:40 +03:00
Stephanos A	560aff222b	fix: add lockfile corruption handling to CI/CD and Dockerfiles	2026-06-16 21:40:01 +03:00
natib21	018ae5e059	fix prod issue	2026-06-16 16:39:29 +00:00
marshal	82954b1ec1	Merge pull request #182 from Tria-plc/freight_feature/priority ... Freight feature/priority	2026-06-16 17:31:28 +03:00
marshal	ea9b9c7346	Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority	2026-06-16 17:20:31 +03:00
Marshal	2d0f5ce6ee	changes	2026-06-16 14:17:40 +00:00
marshal	2592e604fb	changes	2026-06-16 16:57:15 +03:00
Marshal	524d3b6418	add reusable per-user contract signatures with profile prefill and approval	2026-06-16 13:34:04 +00:00
Nathnael Wondisha	8777c5e26f	Merge pull request #176 from Tria-plc/freight_feature/priority ... Freight feature/priority	2026-06-16 16:19:55 +03:00
Nathnael Wondisha	ab3583d9ee	Merge pull request #178 from Tria-plc/freight/fix/fixes ... Freight/fix/fixes	2026-06-16 16:19:14 +03:00
Nathnael	9afa23cc47	feat: add dashboard summary endpoint and related DTOs for company KPIs	2026-06-16 13:11:56 +00:00
Marshal	64fad99bdc	Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority	2026-06-16 12:21:16 +00:00
Marshal	52a9462228	add booking endpoint for featch payable bookings	2026-06-16 12:20:49 +00: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
ghost2023	b6ece994fc	Merge branch 'freight/feat/booking-schedule' into freight/develop	2026-06-16 12:39:56 +03: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
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	0aed9824ae	cac payemnt integration and cbe rate exchange webscrabing	2026-06-15 14:54:20 +03:00
marshal	fe1bed8c4b	payment integration	2026-06-15 11:09:58 +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
marshal	484151d909	payments	2026-06-14 15:59:52 +03:00
marshal	52c0639c8f	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments	2026-06-14 02:27:56 +03:00
marshal	87b0ce6339	Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI	2026-06-14 02:13:08 +03:00
Marshal	b73bf2154e	add detail batch and allocation monitoring page	2026-06-13 18:28:39 +00:00
yaschalew	eee7b719b0	user management	2026-06-13 14:32:26 +03:00
Marshal	b2f13c95c5	update window range	2026-06-13 07:59:48 +00:00
yaschalew	12b6406d23	fix conflict	2026-06-13 10:45:26 +03:00
marshal	ef0abf1c41	auto allocation and batch managemnt, tracking the train	2026-06-12 11:42:46 +03:00
Marshal	8618ea2aa8	add cron jobs and aslo	2026-06-11 20:59:24 +00:00
Marshal	132f2150a8	add cron jobs and aslo	2026-06-11 20:59:19 +00:00
Marshal	cde3e462ba	automate the schedule	2026-06-11 19:42:23 +00:00
Marshal	f85c13ce8c	Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule	2026-06-11 11:15:29 +00:00
marshal	c871330f7f	resolve merge conflict	2026-06-11 10:52:37 +03:00
marshal	10b011de8f	merge conflict	2026-06-10 16:45:45 +03:00
Marshal	088295d81f	schedule logic	2026-06-10 09:22:57 +00:00
Marshal	257428be18	ui design for schedule	2026-06-09 23:25:52 +00:00
marshal	5774d7db9d	booking operations and trains scheduling also allocations	2026-06-10 00:48:32 +03:00
hagiye	eda21e22d8	Resolve merge conflicts from Train-Scheduling	2026-06-08 16:51:29 +03:00
Eyosiyas Girma	7c5e7408b0	Merge branch 'freight/develop' into freight/feature/telebirr-integration	2026-06-08 16:35:18 +03:00
Eyosiyas	3a66242f8b	working on dmoney	2026-06-08 16:29:20 +03:00
Eyosiyas	a1940c4901	telebirr out in the payment	2026-06-08 11:49:50 +03:00
marshal	675975bc08	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine	2026-06-08 10:05:48 +03:00
marshal	88df20be6b	change price logic on the ,rule engine ui, auto generate the contrat	2026-06-08 10:04:23 +03:00
Nathnael Wondisha	95fb544ec2	Merge pull request #116 from Tria-plc/freight/feat/payment ... freight/feat/payment	2026-06-08 08:52:39 +03:00
ghost2023	df725015a1	fix(api): improve payment status API handling and frontend user experience	2026-06-08 08:51:54 +03:00