55 Commits

Author	SHA1	Message	Date
Marshal	f6c28635bc	add 'My signature' menu item to user menu	2026-06-16 14:26:17 +00:00
Marshal	2d0f5ce6ee	changes	2026-06-16 14:17:40 +00:00
Marshal	366a335f85	add reusable per-user contract signatures with profile prefill and approval	2026-06-16 13:26:45 +00: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
Nathnael	7044dcfb43	payment ui for booking	2026-06-16 09:20:31 +00:00
marshal	a0dbb4ca6f	backoffice cleen up	2026-06-16 11:04:36 +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
Marshal	d3a479c142	ui fix	2026-06-12 14:21:07 +00:00
Marshal	6b79348074	ui fix	2026-06-12 12:59:01 +00:00
Marshal	db39e77e90	fix batch page ui	2026-06-12 12:46:51 +00:00
marshal	ef0abf1c41	auto allocation and batch managemnt, tracking the train	2026-06-12 11:42:46 +03: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	20289621f3	fix ui	2026-06-11 08:19:16 +00: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	0335555892	overview, booking and train scheduling ui	2026-06-10 07:53:15 +00:00
Marshal	2b5a0f4e96	ui design for schedule	2026-06-10 00:12:52 +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
marshal	88df20be6b	change price logic on the ,rule engine ui, auto generate the contrat	2026-06-08 10:04:23 +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