Commit Graph

3583 Commits

Author SHA1 Message Date
SennayT
cc342ddff7 always run malware scan first 2026-06-11 10:15:39 +03:00
Nathnael
2cd585a3ac style: ui fixes to booking detail page 2026-06-11 07:11:43 +00:00
SennayT
4bc2caf4c2 add malware scan script 2026-06-11 10:10:56 +03:00
Nathnael
83edb1e063 refactor: booking page refactor 2026-06-11 06:54:38 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00
Abubeker Yasin
216dd11d2f fix: ( seed ) add try catch 2026-06-11 08:45:32 +03:00
Eyob T.
d53e9eba07 Merge pull request #133 from Tria-plc/alpha 2026-06-10 09:14:08 -07:00
Roba Boru
1e129de010 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-10 18:51:18 +03:00
Roba Boru
82c7c25527 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-10 18:49:50 +03:00
Roba Boru
ac3aa348ce Update booking portal UI/UX 2026-06-10 18:49:40 +03:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Nathnael
12b1e54563 style: rebuild the booking detail page 2026-06-10 12:18:31 +00:00
Nathnael
38b3f747fb style: enhance UI components for New Booking page and Step Indicator 2026-06-10 11:07:02 +00:00
Nathnael
b37e0cf7a7 style: rebuild the my bookings page with new ui 2026-06-10 10:43:48 +00:00
Abubeker Yasin
3f1a673356 Merge branch 'alpha' into feat/telebirr-integration 2026-06-10 13:22:47 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
Eyob T.
e3ac57dfb2 Merge pull request #130 from Tria-plc/alpha
Update seed.ts
2026-06-10 12:09:28 +03:00
Nathnael
97ed1c4b85 fix the layout style 2026-06-10 09:03:33 +00:00
Nathnael
f423fc2e6f style: update 2026-06-10 08:48:05 +00:00
Abubeker Yasin
214feaedb5 Update seed.ts 2026-06-10 11:21:34 +03:00
Sennay
e5bf4dd111 Merge pull request #129 from Tria-plc/alpha
Alpha
2026-06-10 11:10:02 +03:00
Abubeker Yasin
310c0a0bc8 Update seed.ts 2026-06-10 11:04:57 +03:00
Marshal
0335555892 overview, booking and train scheduling ui 2026-06-10 07:53:15 +00:00
ghost2023
02621d05d8 chore: migrate to mantine from shadcn for datatable 2026-06-10 10:02:09 +03:00
Abubeker Yasin
66b45ce22c feat(payment-providers): implement Waafi in provider package 2026-06-10 09:14:18 +03: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
Roba Boru
dc1443207e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-09 21:44:13 +03:00
Stephanos A
ceb7f17e88 refactor: replace static IDs with UUIDs in seed functions for improved uniqueness 2026-06-09 21:43:24 +03:00
Roba Boru
4d52009bd7 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-09 21:00:37 +03:00
Eyob T.
61c1ea64c9 Merge pull request #128 from Tria-plc/alpha
seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions
2026-06-09 20:38:24 +03:00
Stephanos A
df75c68bf6 seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions 2026-06-09 20:32:24 +03:00
Roba Boru
98c6914991 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-09 19:13:49 +03:00
Eyob T.
579498aa71 Merge pull request #127 from Tria-plc/alpha
EventEmitterModule build issue resolved
2026-06-09 17:03:28 +03:00
Stephanos A
89c29e5e90 Resolved EventEmitterModule build issue 2026-06-09 17:00:17 +03:00
Stephanos A.
983dbde868 Merge pull request #126 from Tria-plc/dev
Pull from dev to alpha to get latest changes
2026-06-09 16:53:54 +03:00
Eyob T.
dcfb6d6a62 Merge pull request #125 from Tria-plc/freigh/fix/dmoney
fix
2026-06-09 16:48:13 +03:00
ghost2023
4afe07c19b fix 2026-06-09 16:37:11 +03:00
Stephanos A.
9219119ad1 Merge pull request #124 from Tria-plc/dev
Pull changes from dev
2026-06-09 15:54:06 +03:00
Eyob T.
409870c2f0 Merge pull request #123 from Tria-plc/alpha
Seat rendering and other updates
2026-06-09 15:34:28 +03:00
Stephanos A
c2bab6cae8 Seatmap rendering and other updates 2026-06-09 15:22:27 +03:00
Abubeker Yasin
fc5024c6f3 chore: ( iam ) update iam package 2026-06-09 14:29:27 +03:00
Abubeker Yasin
431b1c4f3c refactor( iam ): replace prisma.user joins with batch IAM fetch in bookings, tickets, and payments e2e 2026-06-09 13:54:38 +03:00
Nathnael Wondisha
1440c42f1e Merge branch 'freight/develop' into freight/feat/ui-migration 2026-06-09 12:13:03 +03:00
Abubeker Yasin
5ae6d9600a refactor(iam): remove remaining prisma.user refs from passenger side align RegisterDto to IAM body 2026-06-09 11:53:46 +03:00
Nathnael
c70c10b0df fixes 2026-06-09 08:29:09 +00:00
Abubeker Yasin
1d35453338 refactor( iam ): remove prisma.user references from passenger-side services 2026-06-09 10:31:49 +03:00
ghost2023
4566033046 style: ui revamp 2026-06-09 09:27:14 +03:00