Commit Graph

3291 Commits

Author SHA1 Message Date
Stephanos A
e55dd01c50 Migration issues resolution 2026-07-18 12:47:05 +03:00
Stephanos A
cca822cab8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 12:31:28 +03:00
Stephanos A
56057a1e16 Migration conflict issues resolution 2026-07-18 12:31:19 +03:00
Abubeker Yasin
ce95646479 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 11:49:42 +03:00
Stephanos A
19b1a8d13d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 11:47:45 +03:00
Abubeker Yasin
aecd02933c Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 11:46:29 +03:00
Stephanos A
282bb949ba Migration issue resolution 2026-07-18 11:45:35 +03:00
Stephanos A
af39ab0394 Migration issue resolution 2026-07-18 11:44:11 +03:00
Stephanos A
854177c93b Seat reservation unique constrains, package totalMinor updates 2026-07-18 11:30:43 +03:00
Abubeker Yasin
4806768cea Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-18 09:55:31 +03:00
Abubeker Yasin
85de05cb40 feat: ( payments ) add merchant-order and booking/PNR payment status lookups 2026-07-18 09:55:09 +03:00
Stephanos A
0669635095 Dashboard updates 2026-07-18 00:41:26 +03:00
Stephanos A
8eb0582e4e Dashboard, seats report, package pricing updates 2026-07-18 00:34:12 +03:00
Stephanos A
eee14a5051 Package pricing issue resolution, passenger report updates 2026-07-17 23:48:49 +03:00
Stephanos A
1d9238fa39 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-17 23:20:10 +03:00
Stephanos A
f2c037a5b7 Package pricing issue resolution, passenger report, tickets filter updates 2026-07-17 23:18:52 +03:00
Roba Boru
d7a66cfac5 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:41:45 +03:00
Roba Boru
b2e5f58119 Enable skip fayda for dev 2026-07-17 22:41:03 +03:00
Eyob T.
4863eff19f Merge pull request #776 from Tria-plc/alpha
Added Checkin duration configuration
2026-07-17 22:16:48 +03:00
Roba Boru
ab500cd6f3 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:14:22 +03:00
Roba Boru
7e1966d469 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:13:31 +03:00
Roba Boru
4a4e58043f Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-17 22:13:13 +03:00
Roba Boru
738b7df5cf Added Checkin duration configuration 2026-07-17 22:12:54 +03:00
mulish77
5f000edbed Merge pull request #775 from Tria-plc/stephpaymentfix
Steph payment isssues fix
2026-07-17 19:51:18 +03:00
Muluhabt
ffafd9bcfc Steph payment isssues fix 2026-07-17 19:50:35 +03:00
Stephanos A
2567e25173 Supplementary amount issue resolution 2026-07-17 19:47:11 +03:00
mulish77
266331ec26 Merge pull request #774 from Tria-plc/stephpaymentfix
Steph payment isssues fix
2026-07-17 19:26:12 +03:00
Muluhabt
daeabe1d79 Steph payment isssues fix 2026-07-17 19:24:27 +03:00
Stephanos A.
e8c80378b8 Merge pull request #773 from Tria-plc/alpha
Alpha
2026-07-17 18:45:57 +03:00
Stephanos A
c3f4ba1f4e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-17 18:42:24 +03:00
Stephanos A
2e37bd7b4e Supplementary payments issue resolution 2026-07-17 18:41:59 +03:00
yaschalew10
312a4e8feb Merge pull request #772 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-17 18:02:42 +03:00
natib21
c8ec0be6b2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 15:01:51 +00:00
natib21
6ee771c953 fix search 2026-07-17 15:01:30 +00:00
marshal
2e3e5d20dd Merge pull request #771 from Tria-plc/freight_feature/usermanagement
fix
2026-07-17 16:59:36 +03:00
Marshal
6467173c76 fix 2026-07-17 13:57:59 +00:00
yaschalew10
38de82c37c Merge pull request #770 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-17 16:11:29 +03:00
natib21
a29689772b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 13:10:40 +00:00
natib21
0d98ccb04b fix 2026-07-17 13:10:27 +00:00
yaschalew10
8d6ae99d4e Merge pull request #769 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-17 15:08:18 +03:00
natib21
6f126a2345 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 12:01:39 +00:00
Hagernesh Tadesse
41d7a04d2f Merge pull request #768 from Tria-plc/intercity-load-unload
feat(intercity): show intercity cargo across every train
2026-07-17 15:00:15 +03:00
natib21
30188c1031 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 11:59:13 +00:00
natib21
47780c614a fix 2026-07-17 11:59:00 +00:00
marshal
f690b635eb Merge pull request #767 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-17 14:40:59 +03:00
Marshal
3a697e12f2 changes 2026-07-17 11:40:25 +00:00
Marshal
221c49fcda fix issue 2026-07-17 11:38:54 +00:00
yaschalew10
7817961ef9 Merge pull request #766 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-17 14:38:44 +03:00
natib21
838ea5efc8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-17 11:30:49 +00:00
natib21
149e4105f4 seed vehicle 2026-07-17 11:30:25 +00:00