Commit Graph

615 Commits

Author SHA1 Message Date
Yonas Tewabe
6635b19d84 Update sync-env-from-server.sh 2026-06-12 13:05:44 +03:00
Yonas Tewabe
7a4056a450 Update deploy.yml 2026-06-12 13:01:44 +03:00
Yonas Tewabe
e917b02467 Delete .github/workflows/malware-scan.yml 2026-06-12 13:00:43 +03:00
Yonas Tewabe
4e5afcbf72 Update docker-compose.yaml 2026-06-12 13:00:15 +03:00
Yonas Tewabe
f6647eb02e Update Dockerfile 2026-06-12 12:59:47 +03:00
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
Eyob T.
e8ad0aa327 Merge pull request #136 from Tria-plc/dev-fix
Update seed.ts
2026-06-11 14:26:50 +03:00
Abubeker Yasin
556c2dc1f8 Update seed.ts 2026-06-11 14:24:56 +03:00
Sennay
ecb519db6b Merge pull request #135 from Tria-plc/alpha-fix
Alpha fix
2026-06-11 14:04:14 +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
Sennay
4270cdb2a5 Change deploy workflow trigger to push events 2026-06-11 13:41:51 +03:00
SennayT
ce38a5cca1 remove critical severity code 2026-06-11 10:21:47 +03:00
SennayT
707f552c2e skip checking scan-malware.js 2026-06-11 10:17:17 +03:00
SennayT
cc342ddff7 always run malware scan first 2026-06-11 10:15:39 +03:00
SennayT
4bc2caf4c2 add malware scan script 2026-06-11 10:10:56 +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
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Abubeker Yasin
3f1a673356 Merge branch 'alpha' into feat/telebirr-integration 2026-06-10 13:22:47 +03:00
Eyob T.
e3ac57dfb2 Merge pull request #130 from Tria-plc/alpha
Update seed.ts
2026-06-10 12:09:28 +03: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
Abubeker Yasin
66b45ce22c feat(payment-providers): implement Waafi in provider package 2026-06-10 09:14:18 +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