Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 09:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,848 Commits 96 Branches 0 Tags
2bbb37207e5313a67006407d19db962a9936a1c8
Commit Graph

1397 Commits

Author SHA1 Message Date
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
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
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00: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
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
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
Stephanos A
ceb7f17e88 refactor: replace static IDs with UUIDs in seed functions for improved uniqueness 2026-06-09 21:43: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
Stephanos A
89c29e5e90 Resolved EventEmitterModule build issue 2026-06-09 17:00:17 +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
Hagernesh Tadesse
8f99069fb6 Merge pull request #121 from Tria-plc/freight/develop 
Freight/develop
 2026-06-08 16:55:57 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
Eyosiyas Girma
7c5e7408b0 Merge branch 'freight/develop' into freight/feature/telebirr-integration 2026-06-08 16:35:18 +03:00
hagiye
7facbeda22 Train scheduling API,Routes and UI 2026-06-08 16:31:28 +03:00
Eyosiyas
3a66242f8b working on dmoney 2026-06-08 16:29:20 +03:00
Abubeker Yasin
32f2f4b917 refactor( iam ): rename AuditLog.userId to iamUserId; drop FaydaVerificationSession.userId 2026-06-08 16:26:59 +03:00
Stephanos A.
bf8cc7e6cf Merge pull request #119 from Tria-plc/dev 
From dev to alpha
 2026-06-08 16:23:02 +03:00
Stephanos A.
edcb1b6fb1 Update tailwind.config.js (removed malicious code) 2026-06-08 16:20:59 +03:00
Stephanos A.
28e9203ccb Update tailwind.config.js (removed malicious code) 2026-06-08 16:20:57 +03:00
Stephanos A.
383b630407 Revert "From dev to alpha" 2026-06-08 16:11:59 +03:00
ghost2023
41061462ff feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard 2026-06-08 16:05:03 +03:00
Abubeker Yasin
8c377e86d8 refactor( iam ): replace userId FK with iamUserId on UserPreferences, Device, FraudAlert 2026-06-08 15:49:42 +03:00
Abubeker Yasin
c1dcfb04c3 refactor( iam ): migrate guest booking to IAM; make Passenger.userId nullable 2026-06-08 15:27:32 +03:00
Abubeker Yasin
1d9c8d5d0d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-08 12:01:59 +03:00
Abubeker Yasin
d07f522a60 fix(passenger-api): fix seed errors and add missing stop times 2026-06-08 12:00:01 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00
Abubeker Yasin
f5c9a72521 fix(passenger-api): fix seed TypeScript errors for dev 2026-06-08 01:35:12 -07:00
Abubeker Yasin
11192b6d49 fix(passenger-api): fix seed TypeScript errors for dev 2026-06-08 11:35:12 +03:00
Abubeker Yasin
72f8441a2b fix: ( prisma ) remove orphaned TicketSeat migration 2026-06-08 10:17:22 +03:00
marshal
675975bc08 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine 2026-06-08 10:05:48 +03:00