94 Commits

Author	SHA1	Message	Date
yaschalew	eee7b719b0	user management	2026-06-13 14:32:26 +03: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
Michael Abebe	e731051320	fix(freight): fixed some issues	2026-06-06 11:12:59 +03:00
marshal	3e3841cf6f	changes	2026-06-06 10:08:55 +03:00
Michael Abebe	c8768ba70b	Merge remote-tracking branch 'origin/freight/develop' into freight/develop	2026-06-06 09:45:10 +03:00
Michael Abebe	c31d87fc35	dep(freight): updated iam imports	2026-06-06 09:45:00 +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
Marshal	f8270175a2	fix the seed for rules	2026-06-05 17:25:44 +00:00
Marshal	67037ba748	fix the seed for rules	2026-06-05 17:25:16 +00: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	ba65a3f4cc	booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions	2026-06-05 11:01:00 +03:00
hagiye	b33517f47d	resolve conflict	2026-06-05 10:59:52 +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	ed9ef2b8e1	Merge freight/develop into feature/trains-management	2026-06-05 10:25:05 +03:00
hagiye	c66b57d599	Merge freight/develop into feature/trains-management	2026-06-05 10:21:39 +03:00
Hagernesh Tadesse	523d7e5842	Merge pull request #94 from Tria-plc/freight/feature/add_train_scheduling ... Freight/feature/add train scheduling reviewed	2026-06-05 09:38:30 +03:00
marshal	bdcb316685	Merge pull request #93 from Tria-plc/freight_feature/booking_flow ... dynamic contract templates and companyId on bookings	2026-06-04 16:58:50 +03:00
marshal	8fea963ddb	dynamic contract templates and companyId on bookings	2026-06-04 16:53:14 +03:00
Michael Abebe	8b3aaad5fd	feat(freight): basics of train scheduling	2026-06-04 16:50:38 +03:00
hagiye	71ac89edc7	trains, wagons,containers and cargoes schema and API	2026-06-04 15:56:29 +03:00
ghost2023	9d12d334d4	fix: key	2026-06-04 15:40:38 +03:00
marshal	324935a334	implement booking flow	2026-06-04 15:24:18 +03:00