Commit Graph

32 Commits

Author SHA1 Message Date
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
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +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
Michael Abebe
a9c2f2eb97 feat(freight): added routes and locomotives 2026-06-06 16:23:48 +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
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
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
marshal
f93a502247 add migration file when the app is starting 2026-06-02 16:43:37 +03:00
ghost2023
dab72217e1 feat(bookings): Integrate booking list and detail pages with backend API 2026-06-02 16:04:47 +03:00
ghost2023
34bf4ade48 refactor(api): Introduce unified API layer for freight backoffice 2026-06-02 14:43:18 +03:00
marshal
452ebdbc0a rule engine and configration and fix booking for custoemr 2026-06-01 23:15:11 +03:00
yaschalew
ac35218299 add docs settings to admin page 2026-05-29 16:50:55 +03:00
Muluhabt
3b8b6979db Project Initialization 2026-05-12 15:17:16 +03:00