Commit Graph

4098 Commits

Author SHA1 Message Date
marshal
3a7ed7d24b Merge pull request #1092 from Tria-plc/freight_feature/usermanagement
expose per-side facility flags
2026-08-03 11:59:11 +03:00
Marshal
c12108d953 expose per-side facility flags 2026-08-03 08:49:07 +00:00
mulish77
3c4dd07128 Merge pull request #1091 from Tria-plc/mulufeatures
Adding more detail messages for seat blocking
2026-08-03 11:39:09 +03:00
Mulu Mehari
8594d75164 Adding more detail messages for seat blocking 2026-08-03 11:37:16 +03:00
marshal
e7d1143c26 Merge pull request #1090 from Tria-plc/freight_feature/usermanagement
expose per-side facility flags
2026-08-03 11:22:08 +03:00
Marshal
dfd27efb6b expose per-side facility flags 2026-08-03 08:20:18 +00:00
Hagernesh Tadesse
6e0be9a8cd Merge pull request #1088 from Tria-plc/edrmiles
Edrmiles
2026-08-03 10:50:45 +03:00
Hagernesh
6a62ece814 feat(train-scheduling): auto-place intercity cargo on wagons freed mid-corridor
Intercity bookings ride the wagons freed by earlier unloads (e.g. import
containers uncoupled at Dire Dawa). loadBooking now auto-allocates a
DOMESTIC booking onto on-train slots whose cargo has all departed —
greedy in consist order by capacity, container numbers copied for the
marshalling tally. Falls back to unallocated load when nothing is free.
2026-08-02 23:07:59 +00:00
Hagernesh
035369af43 fix intercity unloading at facility 2026-08-02 23:07:59 +00:00
marshal
c3ba0192a9 Merge pull request #1083 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-03 01:40:20 +03:00
Marshal
f4fd469643 per-user trade-direction access scope 2026-08-02 22:29:58 +00:00
Marshal
c055abe8c1 train 3d visualizations 2026-08-02 21:48:22 +00:00
Marshal
6d8e5551ad train 3d visualizations 2026-08-02 21:46:00 +00:00
Marshal
163c501f8f train 3d visualizations 2026-08-02 21:35:45 +00:00
Nathnael Wondisha
7e5fdeb0b8 Merge pull request #1082 from Tria-plc/fix/merge-conf
fix: duplicate
2026-08-03 00:33:40 +03:00
ghost2023
12fb756cf5 fix: duplicate 2026-08-03 00:32:38 +03:00
Nathnael Wondisha
9e978b5580 Merge pull request #1081 from Tria-plc/staging
Staging
2026-08-03 00:26:04 +03:00
Nathnael Wondisha
62a7e35708 Merge branch 'dev' into staging 2026-08-03 00:24:17 +03:00
Marshal
94c64c2390 configer the stamp 2026-08-02 21:09:37 +00:00
Nathnael Wondisha
5abfe6b2ed Merge pull request #1080 from Tria-plc/fixes
fix:cbe and cac
2026-08-02 23:39:08 +03:00
Nathnael
6f137a11c3 fix:cbe and cac 2026-08-02 20:37:16 +00:00
Marshal
950bcc0912 configer the stamp 2026-08-02 20:29:09 +00:00
mulish77
2822e73503 Merge pull request #1079 from Tria-plc/mulufeatures
Adding seat blocking revenue loss dashboard
2026-08-02 23:13:46 +03:00
Nathnael Wondisha
f598412ae2 Merge pull request #1078 from Tria-plc/fixes
Fixes
2026-08-02 23:11:56 +03:00
Nathnael
da1da7befb fix: cbe freight base url 2026-08-02 20:10:42 +00:00
Nathnael
2ead1d0782 fix: cbe not appearing 2026-08-02 20:09:27 +00:00
Mulu Mehari
f0295f401a Adding seat blocking revenue loss dashboard 2026-08-02 23:08:15 +03:00
Nathnael Wondisha
6a88e512be Merge pull request #1077 from Tria-plc/fixes
Fixes
2026-08-02 23:03:02 +03:00
ghost2023
16baa1dd1d fix: cbe callback 2026-08-02 23:01:29 +03:00
marshal
3ba5145d26 Merge pull request #1076 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-08-02 22:35:06 +03:00
Marshal
3956c78c54 Enhance internal payment handling and e2e testing setup 2026-08-02 19:17:17 +00:00
Nathnael
ae037fd29d fix: padding 2026-08-02 18:42:38 +00:00
Marshal
930e39c4fc Enhance internal payment handling and e2e testing setup 2026-08-02 18:39:17 +00:00
Nathnael Wondisha
3fa77d0853 Merge pull request #1075 from Tria-plc/fixes
Fixes
2026-08-02 21:36:05 +03:00
Nathnael
dd0c7af251 fix: internal payment controller 2026-08-02 18:34:12 +00:00
Nathnael
3a3c309a5b fix: etrade inconsistencies 2026-08-02 18:33:38 +00:00
Nathnael
7762d6c2d3 fix: payemetn race condition 2026-08-02 18:28:40 +00:00
Nathnael Wondisha
42819addcc Merge pull request #1074 from Tria-plc/fixes
Fixes
2026-08-02 21:10:50 +03:00
Nathnael
7cebef8c39 fix: min amount of cac 2026-08-02 18:10:12 +00:00
Nathnael
ed27170301 chore: comment out the payment service 2026-08-02 18:07:15 +00:00
Nathnael
a9e6c0dc6f fix: etrade phone verification 2026-08-02 18:02:20 +00:00
Nathnael Wondisha
90e359b3cc Merge pull request #1073 from Tria-plc/fixes
fix
2026-08-02 20:53:15 +03:00
Nathnael
d0cc5c19ee fix 2026-08-02 17:52:20 +00:00
Nathnael Wondisha
12bd6052fc Merge pull request #1072 from Tria-plc/dev
Syncing
2026-08-02 20:16:41 +03:00
marshal
ec4bf8a5ab Merge pull request #1071 from Tria-plc/freight_feature/usermanagement
fix issue
2026-08-02 13:30:01 +03:00
Marshal
ff772fddef fix issue 2026-08-02 10:26:36 +00:00
Nathnael Wondisha
90f78b019f Merge pull request #1070 from Tria-plc/otp-fix
fix: opt
2026-08-02 13:22:41 +03:00
ghost2023
da79cb5acd fix: opt 2026-08-02 13:20:51 +03:00
ghost2023
7619952b74 fix: etrade loading 2026-08-02 01:39:46 +03:00
ghost2023
e6ce19ad22 style: ui fixes 2026-08-02 01:11:04 +03:00