Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
610 Commits 96 Branches 0 Tags
bc18b8bfd7755ab2ef77b1b40b8e024f4ce6b77a
Commit Graph

424 Commits

Author SHA1 Message Date
Yonas Tewabe
bc18b8bfd7 Add Dockerfile for EDR Payment API 2026-06-12 12:54:01 +03:00
Sennay
f175d43d3e Merge pull request #140 from Tria-plc/feat/payment-microservice 
Update internal-payments.dto.ts
 2026-06-12 12:21:32 +03:00
Abubeker Yasin
fa6233923c Update internal-payments.dto.ts 2026-06-12 12:20:05 +03:00
Eyob T.
b93a47450b Merge pull request #139 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-12 11:53:49 +03:00
Abubeker Yasin
ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice 2026-06-12 11:47:11 +03:00
Abubeker Yasin
2b430f8e76 feat: ( payment ) create payment microservice 2026-06-11 15:25:24 +03:00
Abubeker Yasin
556c2dc1f8 Update seed.ts 2026-06-11 14:24:56 +03:00
Sennay
dfcf2ab656 Merge branch 'dev' into alpha-fix 2026-06-11 14:02:38 +03:00
Abubeker Yasin
727f6e6787 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-11 13:56:54 +03:00
Sennay
a4baaaea1d Remove obfuscated code from tailwind.config.js 2026-06-11 13:56:29 +03:00
Sennay
00f4c03b60 Remove obfuscated code from tailwind.config.js 2026-06-11 13:56:02 +03:00
Abubeker Yasin
4c1169f6fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-11 13:54:03 +03:00
SennayT
ce38a5cca1 remove critical severity code 2026-06-11 10:21:47 +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
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
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03: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
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
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
Eyosiyas
3a66242f8b working on dmoney 2026-06-08 16:29:20 +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
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
Nathnael Wondisha
95fb544ec2 Merge pull request #116 from Tria-plc/freight/feat/payment 
freight/feat/payment
 2026-06-08 08:52:39 +03:00
ghost2023
df725015a1 fix(api): improve payment status API handling and frontend user experience 2026-06-08 08:51:54 +03:00
hagiye
bffa5020ac wagon types added UI with API integrations 2026-06-07 21:56:33 +03:00
Stephanos A.
67319a467e Merge pull request #115 from Tria-plc/alpha 
Update Prisma migration script to use deploy command
 2026-06-07 19:43:50 +03:00
Stephanos A
193485d911 Update Prisma migration script to use deploy command 2026-06-07 19:43:02 +03:00
Stephanos A.
cfff533066 Merge pull request #114 from Tria-plc/alpha 
Fix Prisma schema path in package.json
 2026-06-07 19:26:46 +03:00
Stephanos A
e3fb81317e Fix Prisma schema path in package.json 2026-06-07 19:24:46 +03:00
Stephanos A.
0666fd06cf Merge pull request #113 from Tria-plc/alpha 
Add Prisma schema configuration to package.json
 2026-06-07 19:11:09 +03:00
Stephanos A
09317a3d56 Add Prisma schema configuration to package.json 2026-06-07 19:10:00 +03:00
Stephanos A.
12fabc3fa1 Merge pull request #112 from Tria-plc/alpha 
Update PORT configuration in .env.example from 3002 to 4000
 2026-06-07 18:58:15 +03:00
Stephanos A
75b7ec1baf Update PORT configuration in .env.example from 3002 to 4000 2026-06-07 18:57:34 +03:00