120 Commits

Author	SHA1	Message	Date
Marshal	62ce2dc64f	Merge branch 'freight_feature/priority' of github.com:Tria-plc/edr-platform into freight_feature/priority	2026-06-16 13:27:29 +00:00
Marshal	366a335f85	add reusable per-user contract signatures with profile prefill and approval	2026-06-16 13:26:45 +00:00
marshal	166067fbe7	Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority	2026-06-16 14:29:17 +03:00
Nathnael Wondisha	c0b6869232	Merge pull request #172 from Tria-plc/freight/fix/fixes ... freight/fix/fixes	2026-06-16 14:28:24 +03:00
ghost2023	e47340c2c8	fixes	2026-06-16 14:27:17 +03:00
marshal	3ca564f073	simplify build script and add tinymce dependency	2026-06-16 14:26:47 +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
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	a0dbb4ca6f	backoffice cleen up	2026-06-16 11:04:36 +03:00
Nathnael	adba481f23	feat: setted up the schedule in the booking	2026-06-16 07:18:59 +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
Marshal	28ad9363d1	tracking ui	2026-06-15 12:01:44 +00:00
Eyob T.	20d6b1b6d8	Security patch	2026-06-15 14:11:39 +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	b417ed2fc8	fix conflict	2026-06-13 14:37:13 +03:00
yaschalew	eee7b719b0	user management	2026-06-13 14:32:26 +03:00
Marshal	e3cd369b01	ui fix	2026-06-13 08:51:57 +00:00
Marshal	b2f13c95c5	update window range	2026-06-13 07:59:48 +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	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	2fa2ed6bb2	ui fix	2026-06-11 11:12:41 +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	b45421d2a2	feat(freight): changed the train schedule	2026-06-06 16:31:19 +03:00
Michael Abebe	a9c2f2eb97	feat(freight): added routes and locomotives	2026-06-06 16:23:48 +03:00