Commit Graph

695 Commits

Author SHA1 Message Date
Eyob T.
2b2897ab90 Merge pull request #152 from Tria-plc/alpha
Merge request for passenger back office updates
2026-06-14 13:37:42 +03:00
Roba Boru
a9f8f0c43c Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-14 11:08:07 +03:00
Roba Boru
faf0eeb3b6 Update get payment methods from static to api 2026-06-14 11:07:29 +03:00
Stephanos A
f8701eacfb Merge branch 'dev' into alpha 2026-06-14 10:47:51 +03:00
Stephanos A
c475c7e89f Cleaned tailwind.config.js files 2026-06-14 10:38:13 +03:00
Stephanos A
1cd0a55305 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-14 10:31:27 +03:00
Stephanos A
20d483ed00 Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting 2026-06-14 10:26:22 +03:00
Abubeker Yasin
2b90e793c3 Merge branch 'dev' into feat/payment-microservice 2026-06-13 20:45:04 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
Yonas Tewabe
a1f493d12c Update docker-compose.yaml 2026-06-13 12:05:29 +03:00
Abubeker Yasin
962ef17803 Merge pull request #146 from Tria-plc/feat/payment-microservice
Update payment-client.service.ts
2026-06-13 10:49:10 +03:00
Abubeker Yasin
eb94d58a4e Update payment-client.service.ts 2026-06-13 10:48:19 +03:00
Eyob T.
282b555fae Merge pull request #145 from Tria-plc/feat/payment-microservice
Feat/payment microservice
2026-06-13 10:32:08 +03:00
SennayT
b6ece3dd6f Add scan report 2026-06-13 10:27:37 +03:00
SennayT
377492c2ae add new malware detection script 2026-06-13 10:16:25 +03:00
Abubeker Yasin
0b12d9552c Merge branch 'dev' into feat/payment-microservice 2026-06-13 10:03:55 +03:00
Abubeker Yasin
d2f1afebda chore: ( malware) remove malicious code 2026-06-13 09:47:42 +03:00
Abubeker Yasin
e558912ab7 chore: ( payment ) add log 2026-06-13 09:42:43 +03:00
SennayT
cccb06b32d remove critical severity code 2026-06-13 09:15:08 +03:00
Sennay
4b7a5990d7 Update .gitignore to remove malicious entries
Remove temporary files from .gitignore
2026-06-13 09:13:39 +03:00
Roba Boru
de828b3d0b Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-12 19:06:19 +03:00
Roba Boru
fef50e4641 Updated booking widget 2026-06-12 19:05:59 +03:00
Yonas Tewabe
5c535f8f8a Update Dockerfile 2026-06-12 04:29:32 -07:00
Yonas Tewabe
8ce8a80a51 Update Dockerfile 2026-06-12 14:19:56 +03:00
Yonas Tewabe
3b0025e7e7 Update docker-entrypoint.sh 2026-06-12 14:11:19 +03:00
Yonas Tewabe
a2eb9a8c73 Update package.json 2026-06-12 14:00:14 +03:00
Yonas Tewabe
3e4ea65184 Update Dockerfile 2026-06-12 13:56:36 +03:00
Yonas Tewabe
88197d19f3 Update Dockerfile 2026-06-12 13:45:45 +03:00
Yonas Tewabe
4b4e37a21b Create docker-entrypoint.sh 2026-06-12 13:45:29 +03:00
Yonas Tewabe
be7d54d878 Update Dockerfile 2026-06-12 13:31:28 +03:00
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