Stephanos A
560aff222b
fix: add lockfile corruption handling to CI/CD and Dockerfiles
2026-06-16 21:40:01 +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
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
Stephanos A
a61130cd51
Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies
2026-06-16 14:56:35 +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
06035a2b94
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 14:22:21 +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
Eyob T.
22d28340cd
Merge pull request #169 from Tria-plc/alpha
...
Update telebirr payment method callback page
2026-06-16 12:23:35 +03:00
Roba Boru
e9f06a52aa
Merge remove changes
2026-06-16 12:14:35 +03:00
Roba Boru
ed49470249
Update telebirr callback page query paramaters
2026-06-16 12:14:10 +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
Abubeker Yasin
06c7fea330
Merge branch 'feat/payment-microservice' into alpha
2026-06-16 11:02:41 +03:00
Abubeker Yasin
8520c3add3
fix: ( payment ) remove /100
2026-06-16 11:02:07 +03:00
Abubeker Yasin
e5877e5339
fix: ( telebirr ) fix query status
2026-06-16 10:52:36 +03:00
Yonas Tewabe
3fef810666
Update deploy.yml
2026-06-16 10:27:24 +03:00
Yonas Tewabe
ae967b324c
Update deploy.yml
2026-06-16 10:26:01 +03:00
Yonas Tewabe
d0689dfe04
Update deploy.yml
2026-06-16 10:23:51 +03:00
Yonas Tewabe
f52fc44ca1
Update deploy.yml
2026-06-16 10:21:57 +03:00
Yonas Tewabe
c267d4f641
Enhance deployment workflow with change detection
...
Added a job to detect changed services and conditionally deploy based on changes. Updated deployment strategy to handle service-specific environment files.
2026-06-16 10:18:32 +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
Roba Boru
20b564e681
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-16 07:47:57 +03:00
Abubeker Yasin
f3d892f68e
Merge pull request #164 from Tria-plc/feat/payment-microservice
...
fix: ( telebirr ) redirect_url
2026-06-15 22:06:28 +03:00
Abubeker Yasin
96ec2923c2
fix: ( telebirr ) redirect_url
2026-06-15 14:35:14 +03:00
Yonas Tewabe
3e3daba14d
Update deploy.yml
2026-06-15 13:43:48 +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
Stephanos A.
28e183b086
Merge pull request #160 from Tria-plc/dev
...
Pull updates from dev to alpha
2026-06-15 08:52:58 +03:00
Eyob T.
a957c97960
Merge pull request #159 from Tria-plc/alpha
...
Merge request for nationality mismatch issue resolution
2026-06-14 23:53:29 +03:00
Stephanos A
9ed3831c2a
Nationality mismatch issue resolution
2026-06-14 23:36:23 +03:00
Stephanos A.
513f6bffc1
Merge pull request #158 from Tria-plc/dev
...
Pull updates from dev to alpha
2026-06-14 23:06:21 +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
Eyob T.
74e3791ab6
Merge pull request #156 from Tria-plc/alpha
...
Update portal home and fix build error
2026-06-14 20:48:04 +03:00
Roba Boru
4a0773e1a5
Revert payment page
2026-06-14 20:40:54 +03:00
Roba Boru
13e7fbbab0
Update home page and fix build error
2026-06-14 20:28:10 +03:00
Roba Boru
5219c7a79c
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-14 20:02:04 +03:00
Roba Boru
b5ed10beaa
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-14 20:01:29 +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.
39e32f4e0a
Merge pull request #154 from Tria-plc/alpha
...
Merge request for lock file and lint issues resolution
2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f
Lockfile and lint issues resolution
2026-06-14 15:29:37 +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.
d8a762f287
Merge pull request #153 from Tria-plc/dev
...
Merge pull request #152 from Tria-plc/alpha
2026-06-14 15:14:28 +03:00