83 Commits

Author	SHA1	Message	Date
hagiye	eda21e22d8	Resolve merge conflicts from Train-Scheduling	2026-06-08 16:51:29 +03:00
marshal	88df20be6b	change price logic on the ,rule engine ui, auto generate the contrat	2026-06-08 10:04:23 +03:00
hagiye	b78796d76b	mantine added to Train, wagon, containers and cargoes	2026-06-08 09:29:34 +03:00
hagiye	bffa5020ac	wagon types added UI with API integrations	2026-06-07 21:56:33 +03:00
marshal	4993453993	generate contract by the system, add waggon type,fix ui	2026-06-07 01:20:52 +03:00
marshal	3fa1f54e3a	fix ui	2026-06-07 00:32:07 +03:00
Marshal	08b46c306f	ui improvemnt	2026-06-06 21:17:20 +00:00
Michael Abebe	a9c2f2eb97	feat(freight): added routes and locomotives	2026-06-06 16:23:48 +03:00
marshal	3e3841cf6f	changes	2026-06-06 10:08:55 +03:00
Marshal	053b4f35c5	changes	2026-06-06 06:32:04 +00:00
ghost2023	da0f1e4cc9	feat(bookings): enhance contract viewer and backoffice UI consistency	2026-06-06 09:11:30 +03:00
hagiye	788de5381e	feat: complete train scheduling integration	2026-06-06 05:52:47 +03:00
hagiye	dc42838a43	Trains management CRUD issues solved	2026-06-05 21:07:04 +03:00
hagiye	9676a6bb56	resolve conflict	2026-06-05 14:17:48 +03:00
hagiye	c3e92dbe70	resolve conflict	2026-06-05 14:13:35 +03:00
marshal	35c9bdfce4	resolve confilict	2026-06-05 14:07:26 +03:00
marshal	d59c192137	resolve confilict	2026-06-05 13:06:16 +03:00
marshal	d226d7ef22	booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions	2026-06-05 10:38:31 +03:00
hagiye	c66b57d599	Merge freight/develop into feature/trains-management	2026-06-05 10:21:39 +03:00
hagiye	71ac89edc7	trains, wagons,containers and cargoes schema and API	2026-06-04 15:56:29 +03:00
marshal	125ee18308	implement booking flow	2026-06-04 15:16:27 +03:00
hagiye	18015ceaff	Merge freight/develop	2026-06-02 17:11:51 +03:00
hagiye	d52a5715e0	Rate Matrix Rules user story	2026-06-02 10:47:36 +03:00
marshal	e4859b3eeb	solf merge conflict	2026-06-01 23:50:49 +03:00
marshal	452ebdbc0a	rule engine and configration and fix booking for custoemr	2026-06-01 23:15:11 +03:00
hagiye	3682bda85c	rule engine UI, services and API integration	2026-06-01 16:01:51 +03:00
hagiye	ccbc642075	rure engine	2026-05-30 11:19:40 +03:00
yaschalew	55f611b9e8	fix conflict	2026-05-29 19:46:18 +03:00
yaschalew	ac35218299	add docs settings to admin page	2026-05-29 16:50:55 +03:00
hagiye	a5dc50f410	rule engine UI	2026-05-28 16:26:52 +03:00
Michael Abebe	27e2cfcf6b	feat(freight:backoffice): added login page and basic authorization	2026-05-22 17:55:20 +03:00
Michael Abebe	2c9ca6f16b	feat(freight:backoffice): added basic frontend integration with auth(login) page	2026-05-22 17:15:46 +03:00
Muluhabt	3b8b6979db	Project Initialization	2026-05-12 15:17:16 +03:00