71 Commits

Author	SHA1	Message	Date
hagiye	eda21e22d8	Resolve merge conflicts from Train-Scheduling	2026-06-08 16:51:29 +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
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
marshal	125ee18308	implement booking flow	2026-06-04 15:16:27 +03:00
ghost2023	c2145b48f5	fix	2026-06-03 15:31:29 +03:00
Nathnael Wondisha	36a8002163	Merge pull request #68 from Tria-plc/freight/feature/booking-integration ... freight/feature/booking integration	2026-06-03 11:26:35 +03:00
hagiye	18015ceaff	Merge freight/develop	2026-06-02 17:11:51 +03:00
marshal	0eeb0e0d6f	Merge pull request #69 from Tria-plc/freight_feature/rule_engine_and_design ... add migration file when the app is starting	2026-06-02 16:44:50 +03:00
marshal	f93a502247	add migration file when the app is starting	2026-06-02 16:43:37 +03:00
Michael Abebe	27ce600706	Merge branch 'freight/develop' into freight/feature/edr_org_seeder	2026-06-02 16:05:01 +03:00
ghost2023	dab72217e1	feat(bookings): Integrate booking list and detail pages with backend API	2026-06-02 16:04:47 +03:00
Michael Abebe	b5dbfc25c3	WIP	2026-06-02 15:59:58 +03:00
ghost2023	34bf4ade48	refactor(api): Introduce unified API layer for freight backoffice	2026-06-02 14:43:18 +03:00
Michael Abebe	88a280eea2	WIP	2026-06-02 13:50:54 +03:00
Michael Abebe	2a489ca18d	WIP	2026-06-02 12:12:28 +03:00
Michael Abebe	88219ee9b8	WIP	2026-06-02 12:12:20 +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
ghost2023	2ae47c451e	feat(backoffice): Add Booking Requests routes and sidebar navigation	2026-06-01 22:59:12 +03:00
Michael Abebe	25fa26e65d	Fix merge conflict of Merge branch 'freight/develop' into freight/feature/edr_org_seeder	2026-06-01 17:28:07 +03:00
Michael Abebe	fab6819151	feat(freight:backoffice): temp add user UI	2026-06-01 17:17:54 +03:00