Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
841 Commits 96 Branches 0 Tags
eb7db6db212c1461bf5eb670bf4543c8dbd9dc8f
Commit Graph

175 Commits

Author SHA1 Message Date
Eyob T.
eb7db6db21 Merge pull request #187 from Tria-plc/alpha 
fix: add lockfile corruption handling to CI/CD and Dockerfiles
 2026-06-16 21:48:40 +03:00
Stephanos A
560aff222b fix: add lockfile corruption handling to CI/CD and Dockerfiles 2026-06-16 21:40:01 +03:00
Eyob T.
fc57c66d0a Merge pull request #185 from Tria-plc/alpha 
Merge request for booking endpoint and other enhancements
 2026-06-16 20:20:41 +03:00
Stephanos A
ad83c87e2f Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields. 2026-06-16 19:30:09 +03:00
Stephanos A
eb60fc340d Refactor booking creation to support one-way and round-trip bookings with enhanced DTOs and service methods 2026-06-16 18:44:09 +03:00
Eyob T.
2e9e69275a Merge pull request #180 from Tria-plc/alpha 
Enhance DTOs and services to support sequence and operational status for coaches and stations
 2026-06-16 17:40:01 +03:00
Stephanos A
421e30dc6c Enhance DTOs and services to support sequence and operational status for coaches and stations 2026-06-16 16:25:33 +03:00
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Abubeker Yasin
c56e0e794c Update payments.module.ts 2026-06-16 15:25:14 +03:00
Abubeker Yasin
1ed2c4d2f0 Merge branch 'dev' into feat/payment-microservice 2026-06-16 15:24:33 +03:00
Abubeker Yasin
e5850fbc63 feat: ( payment ) return url based on payment method 2026-06-16 15:23:32 +03:00
Stephanos A
eb97c11ddb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:41:33 +03:00
Stephanos A
e03c11e7ee Build issues resolution 2026-06-16 14:41:27 +03:00
Stephanos A
fc5f77c817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:40:09 +03:00
Roba Boru
1a71f654b1 Update email and sms services 2026-06-16 14:21:56 +03:00
Stephanos A
75c8423f50 Round trip journeys, feedback items, backoffice documentation 2026-06-16 13:33:03 +03:00
Roba Boru
e9f06a52aa Merge remove changes 2026-06-16 12:14:35 +03:00
Abubeker Yasin
d65ea24354 Merge pull request #168 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-16 12:09:13 +03:00
Abubeker Yasin
38175cbdb7 Update seed.ts 2026-06-16 12:07:38 +03:00
Roba Boru
db54a6870d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 11:13:01 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
Abubeker Yasin
06c7fea330 Merge branch 'feat/payment-microservice' into alpha 2026-06-16 11:02:41 +03:00
Roba Boru
03c4ec33c3 Added get ticketing info by reference number endpoint and update payment methods to dynamic 2026-06-16 09:47:05 +03:00
Abubeker Yasin
ca9a67837c feat: ( payment ) implement d-money payment 2026-06-16 08:49:41 +03:00
marshal
0aed9824ae cac payemnt integration and cbe rate exchange webscrabing 2026-06-15 14:54:20 +03:00
Abubeker Yasin
e4805824ce Merge pull request #162 from Tria-plc/feat/payment-microservice 
Update payments.service.ts
 2026-06-15 11:28:05 +03:00
Abubeker Yasin
73eeee175f Update payments.service.ts 2026-06-15 11:26:51 +03:00
Abubeker Yasin
3a9f0dd0a8 Merge pull request #157 from Tria-plc/feat/payment-microservice 
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
 2026-06-14 21:55:15 +03:00
Abubeker Yasin
4ab987e8fe Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq" 
This reverts commit 3b961f17f5.
 2026-06-14 21:44:36 +03:00
Abubeker Yasin
b7cc05a631 Merge pull request #155 from Tria-plc/feat/payment-microservice 
refactor: ( rabbitmq ) temporary remove the rabbitmq
 2026-06-14 18:48:53 +03:00
Abubeker Yasin
3b961f17f5 refactor: ( rabbitmq ) temporary remove the rabbitmq 2026-06-14 18:47:41 +03:00
Eyob T.
d6247e0e2b Merge pull request #148 from Tria-plc/feat/payment-microservice 
refactor: ( payment ) use rabbitmq for webhooks event
 2026-06-14 15:24:25 +03:00
Stephanos A
f8701eacfb Merge branch 'dev' into alpha 2026-06-14 10:47:51 +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
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
Abubeker Yasin
eb94d58a4e Update payment-client.service.ts 2026-06-13 10:48:19 +03:00
Abubeker Yasin
e558912ab7 chore: ( payment ) add log 2026-06-13 09:42:43 +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
556c2dc1f8 Update seed.ts 2026-06-11 14:24:56 +03:00
Abubeker Yasin
216dd11d2f fix: ( seed ) add try catch 2026-06-11 08:45:32 +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